From bc460c0dd8d61ab51ebd944c54b9826cac00920b Mon Sep 17 00:00:00 2001 From: Christian Grothoff Date: Wed, 8 Jun 2011 09:56:31 +0000 Subject: [PATCH] pcap no longer needed --- configure.ac | 38 -------------------------------------- src/transport/Makefile.am | 6 ++---- 2 files changed, 2 insertions(+), 42 deletions(-) diff --git a/configure.ac b/configure.ac index 3a10ba129..815c040b0 100644 --- a/configure.ac +++ b/configure.ac @@ -383,39 +383,6 @@ AM_CONDITIONAL(HAVE_POSTGRES, test x$postgres = xtrue) AC_SUBST(POSTGRES_CPPFLAGS) AC_SUBST(POSTGRES_LDFLAGS) -# test for pcap -pcap=0 -AC_MSG_CHECKING(for libpcap) -AC_ARG_WITH(pcap, - [ --with-pcap=PFX base of pcap installation], - [AC_MSG_RESULT("$with_pcap") - case $with_pcap in - no) - ;; - yes) - AC_CHECK_HEADERS(pcap.h, - pcap=1) - ;; - *) - LDFLAGS="-L$with_pcap/lib $LDFLAGS" - CPPFLAGS="-I$with_pcap/include $CPPFLAGS" - AC_CHECK_HEADERS(pcap.h, - EXT_LIB_PATH="-L$with_pcap/lib $EXT_LIB_PATH" - PCAP_LDFLAGS="-L$with_pcap/lib" - PCAP_CPPFLAGS="-I$with_pcap/include" - pcap=1) - LDFLAGS=$SAVE_LDFLAGS - CPPFLAGS=$SAVE_CPPFLAGS - ;; - esac - ], - [AC_MSG_RESULT([--with-pcap not specified]) - AC_CHECK_HEADERS(pcap.h, pcap=1)]) -AM_CONDITIONAL(HAVE_PCAP, test x$pcap = x1) -AC_SUBST(PCAP_CPPFLAGS) -AC_SUBST(PCAP_LDFLAGS) - - # test for libz (maybe required for linking mysql) zlib=1 AC_CHECK_LIB(z, compress,,zlib=0) @@ -878,11 +845,6 @@ then AC_MSG_NOTICE([NOTICE: libesmtp not found, monkey will not be installed.]) fi -if test "x$pcap" != "x1" -then - AC_MSG_NOTICE([NOTICE: libpcap not found, WiFi support will not be installed.]) -fi - if test "x$openssl" != "x1" then AC_MSG_NOTICE([NOTICE: OpenSSL not found, monkey will not be installed.]) diff --git a/src/transport/Makefile.am b/src/transport/Makefile.am index a13cc0518..0b2305c22 100644 --- a/src/transport/Makefile.am +++ b/src/transport/Makefile.am @@ -115,12 +115,10 @@ gnunet_transport_wlan_helper_dummy_SOURCES = \ test_plugin_transport_wlan_dummy.c gnunet_transport_wlan_helper_LDADD = \ - $(top_builddir)/src/util/libgnunetutil.la \ - -lpcap + $(top_builddir)/src/util/libgnunetutil.la gnunet_transport_wlan_helper_dummy_LDADD = \ - $(top_builddir)/src/util/libgnunetutil.la \ - -lpcap + $(top_builddir)/src/util/libgnunetutil.la gnunet_nat_client_SOURCES = \ $(NATCLIENT) -- 2.25.1