-diff -Nru mbrowse-0.2.3/acinclude.m4 mbrowse-0.2.3.new/acinclude.m4
---- mbrowse-0.2.3/acinclude.m4 Thu Jan 1 01:00:00 1970
-+++ mbrowse-0.2.3.new/acinclude.m4 Thu Apr 4 10:44:45 2002
-@@ -0,0 +1,178 @@
-+# Configure paths for ucd-snmp, GPLv2
-+# Markus Fischer <mfischer@josefine.ben.tuwien.ac.at>, 22.9.1999
-+# URL : http://josefine.ben.tuwien.ac.at/~mfischer/m4/ucd-snmp.m4
-+# Last Modified : Thu Sep 23 14:24:15 CEST 1999
+--- /dev/null Tue May 5 22:32:27 1998
++++ mbrowse-0.3.0/acinclude.m4 Sun Jan 19 10:47:16 2003
+@@ -0,0 +1,303 @@
++# Configure paths for net-snmp or ucd-snmp.
++# This is really messy, but should thouroughly
++# check everything, and be pretty foolproof.
++# Some of the tests seem redundant, but it seemed
++# the sanest way to make it fairly robust.
++#
++# $Revision$
++#
++# Last Modified:
++# $Author$
++# $Date$
++#
++# Various pieces were snagged from other m4 files.
+#
-+# written from scratch with a few pieces from glib.m4
+
-+dnl AM_PATH_UCDSNMP([MINIMUM-VERSION, [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND ]]])
-+dnl Test for ucd-snmp and define UCDSNMP_CFLAGS, UCDSNMP_LDFLAGS and UCDSNMP_LIBS
-+dnl
++dnl AM_PATH_NETSNMP([MINIMUM-VERSION, [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND ]]])
+
-+AC_DEFUN(AM_PATH_UCDSNMP,
-+[
-+AC_ARG_WITH(ucdsnmp-prefix, [--with-ucdsnmp-prefix=PFX Prefix where ucd-snmp is installed],
-+ ucdsnmp_prefix="$withval",
-+ ucdsnmp_prefix="")
++dnl Test for net-snmp and define NETSNMP_CFLAGS and NETSNMP_LIBS
+
-+AC_ARG_WITH(ucdsnmp-include, [--with-ucdsnmp-include=DIR Directory pointing to ucd-snmp include files],
-+ ucdsnmp_include="$withval",
-+ ucdsnmp_include="")
++AC_DEFUN(AM_PATH_NETSNMP,[
++ AC_ARG_WITH(snmp-type,
++ [ --with-snmp-type=TYPE Which snmp version to use (net or ucd)],
++ snmp_type="$withval",snmp_type="")
++ AC_ARG_WITH(snmp-prefix,
++ [ --with-snmp-prefix=PFX Prefix where net/ucd snmp is installed (optional)],
++ snmp_prefix="$withval",snmp_prefix="")
++ AC_ARG_WITH(snmp-include,
++ [ --with-snmp-include=DIR Directory pointing to snmp include files (optional)],
++ snmp_include="$withval",snmp_include="")
++ AC_ARG_WITH(snmp-lib,
++ [ --with-snmp-lib=LIB Directory containing the snmp library to use (optional)
++ (Notes: -lib ignored for net-snmp, -lib and -include
++ override -prefix)],
++ snmp_lib="$withval",snmp_lib="")
+
-+AC_ARG_WITH(ucdsnmp-lib,
-+[ --with-ucdsnmp-lib=LIB Directory pointing to ucd-snmp library
-+ (Note: -include and -lib do override
-+ paths found with -prefix)
-+],
-+ ucdsnmp_lib="$withval",
-+ ucdsnmp_lib="")
++ guess_type=""
++ SNMP_CFLAGS=""
++ SNMP_LIBS=""
+
-+ AC_MSG_CHECKING([for ucd-snmp ifelse([$1], , ,[>= v$1])])
-+ UCDSNMP_LDFLAGS=""
-+ UCDSNMP_CFLAGS=""
-+ UCDSNMP_LIBS="-lsnmp"
-+ ucdsnmp_fail=""
++ dnl
++ dnl Check the user-provided include and libs first
++ dnl
+
-+ dnl test --with-ucdsnmp-prefix
-+ if test "x$ucdsnmp_prefix" != "x" ; then
-+ if test -d "$ucdsnmp_prefix" ; then
-+ if test -d "$ucdsnmp_prefix/lib" ; then
-+ UCDSNMP_LDFLAGS="-L$ucdsnmp_prefix/lib"
-+ fi
-+ if test -d "$ucdsnmp_prefix/include" ; then
-+ UCDSNMP_CFLAGS="-I$ucdsnmp_prefix/include"
-+ fi
++ if test "x$snmp_include" != "x" ; then
++ for trytype in ucd net ${snmp_type} ; do
++ if test -d "$snmp_include/$trytype-snmp" ; then
++ SNMP_CFLAGS="-I$snmp_include"
++ guess_type="$trytype"
++ found_snmp_incl="1"
+ fi
++ done
+ fi
+
-+ dnl test --with-ucdsnmp-include
-+ if test "x$ucdsnmp_include" != "x" ; then
-+ if test -d "$ucdsnmp_include/include" ; then
-+ UCDSNMP_CFLAGS="-I$ucdsnmp_include/include"
-+ elif test -d "$ucdsnmp_include" ; then
-+ UCDSNMP_CFLAGS="-I$ucdsnmp_include"
++ if test "x$snmp_lib" != "x" ; then
++ for trytype in libsnmp.sl libsnmp.so libsnmp.a libnetsnmp.sl libnetsnmp.so libnetsnmp.a ; do
++ if test -r "$snmp_lib/$trytype" ; then
++ SNMP_LIBS="-L$snmp_lib -lsnmp"
++ found_snmp_lib="1"
+ fi
++ done
++ fi
++
++ dnl
++ dnl Check for --with-snmp-type and -prefix at the same time
++ dnl
++
++ AC_MSG_CHECKING([for snmp-type])
++
++ for tryprefix in /usr /usr/local /usr/pkg $snmp_prefix ; do
++
++ if test "x$found_snmp_incl" = "x" ; then
++ for trytype in ucd net ${snmp_type} ; do
++ if test -d "$tryprefix/include/$trytype-snmp" ; then
++ SNMP_CFLAGS="-I$tryprefix/include"
++ guess_type="$trytype"
++ backup_prefix="$tryprefix"
++ fi
++ done
++ fi
++
++ if test "x$found_snmp_lib" = "x" ; then
++ for trytype in libsnmp.sl libsnmp.so libsnmp.a libnetsnmp.sl libnetsnmp.so libnetsnmp.a ; do
++ if test -r "$tryprefix/lib/$trytype" ; then
++ SNMP_LIBS="-L$tryprefix/lib -lsnmp"
++ fi
++ done
++ fi
++
++ done
++
++ if test "x$SNMP_LIBS" = "x" ; then
++ if test "x$SNMP_CFLAGS" = "x" ; then
++ echo
++ echo "***"
++ echo "*** Could not locate any version of ucd-snmp or net-snmp"
++ echo "***"
++ echo "*** Either it is not installed, or installed in a bizarre location."
++ echo "***"
++ echo "*** Try using one of the following switches:"
++ echo "*** --with-snmp-prefix=PFX"
++ echo "*** --with-snmp-include=DIR"
++ echo "*** --with-snmp-lib=DIR"
++ echo "***"
++ ifelse([$3], ,:,[$3])
++ else
++ echo
++ echo "***"
++ echo "*** Found snmp headers, but could not locate the libraries."
++ echo "***"
++ echo "*** Try using the following switch:"
++ echo "*** --with-snmp-prefix=PFX"
++ echo "*** --with-snmp-lib=DIR"
++ echo "***"
++ ifelse([$3], ,:,[$3])
++ fi
++ elif test "x$SNMP_CFLAGS" = "x" ; then
++ echo
++ echo "***"
++ echo "*** Found snmp libraries, but could not locate headers."
++ ehco "***"
++ echo "*** If this was installed from a package, the -devel package"
++ echo "*** was proabably not installed."
++ echo "***"
++ echo "*** Otherwise, try one of the following switches:"
++ echo "*** --with-snmp-prefix=PFX"
++ echo "*** --with-snmp-include=DIR"
++ echo "***"
++ ifelse([$3], ,:,[$3])
+ fi
+
-+ dnl test --with-ucdsnmp-lib
-+ if test "x$ucdsnmp_lib" != "x" ; then
-+ if test -d "$ucdsnmp_lib/lib" ; then
-+ UCDSNMP_LDFLAGS="-L$ucdsnmp_lib/lib"
-+ elif test -d "$ucdsnmp_lib" ; then
-+ UCDSNMP_LDFLAGS="-L$ucdsnmp_lib"
++ if test "x$guess_type" = "xnet" ; then
++ if test "x$snmp_prefix" != "x" ; then
++ if test -x "$snmp_prefix/bin/net-snmp-config" ; then
++ SNMP_LIBS=`$snmp_prefix/bin/net-snmp-config --libs`
++ SNMP_CFLAGS="$SNMP_CFLAGS -DHAVE_NETSNMP"
++ else
++ guess_type="ucd"
+ fi
++ else
++ if test -x "$backup_prefix/bin/net-snmp-config" ; then
++ SNMP_LIBS=`$backup_prefix/bin/net-snmp-config --libs`
++ SNMP_CFLAGS="$SNMP_CFLAGS -DHAVE_NETSNMP"
++ else
++ guess_type="ucd"
++ fi
++ fi
+ fi
+
++ AC_MSG_RESULT($guess_type)
++
++ if test "x$guess_type" = "xucd" ; then
++ AC_CHECK_LIB(socket,getservbyname)
++ AC_CHECK_FUNC(gethostbyname, [], AC_CHECK_LIB(nsl, gethostbyname))
++ AC_CHECK_LIB(crypto,EVP_md5)
++ AC_CHECK_LIB(kstat,kstat_lookup)
++ elif test "x$guess_type" != "xnet" ; then
++ echo
++ echo "***"
++ echo "*** I have no clue what to do with this version of SNMP."
++ echo "*** Net-snmp or ucd-snmp must be installed."
++ echo "***"
++ fi
++
+ ac_save_CFLAGS="$CFLAGS"
-+ ac_save_LDFLAGS="$LDFLAGS"
+ ac_save_LIBS="$LIBS"
-+ CFLAGS="$CFLAGS $UCDSNMP_CFLAGS"
-+ LDFLAGS="$LDFLAGS $UCDSNMP_LDFLAGS"
-+ LIBS="$UCDSNMP_LIBS $LIBS"
++
++ CFLAGS="$CFLAGS $SNMP_CFLAGS"
++ LIBS="$SNMP_LIBS $LIBS"
++
++ AC_MSG_CHECKING([for $guess_type-snmp ifelse([$1], , ,[>= v$1])])
+ dnl if no minimum version is given, just try to compile
+ dnl else try to compile AND run
++
+ if test "x$1" = "x" ; then
-+ AC_TRY_COMPILE([
-+ #include <stdarg.h>
-+ #include <stdio.h>
-+ #include <string.h>
-+ #include <sys/types.h>
-+ #include <ucd-snmp/asn1.h>
-+ #include <ucd-snmp/snmp_api.h>
-+ #include <ucd-snmp/mib.h>
-+ #include <ucd-snmp/snmp.h>
-+ ],[
-+ struct snmp_session s;
-+ bzero( &s, sizeof( struct snmp_session));
-+ snmp_open(&s);
-+ ],[AC_MSG_RESULT(yes)
-+ CFLAGS="$ac_save_CFLAGS"
-+ LDFLAGS="$ac_save_LDFLAGS"
-+ LIBS="$ac_save_LIBS"
-+ ifelse([$2], ,:,[$2])
-+ ],[
-+ ucdsnmp_fail="yes"
-+ ])
++ AC_TRY_COMPILE([
++ #include <stdarg.h>
++ #include <stdio.h>
++ #include <string.h>
++ #include <sys/types.h>
++ #ifdef HAVE_NETSNMP
++ # include <net-snmp/net-snmp-config.h>
++ # include <net-snmp/net-snmp-includes.h>
++ #else
++ # include <ucd-snmp/asn1.h>
++ # include <ucd-snmp/snmp_api.h>
++ # include <ucd-snmp/mib.h>
++ # include <ucd-snmp/snmp.h>
++ #endif
++ ],[
++ struct snmp_session s;
++ bzero( &s, sizeof( struct snmp_session));
++ snmp_open(&s);
++ ],[AC_MSG_RESULT(yes)
++ CFLAGS="$ac_save_CFLAGS"
++ LIBS="$ac_save_LIBS"
++ ifelse([$2], ,:,[$2])
++ ],[
++ $snmp_fail="yes"
++ ])
+ else
-+ ucdsnmp_min_version=$1
-+ AC_TRY_RUN([
-+ #include <stdarg.h>
-+ #include <stdio.h>
-+ #include <string.h>
++ snmp_min_version=$1
++ AC_TRY_RUN([
++ #include <stdarg.h>
++ #include <stdio.h>
++ #include <string.h>
+
-+ #include <sys/types.h>
-+ #include <ucd-snmp/asn1.h>
-+ #include <ucd-snmp/snmp_api.h>
-+ #include <ucd-snmp/mib.h>
-+ #include <ucd-snmp/snmp.h>
-+ #include <ucd-snmp/version.h>
++ #include <sys/types.h>
++ #ifdef HAVE_NETSNMP
++ # include <net-snmp/net-snmp-config.h>
++ # include <net-snmp/net-snmp-includes.h>
++ # include <net-snmp/version.h>
++ #else
++ # include <ucd-snmp/asn1.h>
++ # include <ucd-snmp/snmp_api.h>
++ # include <ucd-snmp/mib.h>
++ # include <ucd-snmp/snmp.h>
++ # include <ucd-snmp/version.h>
++ #endif
+
-+ int main() {
-+ int major, minor;
-+ int ucd_major, ucd_minor;
-+ char *version1, *version2;
-+ struct snmp_session s;
++ int main() {
++ int major, minor,micro;
++ int snmp_major, snmp_minor, snmp_micro;
++ char *version1, *version2;
++ struct snmp_session s;
+
-+ bzero(&s, sizeof( struct snmp_session));
-+ snmp_open(&s);
++ bzero(&s, sizeof( struct snmp_session));
++ snmp_open(&s);
+
-+ version1 = strdup( "$ucdsnmp_min_version");
-+ if( sscanf( version1, "%d.%d", &major, &minor) != 2) {
-+ printf( "%s, bad supplied version string\n", "$ucdsnmp_min_version");
-+ exit(1);
-+ }
++ version1 = strdup( "$snmp_min_version" );
++ if( sscanf( version1, "%d.%d.%d", &major, &minor, µ) != 2) {
++ printf( "%s, bad supplied version string\n", "$netsnmp_min_version");
++ exit(1);
++ }
+
-+ version2 = strdup( VersionInfo);
-+ if( sscanf( version2, "%d.%d", &ucd_major, &ucd_minor) != 2) {
-+ printf( "%s, bad ucd-snmp version string\n", VersionInfo);
-+ exit(1);
-+ }
++ #ifdef HAVE_NETSNMP
++ version2 = strdup( NetSnmpVersionInfo );
++ #else
++ version2 = strdup( VersionInfo);
++ #endif
++ if( sscanf( version2, "%d.%d.%d", &snmp_major, &snmp_minor, &snmp_micro) != 3) {
++ /* Some people tripped on this with 4.2... check for it */
++ if ( sscanf( version2, "%d.%d", &snmp_major, &snmp_minor) != 2) {
++ printf( "%s, bad net-snmp version string\n", version2);
++ exit(1);
++ }
++ snmp_micro=0;
++ }
+
-+ if((ucd_major > major) ||
-+ ((ucd_major == major) && (ucd_minor > minor)) ||
-+ ((ucd_major == major) && (ucd_minor == minor) )) {
-+ return 0;
-+ } else {
-+ printf("\n***\n*** An old version of ucd-snmp (%d.%d) was found.\n",
-+ ucd_major, ucd_minor);
-+ printf("*** You need a version of ucd-snmp newer than %d.%d. The latest version of\n",
-+ major, minor);
-+ printf("*** ucd-snmp is available from ftp://net-snmp.sourceforge.net/ .\n***\n");
-+ }
-+ return 1;
-+ }
-+ ],[AC_MSG_RESULT(yes)
-+ CFLAGS="$ac_save_CFLAGS"
-+ LDFLAGS="$ac_save_LDFLAGS"
-+ LIBS="$ac_save_LIBS"
-+ ifelse([$2], ,:,[$2])
-+ ],[
-+ ucdsnmp_fail="yes"
-+ ])
++ if((snmp_major > major) ||
++ ((snmp_major == major) && (snmp_minor > minor)) ||
++ ((snmp_major == major) && (snmp_minor == minor)) ||
++ ((snmp_major == major) && (snmp_minor == minor) && (snmp_micro >= micro))) {
+
-+ fi
-+
-+ if test "x$ucdsnmp_fail" != "x" ; then
-+ dnl AC_MSG_RESULT(no)
-+ echo
-+ echo "***"
-+ echo "*** ucd-snmp test source had problems, check your config.log ."
-+ echo "*** Also try one of the following switches :"
-+ echo "*** --with-ucdsnmp-prefix=PFX"
-+ echo "*** --with-ucdsnmp-include=DIR"
-+ echo "*** --with-ucdsnmp-lib=DIR"
-+ echo "***"
-+ CFLAGS="$ac_save_CFLAGS"
-+ LDFLAGS="$ac_save_LDFLAGS"
-+ LIBS="$ac_save_LIBS"
-+ ifelse([$3], ,:,[$3])
-+ fi
++ if ((snmp_major == 4) && (snmp_minor <= 2) && (snmp_micro <=1)) {
++ printf("\n***\n*** You are running ucd-snmp < 4.2.2. It\n"
++ "*** is strongly suggested that you upgrade\n"
++ "*** for security reasons. See CERT Advisory\n"
++ "**** CA-2002-03 for more details.\n***\n");
++ }
++ return 0;
++ } else {
++ printf("\n***\n*** An old version of net-snmp (%d.%d) was found.\n",
++ snmp_major, snmp_minor);
++ printf("*** You need a version of net-snmp newer than %d.%d. The latest version of\n",
++ major, minor);
++ printf("*** net-snmp is available from ftp://net-snmp.sourceforge.net/ .\n***\n");
++ }
++ return 1;
++ }
++ ],[AC_MSG_RESULT(yes)
++ CFLAGS="$ac_save_CFLAGS"
++ LIBS="$ac_save_LIBS"
++ ifelse([$2], ,:,[$2])
++ ],[
++ snmp_fail="yes"
++ ])
++ fi
+
++ if test "x$snmp_fail" != "x" ; then
++ echo
++ echo "***"
++ echo "*** Snmp test source had problems, check your config.log."
++ echo "*** Chances are, it couldn't find the headers or libraries."
++ echo "***"
++ echo "*** Also try one of the following switches :"
++ echo "*** --with-snmp-prefix=PFX"
++ echo "*** --with-snmp-include=DIR"
++ echo "*** --with-snmp-lib=DIR"
++ echo "***"
+ CFLAGS="$ac_save_CFLAGS"
+ LDFLAGS="$ac_save_LDFLAGS"
+ LIBS="$ac_save_LIBS"
-+ AC_SUBST(UCDSNMP_LDFLAGS)
-+ AC_SUBST(UCDSNMP_CFLAGS)
-+ AC_SUBST(UCDSNMP_LIBS)
++ ifelse([$3], ,:,[$3])
++ fi
++
++ CFLAGS="$ac_save_CFLAGS"
++ LDFLAGS="$ac_save_LDFLAGS"
++ LIBS="$ac_save_LIBS"
++
++ AC_SUBST(SNMP_CFLAGS)
++ AC_SUBST(SNMP_LIBS)
+])
+
-diff -Nru mbrowse-0.2.3/aclocal.m4 mbrowse-0.2.3.new/aclocal.m4
---- mbrowse-0.2.3/aclocal.m4 Sat Mar 2 18:15:36 2002
-+++ mbrowse-0.2.3.new/aclocal.m4 Thu Jan 1 01:00:00 1970
-@@ -1,588 +0,0 @@
--dnl aclocal.m4 generated automatically by aclocal 1.4-p5
--
--dnl Copyright (C) 1994, 1995-8, 1999, 2001 Free Software Foundation, Inc.
--dnl This file is free software; the Free Software Foundation
--dnl gives unlimited permission to copy and/or distribute it,
--dnl with or without modifications, as long as this notice is preserved.
--
--dnl This program is distributed in the hope that it will be useful,
--dnl but WITHOUT ANY WARRANTY, to the extent permitted by law; without
--dnl even the implied warranty of MERCHANTABILITY or FITNESS FOR A
--dnl PARTICULAR PURPOSE.
--
--# Do all the work for Automake. This macro actually does too much --
--# some checks are only needed if your package does certain things.
--# But this isn't really a big deal.
--
--# serial 1
--
--dnl Usage:
--dnl AM_INIT_AUTOMAKE(package,version, [no-define])
--
--AC_DEFUN([AM_INIT_AUTOMAKE],
--[AC_REQUIRE([AC_PROG_INSTALL])
--PACKAGE=[$1]
--AC_SUBST(PACKAGE)
--VERSION=[$2]
--AC_SUBST(VERSION)
--dnl test to see if srcdir already configured
--if test "`cd $srcdir && pwd`" != "`pwd`" && test -f $srcdir/config.status; then
-- AC_MSG_ERROR([source directory already configured; run "make distclean" there first])
--fi
--ifelse([$3],,
--AC_DEFINE_UNQUOTED(PACKAGE, "$PACKAGE", [Name of package])
--AC_DEFINE_UNQUOTED(VERSION, "$VERSION", [Version number of package]))
--AC_REQUIRE([AM_SANITY_CHECK])
--AC_REQUIRE([AC_ARG_PROGRAM])
--dnl FIXME This is truly gross.
--missing_dir=`cd $ac_aux_dir && pwd`
--AM_MISSING_PROG(ACLOCAL, aclocal, $missing_dir)
--AM_MISSING_PROG(AUTOCONF, autoconf, $missing_dir)
--AM_MISSING_PROG(AUTOMAKE, automake, $missing_dir)
--AM_MISSING_PROG(AUTOHEADER, autoheader, $missing_dir)
--AM_MISSING_PROG(MAKEINFO, makeinfo, $missing_dir)
--AC_REQUIRE([AC_PROG_MAKE_SET])])
--
--#
--# Check to make sure that the build environment is sane.
--#
--
--AC_DEFUN([AM_SANITY_CHECK],
--[AC_MSG_CHECKING([whether build environment is sane])
--# Just in case
--sleep 1
--echo timestamp > conftestfile
--# Do `set' in a subshell so we don't clobber the current shell's
--# arguments. Must try -L first in case configure is actually a
--# symlink; some systems play weird games with the mod time of symlinks
--# (eg FreeBSD returns the mod time of the symlink's containing
--# directory).
--if (
-- set X `ls -Lt $srcdir/configure conftestfile 2> /dev/null`
-- if test "[$]*" = "X"; then
-- # -L didn't work.
-- set X `ls -t $srcdir/configure conftestfile`
-- fi
-- if test "[$]*" != "X $srcdir/configure conftestfile" \
-- && test "[$]*" != "X conftestfile $srcdir/configure"; then
--
-- # If neither matched, then we have a broken ls. This can happen
-- # if, for instance, CONFIG_SHELL is bash and it inherits a
-- # broken ls alias from the environment. This has actually
-- # happened. Such a system could not be considered "sane".
-- AC_MSG_ERROR([ls -t appears to fail. Make sure there is not a broken
--alias in your environment])
-- fi
--
-- test "[$]2" = conftestfile
-- )
--then
-- # Ok.
-- :
--else
-- AC_MSG_ERROR([newly created file is older than distributed files!
--Check your system clock])
--fi
--rm -f conftest*
--AC_MSG_RESULT(yes)])
--
--dnl AM_MISSING_PROG(NAME, PROGRAM, DIRECTORY)
--dnl The program must properly implement --version.
--AC_DEFUN([AM_MISSING_PROG],
--[AC_MSG_CHECKING(for working $2)
--# Run test in a subshell; some versions of sh will print an error if
--# an executable is not found, even if stderr is redirected.
--# Redirect stdin to placate older versions of autoconf. Sigh.
--if ($2 --version) < /dev/null > /dev/null 2>&1; then
-- $1=$2
-- AC_MSG_RESULT(found)
--else
-- $1="$3/missing $2"
-- AC_MSG_RESULT(missing)
--fi
--AC_SUBST($1)])
--
--# Like AC_CONFIG_HEADER, but automatically create stamp file.
--
--AC_DEFUN([AM_CONFIG_HEADER],
--[AC_PREREQ([2.12])
--AC_CONFIG_HEADER([$1])
--dnl When config.status generates a header, we must update the stamp-h file.
--dnl This file resides in the same directory as the config header
--dnl that is generated. We must strip everything past the first ":",
--dnl and everything past the last "/".
--AC_OUTPUT_COMMANDS(changequote(<<,>>)dnl
--ifelse(patsubst(<<$1>>, <<[^ ]>>, <<>>), <<>>,
--<<test -z "<<$>>CONFIG_HEADERS" || echo timestamp > patsubst(<<$1>>, <<^\([^:]*/\)?.*>>, <<\1>>)stamp-h<<>>dnl>>,
--<<am_indx=1
--for am_file in <<$1>>; do
-- case " <<$>>CONFIG_HEADERS " in
-- *" <<$>>am_file "*<<)>>
-- echo timestamp > `echo <<$>>am_file | sed -e 's%:.*%%' -e 's%[^/]*$%%'`stamp-h$am_indx
-- ;;
-- esac
-- am_indx=`expr "<<$>>am_indx" + 1`
--done<<>>dnl>>)
--changequote([,]))])
--
--
--# serial 1
--
--# @defmac AC_PROG_CC_STDC
--# @maindex PROG_CC_STDC
--# @ovindex CC
--# If the C compiler in not in ANSI C mode by default, try to add an option
--# to output variable @code{CC} to make it so. This macro tries various
--# options that select ANSI C on some system or another. It considers the
--# compiler to be in ANSI C mode if it handles function prototypes correctly.
--#
--# If you use this macro, you should check after calling it whether the C
--# compiler has been set to accept ANSI C; if not, the shell variable
--# @code{am_cv_prog_cc_stdc} is set to @samp{no}. If you wrote your source
--# code in ANSI C, you can make an un-ANSIfied copy of it by using the
--# program @code{ansi2knr}, which comes with Ghostscript.
--# @end defmac
--
--AC_DEFUN([AM_PROG_CC_STDC],
--[AC_REQUIRE([AC_PROG_CC])
--AC_BEFORE([$0], [AC_C_INLINE])
--AC_BEFORE([$0], [AC_C_CONST])
--dnl Force this before AC_PROG_CPP. Some cpp's, eg on HPUX, require
--dnl a magic option to avoid problems with ANSI preprocessor commands
--dnl like #elif.
--dnl FIXME: can't do this because then AC_AIX won't work due to a
--dnl circular dependency.
--dnl AC_BEFORE([$0], [AC_PROG_CPP])
--AC_MSG_CHECKING(for ${CC-cc} option to accept ANSI C)
--AC_CACHE_VAL(am_cv_prog_cc_stdc,
--[am_cv_prog_cc_stdc=no
--ac_save_CC="$CC"
--# Don't try gcc -ansi; that turns off useful extensions and
--# breaks some systems' header files.
--# AIX -qlanglvl=ansi
--# Ultrix and OSF/1 -std1
--# HP-UX -Aa -D_HPUX_SOURCE
--# SVR4 -Xc -D__EXTENSIONS__
--for ac_arg in "" -qlanglvl=ansi -std1 "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIONS__"
--do
-- CC="$ac_save_CC $ac_arg"
-- AC_TRY_COMPILE(
--[#include <stdarg.h>
--#include <stdio.h>
--#include <sys/types.h>
--#include <sys/stat.h>
--/* Most of the following tests are stolen from RCS 5.7's src/conf.sh. */
--struct buf { int x; };
--FILE * (*rcsopen) (struct buf *, struct stat *, int);
--static char *e (p, i)
-- char **p;
-- int i;
--{
-- return p[i];
--}
--static char *f (char * (*g) (char **, int), char **p, ...)
--{
-- char *s;
-- va_list v;
-- va_start (v,p);
-- s = g (p, va_arg (v,int));
-- va_end (v);
-- return s;
--}
--int test (int i, double x);
--struct s1 {int (*f) (int a);};
--struct s2 {int (*f) (double a);};
--int pairnames (int, char **, FILE *(*)(struct buf *, struct stat *, int), int, int);
--int argc;
--char **argv;
--], [
--return f (e, argv, 0) != argv[0] || f (e, argv, 1) != argv[1];
--],
--[am_cv_prog_cc_stdc="$ac_arg"; break])
--done
--CC="$ac_save_CC"
--])
--if test -z "$am_cv_prog_cc_stdc"; then
-- AC_MSG_RESULT([none needed])
--else
-- AC_MSG_RESULT($am_cv_prog_cc_stdc)
--fi
--case "x$am_cv_prog_cc_stdc" in
-- x|xno) ;;
-- *) CC="$CC $am_cv_prog_cc_stdc" ;;
--esac
--])
--
--# Configure paths for ucd-snmp, GPLv2
--# Markus Fischer <mfischer@josefine.ben.tuwien.ac.at>, 22.9.1999
--# URL : http://josefine.ben.tuwien.ac.at/~mfischer/m4/ucd-snmp.m4
--# Last Modified : Thu Sep 23 14:24:15 CEST 1999
--#
--# written from scratch with a few pieces from glib.m4
--
--dnl AM_PATH_UCDSNMP([MINIMUM-VERSION, [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND ]]])
--dnl Test for ucd-snmp and define UCDSNMP_CFLAGS, UCDSNMP_LDFLAGS and UCDSNMP_LIBS
--dnl
--
--AC_DEFUN(AM_PATH_UCDSNMP,
--[
--AC_ARG_WITH(ucdsnmp-prefix, [--with-ucdsnmp-prefix=PFX Prefix where ucd-snmp is installed],
-- ucdsnmp_prefix="$withval",
-- ucdsnmp_prefix="")
--
--AC_ARG_WITH(ucdsnmp-include, [--with-ucdsnmp-include=DIR Directory pointing to ucd-snmp include files],
-- ucdsnmp_include="$withval",
-- ucdsnmp_include="")
--
--AC_ARG_WITH(ucdsnmp-lib,
--[ --with-ucdsnmp-lib=LIB Directory pointing to ucd-snmp library
-- (Note: -include and -lib do override
-- paths found with -prefix)
--],
-- ucdsnmp_lib="$withval",
-- ucdsnmp_lib="")
--
-- AC_MSG_CHECKING([for ucd-snmp ifelse([$1], , ,[>= v$1])])
-- UCDSNMP_LDFLAGS=""
-- UCDSNMP_CFLAGS=""
-- UCDSNMP_LIBS="-lsnmp"
-- ucdsnmp_fail=""
--
-- dnl test --with-ucdsnmp-prefix
-- if test "x$ucdsnmp_prefix" != "x" ; then
-- if test -d "$ucdsnmp_prefix" ; then
-- if test -d "$ucdsnmp_prefix/lib" ; then
-- UCDSNMP_LDFLAGS="-L$ucdsnmp_prefix/lib"
-- fi
-- if test -d "$ucdsnmp_prefix/include" ; then
-- UCDSNMP_CFLAGS="-I$ucdsnmp_prefix/include"
-- fi
-- fi
-- fi
--
-- dnl test --with-ucdsnmp-include
-- if test "x$ucdsnmp_include" != "x" ; then
-- if test -d "$ucdsnmp_include/include" ; then
-- UCDSNMP_CFLAGS="-I$ucdsnmp_include/include"
-- elif test -d "$ucdsnmp_include" ; then
-- UCDSNMP_CFLAGS="-I$ucdsnmp_include"
-- fi
-- fi
--
-- dnl test --with-ucdsnmp-lib
-- if test "x$ucdsnmp_lib" != "x" ; then
-- if test -d "$ucdsnmp_lib/lib" ; then
-- UCDSNMP_LDFLAGS="-L$ucdsnmp_lib/lib"
-- elif test -d "$ucdsnmp_lib" ; then
-- UCDSNMP_LDFLAGS="-L$ucdsnmp_lib"
-- fi
-- fi
--
-- ac_save_CFLAGS="$CFLAGS"
-- ac_save_LDFLAGS="$LDFLAGS"
-- ac_save_LIBS="$LIBS"
-- CFLAGS="$CFLAGS $UCDSNMP_CFLAGS"
-- LDFLAGS="$LDFLAGS $UCDSNMP_LDFLAGS"
-- LIBS="$UCDSNMP_LIBS $LIBS"
-- dnl if no minimum version is given, just try to compile
-- dnl else try to compile AND run
-- if test "x$1" = "x" ; then
-- AC_TRY_COMPILE([
-- #include <stdarg.h>
-- #include <stdio.h>
-- #include <string.h>
-- #include <sys/types.h>
-- #include <ucd-snmp/asn1.h>
-- #include <ucd-snmp/snmp_api.h>
-- #include <ucd-snmp/mib.h>
-- #include <ucd-snmp/snmp.h>
-- ],[
-- struct snmp_session s;
-- bzero( &s, sizeof( struct snmp_session));
-- snmp_open(&s);
-- ],[AC_MSG_RESULT(yes)
-- CFLAGS="$ac_save_CFLAGS"
-- LDFLAGS="$ac_save_LDFLAGS"
-- LIBS="$ac_save_LIBS"
-- ifelse([$2], ,:,[$2])
-- ],[
-- ucdsnmp_fail="yes"
-- ])
-- else
-- ucdsnmp_min_version=$1
-- AC_TRY_RUN([
-- #include <stdarg.h>
-- #include <stdio.h>
-- #include <string.h>
--
-- #include <sys/types.h>
-- #include <ucd-snmp/asn1.h>
-- #include <ucd-snmp/snmp_api.h>
-- #include <ucd-snmp/mib.h>
-- #include <ucd-snmp/snmp.h>
-- #include <ucd-snmp/version.h>
--
-- int main() {
-- int major, minor;
-- int ucd_major, ucd_minor;
-- char *version1, *version2;
-- struct snmp_session s;
--
-- bzero(&s, sizeof( struct snmp_session));
-- snmp_open(&s);
--
-- version1 = strdup( "$ucdsnmp_min_version");
-- if( sscanf( version1, "%d.%d", &major, &minor) != 2) {
-- printf( "%s, bad supplied version string\n", "$ucdsnmp_min_version");
-- exit(1);
-- }
--
-- version2 = strdup( VersionInfo);
-- if( sscanf( version2, "%d.%d", &ucd_major, &ucd_minor) != 2) {
-- printf( "%s, bad ucd-snmp version string\n", VersionInfo);
-- exit(1);
-- }
--
-- if((ucd_major > major) ||
-- ((ucd_major == major) && (ucd_minor > minor)) ||
-- ((ucd_major == major) && (ucd_minor == minor) )) {
-- return 0;
-- } else {
-- printf("\n***\n*** An old version of ucd-snmp (%d.%d) was found.\n",
-- ucd_major, ucd_minor);
-- printf("*** You need a version of ucd-snmp newer than %d.%d. The latest version of\n",
-- major, minor);
-- printf("*** ucd-snmp is available from ftp://net-snmp.sourceforge.net/ .\n***\n");
-- }
-- return 1;
-- }
-- ],[AC_MSG_RESULT(yes)
-- CFLAGS="$ac_save_CFLAGS"
-- LDFLAGS="$ac_save_LDFLAGS"
-- LIBS="$ac_save_LIBS"
-- ifelse([$2], ,:,[$2])
-- ],[
-- ucdsnmp_fail="yes"
-- ])
--
-- fi
--
-- if test "x$ucdsnmp_fail" != "x" ; then
-- dnl AC_MSG_RESULT(no)
-- echo
-- echo "***"
-- echo "*** ucd-snmp test source had problems, check your config.log ."
-- echo "*** Also try one of the following switches :"
-- echo "*** --with-ucdsnmp-prefix=PFX"
-- echo "*** --with-ucdsnmp-include=DIR"
-- echo "*** --with-ucdsnmp-lib=DIR"
-- echo "***"
-- CFLAGS="$ac_save_CFLAGS"
-- LDFLAGS="$ac_save_LDFLAGS"
-- LIBS="$ac_save_LIBS"
-- ifelse([$3], ,:,[$3])
-- fi
--
-- CFLAGS="$ac_save_CFLAGS"
-- LDFLAGS="$ac_save_LDFLAGS"
-- LIBS="$ac_save_LIBS"
-- AC_SUBST(UCDSNMP_LDFLAGS)
-- AC_SUBST(UCDSNMP_CFLAGS)
-- AC_SUBST(UCDSNMP_LIBS)
--])
--
--# Configure paths for GTK+
--# Owen Taylor 97-11-3
--
--dnl AM_PATH_GTK([MINIMUM-VERSION, [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND [, MODULES]]]])
--dnl Test for GTK, and define GTK_CFLAGS and GTK_LIBS
--dnl
--AC_DEFUN(AM_PATH_GTK,
--[dnl
--dnl Get the cflags and libraries from the gtk-config script
--dnl
--AC_ARG_WITH(gtk-prefix,[ --with-gtk-prefix=PFX Prefix where GTK is installed (optional)],
-- gtk_config_prefix="$withval", gtk_config_prefix="")
--AC_ARG_WITH(gtk-exec-prefix,[ --with-gtk-exec-prefix=PFX Exec prefix where GTK is installed (optional)],
-- gtk_config_exec_prefix="$withval", gtk_config_exec_prefix="")
--AC_ARG_ENABLE(gtktest, [ --disable-gtktest Do not try to compile and run a test GTK program],
-- , enable_gtktest=yes)
--
-- for module in . $4
-- do
-- case "$module" in
-- gthread)
-- gtk_config_args="$gtk_config_args gthread"
-- ;;
-- esac
-- done
--
-- if test x$gtk_config_exec_prefix != x ; then
-- gtk_config_args="$gtk_config_args --exec-prefix=$gtk_config_exec_prefix"
-- if test x${GTK_CONFIG+set} != xset ; then
-- GTK_CONFIG=$gtk_config_exec_prefix/bin/gtk-config
-- fi
-- fi
-- if test x$gtk_config_prefix != x ; then
-- gtk_config_args="$gtk_config_args --prefix=$gtk_config_prefix"
-- if test x${GTK_CONFIG+set} != xset ; then
-- GTK_CONFIG=$gtk_config_prefix/bin/gtk-config
-- fi
-- fi
--
-- AC_PATH_PROG(GTK_CONFIG, gtk-config, no)
-- min_gtk_version=ifelse([$1], ,0.99.7,$1)
-- AC_MSG_CHECKING(for GTK - version >= $min_gtk_version)
-- no_gtk=""
-- if test "$GTK_CONFIG" = "no" ; then
-- no_gtk=yes
-- else
-- GTK_CFLAGS=`$GTK_CONFIG $gtk_config_args --cflags`
-- GTK_LIBS=`$GTK_CONFIG $gtk_config_args --libs`
-- gtk_config_major_version=`$GTK_CONFIG $gtk_config_args --version | \
-- sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\1/'`
-- gtk_config_minor_version=`$GTK_CONFIG $gtk_config_args --version | \
-- sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\2/'`
-- gtk_config_micro_version=`$GTK_CONFIG $gtk_config_args --version | \
-- sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\3/'`
-- if test "x$enable_gtktest" = "xyes" ; then
-- ac_save_CFLAGS="$CFLAGS"
-- ac_save_LIBS="$LIBS"
-- CFLAGS="$CFLAGS $GTK_CFLAGS"
-- LIBS="$GTK_LIBS $LIBS"
--dnl
--dnl Now check if the installed GTK is sufficiently new. (Also sanity
--dnl checks the results of gtk-config to some extent
--dnl
-- rm -f conf.gtktest
-- AC_TRY_RUN([
--#include <gtk/gtk.h>
--#include <stdio.h>
--#include <stdlib.h>
--
--int
--main ()
--{
-- int major, minor, micro;
-- char *tmp_version;
--
-- system ("touch conf.gtktest");
--
-- /* HP/UX 9 (%@#!) writes to sscanf strings */
-- tmp_version = g_strdup("$min_gtk_version");
-- if (sscanf(tmp_version, "%d.%d.%d", &major, &minor, µ) != 3) {
-- printf("%s, bad version string\n", "$min_gtk_version");
-- exit(1);
-- }
--
-- if ((gtk_major_version != $gtk_config_major_version) ||
-- (gtk_minor_version != $gtk_config_minor_version) ||
-- (gtk_micro_version != $gtk_config_micro_version))
-- {
-- printf("\n*** 'gtk-config --version' returned %d.%d.%d, but GTK+ (%d.%d.%d)\n",
-- $gtk_config_major_version, $gtk_config_minor_version, $gtk_config_micro_version,
-- gtk_major_version, gtk_minor_version, gtk_micro_version);
-- printf ("*** was found! If gtk-config was correct, then it is best\n");
-- printf ("*** to remove the old version of GTK+. You may also be able to fix the error\n");
-- printf("*** by modifying your LD_LIBRARY_PATH enviroment variable, or by editing\n");
-- printf("*** /etc/ld.so.conf. Make sure you have run ldconfig if that is\n");
-- printf("*** required on your system.\n");
-- printf("*** If gtk-config was wrong, set the environment variable GTK_CONFIG\n");
-- printf("*** to point to the correct copy of gtk-config, and remove the file config.cache\n");
-- printf("*** before re-running configure\n");
-- }
--#if defined (GTK_MAJOR_VERSION) && defined (GTK_MINOR_VERSION) && defined (GTK_MICRO_VERSION)
-- else if ((gtk_major_version != GTK_MAJOR_VERSION) ||
-- (gtk_minor_version != GTK_MINOR_VERSION) ||
-- (gtk_micro_version != GTK_MICRO_VERSION))
-- {
-- printf("*** GTK+ header files (version %d.%d.%d) do not match\n",
-- GTK_MAJOR_VERSION, GTK_MINOR_VERSION, GTK_MICRO_VERSION);
-- printf("*** library (version %d.%d.%d)\n",
-- gtk_major_version, gtk_minor_version, gtk_micro_version);
-- }
--#endif /* defined (GTK_MAJOR_VERSION) ... */
-- else
-- {
-- if ((gtk_major_version > major) ||
-- ((gtk_major_version == major) && (gtk_minor_version > minor)) ||
-- ((gtk_major_version == major) && (gtk_minor_version == minor) && (gtk_micro_version >= micro)))
-- {
-- return 0;
-- }
-- else
-- {
-- printf("\n*** An old version of GTK+ (%d.%d.%d) was found.\n",
-- gtk_major_version, gtk_minor_version, gtk_micro_version);
-- printf("*** You need a version of GTK+ newer than %d.%d.%d. The latest version of\n",
-- major, minor, micro);
-- printf("*** GTK+ is always available from ftp://ftp.gtk.org.\n");
-- printf("***\n");
-- printf("*** If you have already installed a sufficiently new version, this error\n");
-- printf("*** probably means that the wrong copy of the gtk-config shell script is\n");
-- printf("*** being found. The easiest way to fix this is to remove the old version\n");
-- printf("*** of GTK+, but you can also set the GTK_CONFIG environment to point to the\n");
-- printf("*** correct copy of gtk-config. (In this case, you will have to\n");
-- printf("*** modify your LD_LIBRARY_PATH enviroment variable, or edit /etc/ld.so.conf\n");
-- printf("*** so that the correct libraries are found at run-time))\n");
-- }
-- }
-- return 1;
--}
--],, no_gtk=yes,[echo $ac_n "cross compiling; assumed OK... $ac_c"])
-- CFLAGS="$ac_save_CFLAGS"
-- LIBS="$ac_save_LIBS"
-- fi
-- fi
-- if test "x$no_gtk" = x ; then
-- AC_MSG_RESULT(yes)
-- ifelse([$2], , :, [$2])
-- else
-- AC_MSG_RESULT(no)
-- if test "$GTK_CONFIG" = "no" ; then
-- echo "*** The gtk-config script installed by GTK could not be found"
-- echo "*** If GTK was installed in PREFIX, make sure PREFIX/bin is in"
-- echo "*** your path, or set the GTK_CONFIG environment variable to the"
-- echo "*** full path to gtk-config."
-- else
-- if test -f conf.gtktest ; then
-- :
-- else
-- echo "*** Could not run GTK test program, checking why..."
-- CFLAGS="$CFLAGS $GTK_CFLAGS"
-- LIBS="$LIBS $GTK_LIBS"
-- AC_TRY_LINK([
--#include <gtk/gtk.h>
--#include <stdio.h>
--], [ return ((gtk_major_version) || (gtk_minor_version) || (gtk_micro_version)); ],
-- [ echo "*** The test program compiled, but did not run. This usually means"
-- echo "*** that the run-time linker is not finding GTK or finding the wrong"
-- echo "*** version of GTK. If it is not finding GTK, you'll need to set your"
-- echo "*** LD_LIBRARY_PATH environment variable, or edit /etc/ld.so.conf to point"
-- echo "*** to the installed location Also, make sure you have run ldconfig if that"
-- echo "*** is required on your system"
-- echo "***"
-- echo "*** If you have an old version installed, it is best to remove it, although"
-- echo "*** you may also be able to get things to work by modifying LD_LIBRARY_PATH"
-- echo "***"
-- echo "*** If you have a RedHat 5.0 system, you should remove the GTK package that"
-- echo "*** came with the system with the command"
-- echo "***"
-- echo "*** rpm --erase --nodeps gtk gtk-devel" ],
-- [ echo "*** The test program failed to compile or link. See the file config.log for the"
-- echo "*** exact error that occured. This usually means GTK was incorrectly installed"
-- echo "*** or that you have moved GTK since it was installed. In the latter case, you"
-- echo "*** may want to edit the gtk-config script: $GTK_CONFIG" ])
-- CFLAGS="$ac_save_CFLAGS"
-- LIBS="$ac_save_LIBS"
-- fi
-- fi
-- GTK_CFLAGS=""
-- GTK_LIBS=""
-- ifelse([$3], , :, [$3])
-- fi
-- AC_SUBST(GTK_CFLAGS)
-- AC_SUBST(GTK_LIBS)
-- rm -f conf.gtktest
--])
--
---- mbrowse-0.2.3/configure.in~ Thu Apr 4 10:54:52 2002
-+++ mbrowse-0.2.3/configure.in Thu Apr 4 10:54:52 2002
-@@ -10,9 +10,7 @@
- AC_HEADER_STDC
-
- AC_CHECK_LIB(socket,getservbyname)
--AC_CHECK_FUNC(gethostbyname, ,
-- AC_CHECK_LIB(nsl, gethostbyname))
--AC_CHECK_LIB(nsl,gethostbyname)
-+AC_CHECK_FUNC(gethostbyname, [], AC_CHECK_LIB(nsl, gethostbyname))
- AC_CHECK_LIB(crypto,EVP_md5)
- AC_CHECK_LIB(kstat,kstat_lookup)
- AC_CHECK_LIB(snmp,bprintf,AC_DEFINE(HAVE_BROKEN_API))
projects / packages / mbrowse.git / commitdiff