aboutsummaryrefslogtreecommitdiffstats
path: root/acinclude.m4
diff options
context:
space:
mode:
authorJörg Mayer <jmayer@loplof.de>2007-09-24 06:59:40 +0000
committerJörg Mayer <jmayer@loplof.de>2007-09-24 06:59:40 +0000
commit094e2a9a5f15ba8ade40546518c8e53daeb919a6 (patch)
treecea80a11b50ede30c7d79ebc2c7b0acd63fc7285 /acinclude.m4
parentf3c4a9def01172c2e3b5c2e65442abc0252da68a (diff)
Get rid of the remains of NET-SNMP in the build process.
svn path=/trunk/; revision=22934
Diffstat (limited to 'acinclude.m4')
-rw-r--r--acinclude.m476
1 files changed, 0 insertions, 76 deletions
diff --git a/acinclude.m4 b/acinclude.m4
index 9a5333f94c..ba7c65e305 100644
--- a/acinclude.m4
+++ b/acinclude.m4
@@ -1170,82 +1170,6 @@ AC_DEFUN([AC_WIRESHARK_LIBPORTAUDIO_CHECK],[
])
#
-# AC_WIRESHARK_NETSNMP_CHECK
-#
-AC_DEFUN([AC_WIRESHARK_NETSNMP_CHECK],
-[
- dnl get the net-snmp-config binary
- if test "x$netsnmpconfig" = "x" ; then
- #
- # The user didn't specify where net-snmp-config is
- # located; search for it.
- #
- AC_PATH_PROG(NETSNMPCONFIG, net-snmp-config)
- else
- NETSNMPCONFIG=$netsnmpconfig
- if test ! -x $NETSNMPCONFIG -o ! -f $NETSNMPCONFIG ; then
- NETSNMPCONFIG=$netsnmpconfig/bin/net-snmp-config
- if test ! -x $NETSNMPCONFIG -o ! -f $NETSNMPCONFIG ; then
- AC_MSG_ERROR(Invalid net-snmp-config: $netsnmpconfig)
- fi
- fi
- fi
-
- #
- # XXX - check whether $NETSNMPCONFIG is executable?
- # if test "x$NETSNMPCONFIG" != "xno" -a "x$NETSNMPCONFIG" != "x" -a -x "$NETSNMPCONFIG" ; then
- # We already did that if it was set; presumably AC_PATH_PROG
- # will fail if it doesn't find an executable version.
- #
- if test "x$NETSNMPCONFIG" != "x" ; then
- dnl other choices for flags to use here: could also use
- dnl --prefix or --exec-prefix if you don't want the full list.
-
- #
- # Save the current settings of CFLAGS and CPPFLAGS, and add
- # the output of "$NETSNMPCONFIG --cflags" to it, so that when
- # searching for the Net-SNMP headers, we look in whatever
- # directory that output specifies.
- #
- wireshark_save_CFLAGS="$CFLAGS"
- wireshark_save_CPPFLAGS="$CPPFLAGS"
- CFLAGS="$CFLAGS `$NETSNMPCONFIG --cflags`"
- CPPFLAGS="$CPPFLAGS `$NETSNMPCONFIG --cflags`"
-
- 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 echo "$SNMP_LIBS" | grep crypto >/dev/null && test "x$SSL_LIBS" = "x"; then
- if test "x$want_netsnmp" = "xyes" ; then
- AC_MSG_ERROR(Net-SNMP requires openssl but ssl not enabled)
- else
- AC_MSG_RESULT(Net-SNMP requires openssl but ssl not enabled - disabling Net-SNMP)
- fi
- CFLAGS="$wireshark_save_CFLAGS"
- CPPFLAGS="$wireshark_save_CPPFLAGS"
- SNMP_LIBS=
- else
- AC_DEFINE(HAVE_NET_SNMP, 1, [Define to enable support for Net-SNMP])
- have_net_snmp="yes"
- fi
- else
- if test "x$want_netsnmp" = "xyes" ; then
- AC_MSG_ERROR(Net-SNMP not found)
- else
- #
- # Restore the versions of CFLAGS and
- # CPPFLAGS before we added the output
- # of '$NETSNMPCONFIG --cflags", as we
- # didn't actually find Net-SNMP there.
- #
- CFLAGS="$wireshark_save_CFLAGS"
- CPPFLAGS="$wireshark_save_CPPFLAGS"
- fi
- fi
- fi
-])
-
-#
# AC_WIRESHARK_RPM_CHECK
# Looks for the rpm program, and checks to see if we can redefine "_topdir".
#