[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[GNUnet-SVN] r15464 - in gnunet: . src/transport
From: |
gnunet |
Subject: |
[GNUnet-SVN] r15464 - in gnunet: . src/transport |
Date: |
Wed, 8 Jun 2011 11:56:31 +0200 |
Author: grothoff
Date: 2011-06-08 11:56:31 +0200 (Wed, 08 Jun 2011)
New Revision: 15464
Modified:
gnunet/configure.ac
gnunet/src/transport/Makefile.am
Log:
pcap no longer needed
Modified: gnunet/configure.ac
===================================================================
--- gnunet/configure.ac 2011-06-08 09:54:25 UTC (rev 15463)
+++ gnunet/configure.ac 2011-06-08 09:56:31 UTC (rev 15464)
@@ -383,39 +383,6 @@
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 @@
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.])
Modified: gnunet/src/transport/Makefile.am
===================================================================
--- gnunet/src/transport/Makefile.am 2011-06-08 09:54:25 UTC (rev 15463)
+++ gnunet/src/transport/Makefile.am 2011-06-08 09:56:31 UTC (rev 15464)
@@ -115,12 +115,10 @@
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)
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [GNUnet-SVN] r15464 - in gnunet: . src/transport,
gnunet <=