commit 885a85bf90c69b17cb45a59a70a86c0888a51083
author Alexander Afanasyev <alexander.afanasyev@ucla.edu> Sat Apr 12 21:01:13 2014 -0700
committer Alexander Afanasyev <alexander.afanasyev@ucla.edu> Sun Apr 13 21:15:31 2014 -0700
tree 95c2602f4498700d15cf28eb3e4358b2c64893da
parent 5cda2e0fac1447a24fc7a9c95221f1f75f2b00f6

build+face: Fixing regression that broke ethernet support

As of this commit, libpcap is required unless specifically disabled
using --without-libpcap parameter during configure stage.

Change-Id: Iec6f8bd9babfe4da193c98a49043b08319311106
Refs: #1472

wscript

diff --git a/wscript b/wscript
index ef4eade..938eed1 100644
--- a/wscript
+++ b/wscript
@@ -39,7 +39,12 @@
              tooldir=['.waf-tools'])
 
     nfdopt = opt.add_option_group('NFD Options')
-    opt.addDependencyOptions(nfdopt, 'libpcap',   '(optional)')
+    opt.addUnixOptions(nfdopt)
+    opt.addDependencyOptions(nfdopt, 'libpcap')
+    nfdopt.add_option('--without-libpcap', action='store_true', default=False,
+                      dest='without_libpcap',
+                      help='''Disable libpcap (Ethernet face support will be disabled)''')
+
     opt.addDependencyOptions(nfdopt, 'librt',     '(optional)')
     opt.addDependencyOptions(nfdopt, 'libresolv', '(optional)')
 
@@ -84,8 +89,11 @@
     conf.load('unix-socket')
 
     conf.checkDependency(name='librt', lib='rt', mandatory=False)
-    conf.checkDependency(name='libpcap', lib='pcap', mandatory=False)
     conf.checkDependency(name='libresolv', lib='resolv', mandatory=False)
+    if not conf.options.without_libpcap:
+        conf.checkDependency(name='libpcap', lib='pcap', mandatory=True,
+                             errmsg='not found, but required for Ethernet face support. '
+                                    'Specify --without-libpcap to disable Ethernet face support.')
 
     conf.load('coverage')
 
@@ -106,7 +114,7 @@
         includes='. daemon',
         )
 
-    if bld.env['HAVE_PCAP']:
+    if bld.env['HAVE_LIBPCAP']:
         nfd_objects.source += bld.path.ant_glob('daemon/face/ethernet-*.cpp')
         nfd_objects.use += ' LIBPCAP'
 
@@ -141,7 +149,7 @@
             install_prefix=None,
           )
 
-        if bld.env['HAVE_PCAP']:
+        if bld.env['HAVE_LIBPCAP']:
             unit_tests.source += bld.path.ant_glob('tests/face/ethernet.cpp')
 
         if bld.env['HAVE_UNIX_SOCKETS']:
@@ -153,7 +161,8 @@
     bld(features="subst",
         source='nfd.conf.sample.in',
         target='nfd.conf.sample',
-        install_path="${SYSCONFDIR}/ndn")
+        install_path="${SYSCONFDIR}/ndn",
+        IF_HAVE_LIBPCAP="" if bld.env['HAVE_LIBPCAP'] else "; ")
 
     bld(features='subst',
         source='tools/nfd-status-http-server.py',