[GNUnet-SVN] r15465 - in gnunet: contrib src/transport

[gnunet]

Author: grothoff
Date: 2011-06-08 12:23:47 +0200 (Wed, 08 Jun 2011)
New Revision: 15465

Modified:
   gnunet/contrib/defaults.conf
   gnunet/src/transport/Makefile.am
Log:
stuff

Modified: gnunet/contrib/defaults.conf
===================================================================
--- gnunet/contrib/defaults.conf        2011-06-08 09:56:31 UTC (rev 15464)
+++ gnunet/contrib/defaults.conf        2011-06-08 10:23:47 UTC (rev 15465)
@@ -78,6 +78,13 @@
 [transport-https]
 PORT = 4433
 
+[transport-wlan]
+# Name of the interface in monitor mode (typically monX)
+INTERFACE = mon0
+# Real hardware, no testing
+TESTMODE = 0
+
+
 [arm]
 PORT = 2087
 HOSTNAME = localhost

Modified: gnunet/src/transport/Makefile.am
===================================================================
--- gnunet/src/transport/Makefile.am    2011-06-08 09:56:31 UTC (rev 15464)
+++ gnunet/src/transport/Makefile.am    2011-06-08 10:23:47 UTC (rev 15465)
@@ -32,7 +32,6 @@
   AM_CFLAGS = --coverage -O0
 endif
 
-if HAVE_PCAP
 if LINUX
  WLAN_BIN = gnunet-transport-wlan-helper
  WLAN_BIN_DUMMY = gnunet-transport-wlan-helper-dummy
@@ -41,7 +40,6 @@
  WLAN_REL_TEST = test_transport_api_reliability_wlan
  WLAN_UREL_TEST = test_transport_api_unreliability_wlan
 endif
-endif
 
 if !MINGW
 UNIX_PLUGIN_LA = libgnunet_plugin_transport_unix.la
@@ -435,7 +433,6 @@
  $(top_builddir)/src/hello/libgnunethello.la \
  $(top_builddir)/src/util/libgnunetutil.la
 
-if HAVE_PCAP
 if LINUX
 test_transport_api_wlan_SOURCES = \
  test_transport_api.c
@@ -444,7 +441,6 @@
  $(top_builddir)/src/hello/libgnunethello.la \
  $(top_builddir)/src/util/libgnunetutil.la  
 endif
-endif
 
 test_quota_compliance_tcp_SOURCES = \
  test_quota_compliance.c