aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--configure.ac38
-rw-r--r--src/transport/Makefile.am6
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)
383AC_SUBST(POSTGRES_CPPFLAGS) 383AC_SUBST(POSTGRES_CPPFLAGS)
384AC_SUBST(POSTGRES_LDFLAGS) 384AC_SUBST(POSTGRES_LDFLAGS)
385 385
386# test for pcap
387pcap=0
388AC_MSG_CHECKING(for libpcap)
389AC_ARG_WITH(pcap,
390 [ --with-pcap=PFX base of pcap installation],
391 [AC_MSG_RESULT("$with_pcap")
392 case $with_pcap in
393 no)
394 ;;
395 yes)
396 AC_CHECK_HEADERS(pcap.h,
397 pcap=1)
398 ;;
399 *)
400 LDFLAGS="-L$with_pcap/lib $LDFLAGS"
401 CPPFLAGS="-I$with_pcap/include $CPPFLAGS"
402 AC_CHECK_HEADERS(pcap.h,
403 EXT_LIB_PATH="-L$with_pcap/lib $EXT_LIB_PATH"
404 PCAP_LDFLAGS="-L$with_pcap/lib"
405 PCAP_CPPFLAGS="-I$with_pcap/include"
406 pcap=1)
407 LDFLAGS=$SAVE_LDFLAGS
408 CPPFLAGS=$SAVE_CPPFLAGS
409 ;;
410 esac
411 ],
412 [AC_MSG_RESULT([--with-pcap not specified])
413 AC_CHECK_HEADERS(pcap.h, pcap=1)])
414AM_CONDITIONAL(HAVE_PCAP, test x$pcap = x1)
415AC_SUBST(PCAP_CPPFLAGS)
416AC_SUBST(PCAP_LDFLAGS)
417
418
419# test for libz (maybe required for linking mysql) 386# test for libz (maybe required for linking mysql)
420zlib=1 387zlib=1
421AC_CHECK_LIB(z, compress,,zlib=0) 388AC_CHECK_LIB(z, compress,,zlib=0)
@@ -878,11 +845,6 @@ then
878 AC_MSG_NOTICE([NOTICE: libesmtp not found, monkey will not be installed.]) 845 AC_MSG_NOTICE([NOTICE: libesmtp not found, monkey will not be installed.])
879fi 846fi
880 847
881if test "x$pcap" != "x1"
882then
883 AC_MSG_NOTICE([NOTICE: libpcap not found, WiFi support will not be installed.])
884fi
885
886if test "x$openssl" != "x1" 848if test "x$openssl" != "x1"
887then 849then
888 AC_MSG_NOTICE([NOTICE: OpenSSL not found, monkey will not be installed.]) 850 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 = \
115 test_plugin_transport_wlan_dummy.c 115 test_plugin_transport_wlan_dummy.c
116 116
117gnunet_transport_wlan_helper_LDADD = \ 117gnunet_transport_wlan_helper_LDADD = \
118 $(top_builddir)/src/util/libgnunetutil.la \ 118 $(top_builddir)/src/util/libgnunetutil.la
119 -lpcap
120 119
121gnunet_transport_wlan_helper_dummy_LDADD = \ 120gnunet_transport_wlan_helper_dummy_LDADD = \
122 $(top_builddir)/src/util/libgnunetutil.la \ 121 $(top_builddir)/src/util/libgnunetutil.la
123 -lpcap
124 122
125gnunet_nat_client_SOURCES = \ 123gnunet_nat_client_SOURCES = \
126 $(NATCLIENT) 124 $(NATCLIENT)