aboutsummaryrefslogtreecommitdiffstats
path: root/configure.in
diff options
context:
space:
mode:
authorJörg Mayer <jmayer@loplof.de>2004-07-20 17:42:42 +0000
committerJörg Mayer <jmayer@loplof.de>2004-07-20 17:42:42 +0000
commiteebd26f377a56b8d8d4f1131a8435ae73100d999 (patch)
treebd3099797b8a4d594a2913bf4a18eff801c92f38 /configure.in
parent66e1c280a3798787462f6ad59465bce1b8aff532 (diff)
Make configure continue after disabling Net-SNMP when the openssl libs
are reuired for SNMP to link but not enabled on configure. svn path=/trunk/; revision=11443
Diffstat (limited to 'configure.in')
-rw-r--r--configure.in15
1 files changed, 9 insertions, 6 deletions
diff --git a/configure.in b/configure.in
index 4ed2c6d6a8..272cb06e29 100644
--- a/configure.in
+++ b/configure.in
@@ -816,13 +816,16 @@ if test "x$NETSNMPCONFIG" != "xno" -a "x$NETSNMPCONFIG" != "x" -a -x "$NETSNMPCO
AC_CHECK_HEADERS(net-snmp/net-snmp-config.h net-snmp/library/default_store.h)
if test "x$ac_cv_header_net_snmp_net_snmp_config_h" = "xyes" -a "x$ac_cv_header_net_snmp_library_default_store_h" = "xyes" ; then
SNMP_LIBS=`$NETSNMPCONFIG --libs`
- if test "x$SSL_LIBS" = "x" ; then
- if echo "$SNMP_LIBS" | grep crypto ; then
- AC_MSG_ERROR(SNMP requires openssl but ssl not enabled)
- fi
+ if echo "$SNMP_LIBS" | grep crypto && test "x$SSL_LIBS" = "x"; then
+ AC_MSG_RESULT(Net-SNMP requires openssl but ssl not enabled - disabling Net-SNMP)
+ CFLAGS="$ethereal_save_CFLAGS"
+ CPPFLAGS="$ethereal_save_CPPFLAGS"
+ SNMP_LIBS=
+ NETSNMPCONFIG="no"
+ else
+ AC_DEFINE(HAVE_NET_SNMP, 1, [Define to enable support for NET-SNMP])
+ have_net_snmp="yes"
fi
- AC_DEFINE(HAVE_NET_SNMP, 1, [Define to enable support for NET-SNMP])
- have_net_snmp="yes"
else
# technically, we should retry ucd-snmp but it's
# unlikely they have installed net-snmp-config and not