Copied configure.in to configure.ac rather than other way around.

Restore Amir's netsnmp build fix.
This commit is contained in:
paul 2003-03-19 04:25:08 +00:00
parent aa83f278de
commit ac7c4bb6f8
2 changed files with 38 additions and 2 deletions

View File

@ -617,6 +617,19 @@ dnl AC_CHECK_LIB(snmp, asn_parse_int, HAVE_SNMP=yes)
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 @@ dnl AC_CHECK_LIB(snmp, asn_parse_int, HAVE_SNMP=yes)
/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)

View File

@ -617,6 +617,19 @@ dnl AC_CHECK_LIB(snmp, asn_parse_int, HAVE_SNMP=yes)
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 @@ dnl AC_CHECK_LIB(snmp, asn_parse_int, HAVE_SNMP=yes)
/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)