commit ac7c4bb6f8a471561e62730c72c0b6cd0eb283e8
author paul <paul> Wed Mar 19 04:25:08 2003 +0000
committer paul <paul> Wed Mar 19 04:25:08 2003 +0000
tree f14734c3c4ab88bc729179ad09d738ab0a1621c9
parent aa83f278de0d01bc7d9bd4983bbfb1284d03de21

Copied configure.in to configure.ac rather than other way around.
Restore Amir's netsnmp build fix.

configure.ac

diff --git a/configure.ac b/configure.ac
index c274a0d..4c30212 100755
--- a/configure.ac
+++ b/configure.ac
@@ -617,6 +617,19 @@
 	AC_CHECK_LIB(snmp, asn_parse_int, HAVE_SNMP=yes)
 	LIBS="${old_libs}"
   fi
+  if test "${HAVE_SNMP}" = ""; then
+	if test "${NEED_CRYPTO}" = ""; then
+	     old_libs="${LIBS}"
+	     LIBS="-L/usr/lib"
+	     AC_CHECK_LIB(netsnmp, asn_parse_int, [HAVE_NETSNMP=yes; HAVE_SNMP=yes ])
+	     LIBS="${old_libs}"
+	else
+	     old_libs="${LIBS}"
+	     LIBS="-L/usr/lib"
+       	     AC_CHECK_LIB(netsnmp, asn_parse_int, [HAVE_NETSNMP=yes; HAVE_SNMP=yes; NEED_CRYPTO=yes;LIBS="$LIBS -lcrypto" ],,"-lcrypto")
+	     LIBS="${old_libs}"
+	fi
+  fi
   if test "${HAVE_SNMP}" = "yes"; then
     for ac_snmp in /usr/include/net-snmp/library/asn1.h /usr/include/ucd-snmp/asn1.h /usr/local/include/ucd-snmp/asn1.h /dev/null
     do
@@ -626,8 +639,13 @@
       /usr/include/net-snmp/*)
                   AC_DEFINE(HAVE_SNMP,,SNMP)
                   AC_DEFINE(UCD_COMPATIBLE,,SNMP)
-                  CFLAGS="${CFLAGS} -I/usr/include/ucd-snmp"
+                  CFLAGS="${CFLAGS} -I/usr/include/net-snmp -I/usr/include/net-snmp/library"
+		  if test "${HAVE_NETSNMP}" = "yes"; then
+                       AC_DEFINE(HAVE_NETSNMP,,SNMP)
+                       LIBS="${LIBS} -lnetsnmp"
+		  else
                   LIBS="${LIBS} -lsnmp"
+		  fi
                   ;;
       /usr/include/ucd-snmp/*) 
                   AC_DEFINE(HAVE_SNMP,,SNMP)

configure.in

diff --git a/configure.in b/configure.in
index c274a0d..4c30212 100755
--- a/configure.in
+++ b/configure.in
@@ -617,6 +617,19 @@
 	AC_CHECK_LIB(snmp, asn_parse_int, HAVE_SNMP=yes)
 	LIBS="${old_libs}"
   fi
+  if test "${HAVE_SNMP}" = ""; then
+	if test "${NEED_CRYPTO}" = ""; then
+	     old_libs="${LIBS}"
+	     LIBS="-L/usr/lib"
+	     AC_CHECK_LIB(netsnmp, asn_parse_int, [HAVE_NETSNMP=yes; HAVE_SNMP=yes ])
+	     LIBS="${old_libs}"
+	else
+	     old_libs="${LIBS}"
+	     LIBS="-L/usr/lib"
+       	     AC_CHECK_LIB(netsnmp, asn_parse_int, [HAVE_NETSNMP=yes; HAVE_SNMP=yes; NEED_CRYPTO=yes;LIBS="$LIBS -lcrypto" ],,"-lcrypto")
+	     LIBS="${old_libs}"
+	fi
+  fi
   if test "${HAVE_SNMP}" = "yes"; then
     for ac_snmp in /usr/include/net-snmp/library/asn1.h /usr/include/ucd-snmp/asn1.h /usr/local/include/ucd-snmp/asn1.h /dev/null
     do
@@ -626,8 +639,13 @@
       /usr/include/net-snmp/*)
                   AC_DEFINE(HAVE_SNMP,,SNMP)
                   AC_DEFINE(UCD_COMPATIBLE,,SNMP)
-                  CFLAGS="${CFLAGS} -I/usr/include/ucd-snmp"
+                  CFLAGS="${CFLAGS} -I/usr/include/net-snmp -I/usr/include/net-snmp/library"
+		  if test "${HAVE_NETSNMP}" = "yes"; then
+                       AC_DEFINE(HAVE_NETSNMP,,SNMP)
+                       LIBS="${LIBS} -lnetsnmp"
+		  else
                   LIBS="${LIBS} -lsnmp"
+		  fi
                   ;;
       /usr/include/ucd-snmp/*) 
                   AC_DEFINE(HAVE_SNMP,,SNMP)