From: Christian Grothoff <christian@grothoff.org>
Date: Wed, 8 Jun 2011 10:23:47 +0000 (+0000)
Subject: stuff
X-Git-Tag: initial-import-from-subversion-38251~18296
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=cc78806664bc75ba5724116deb5a0fa82a04d7e9;p=oweals%2Fgnunet.git

stuff
---

diff --git a/contrib/defaults.conf b/contrib/defaults.conf
index 00f22370c..0d1bffab9 100644
--- a/contrib/defaults.conf
+++ b/contrib/defaults.conf
@@ -78,6 +78,13 @@ PORT = 1080
 [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
diff --git a/src/transport/Makefile.am b/src/transport/Makefile.am
index 0b2305c22..031cfe8b9 100644
--- a/src/transport/Makefile.am
+++ b/src/transport/Makefile.am
@@ -32,7 +32,6 @@ if USE_COVERAGE
   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 @@ if LINUX
  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 @@ test_transport_api_unreliability_udp_LDADD = \
  $(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 @@ test_transport_api_wlan_LDADD = \
  $(top_builddir)/src/hello/libgnunethello.la \
  $(top_builddir)/src/util/libgnunetutil.la  
 endif
-endif
 
 test_quota_compliance_tcp_SOURCES = \
  test_quota_compliance.c