F5/unison
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

tighten up configuration reqs for tap and emu

Browse Source
This commit is contained in:
Craig Dowell
2009-02-06 14:49:11 -08:00
parent d19854afef
commit 893e1c1e71
3 changed files with 14 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/devices/emu/wscript
View File

@@ -2,14 +2,11 @@
def configure(conf):
if conf.env['ENABLE_THREADING']:
conf.env['ENABLE_EMU'] = conf.check(header_name='linux/if_ether.h',
define_name='HAVE_IF_ETHER_H')
conf.report_optional_feature("EmuNetDevice", "Emulated Net Device",
conf.env['ENABLE_EMU'],
"<linux/if_ether.h> include not detected")
conf.env['ENABLE_EMU'] = True
conf.report_optional_feature("EmuNetDevice", "Emulated Net Device", True,
"")
else:
conf.report_optional_feature("EmuNetDevice", "Emulated Net Device",
False,
conf.report_optional_feature("EmuNetDevice", "Emulated Net Device", False,
"needs threading support which is not available")
def build(bld):

7
src/devices/tap-bridge/tap-creator.cc
View File

@@ -29,10 +29,17 @@
#include <sys/ioctl.h>
#include <sys/types.h>
#include <sys/socket.h>
#if 0
#include <linux/un.h>
#include <linux/if.h>
#include <linux/if_tun.h>
#include <linux/route.h>
#else
#include <sys/un.h>
#include <net/if.h>
#include <linux/if_tun.h>
#include <net/route.h>
#endif
#include <netinet/in.h>
#include "tap-encode-decode.h"

6
src/devices/tap-bridge/wscript
View File

@@ -2,11 +2,11 @@
def configure(conf):
if conf.env['ENABLE_THREADING']:
conf.env['ENABLE_TAP'] = conf.check(header_name='linux/if_ether.h',
define_name='HAVE_IF_ETHER_H')
conf.env['ENABLE_TAP'] = conf.check(header_name='linux/if_tun.h',
define_name='HAVE_IF_TUN_H')
conf.report_optional_feature("TapBridge", "Tap Bridge",
conf.env['ENABLE_TAP'],
"<linux/if_ether.h> include not detected")
"<linux/if_tun.h> include not detected")
else:
conf.report_optional_feature("TapBridge", "Tap Bridge",
False,