s3-waf: fix popt support.

Guenther

diff --git a/buildtools/wafsamba/samba3.py b/buildtools/wafsamba/samba3.py
index 6759450f60533ad1bd69740a49ea89198a911a9f..9344e55e87e4bad95c321f9901838f3ef2928c3a 100644 (file)
--- a/buildtools/wafsamba/samba3.py
+++ b/buildtools/wafsamba/samba3.py
@@ -72,6 +72,9 @@ def s3_fix_kwargs(bld, kwargs):
     if not bld.CONFIG_SET('USING_SYSTEM_TALLOC'):
         extra_includes += [ '../lib/talloc' ]
 
+    if not bld.CONFIG_SET('USING_SYSTEM_POPT'):
+        extra_includes += [ '../lib/popt' ]
+
     # s3 builds assume that they will have a bunch of extra include paths
     includes = []
     for d in extra_includes:

diff --git a/source3/wscript b/source3/wscript
index 7c01e8fcce29fab739d716bc82596e03be784b13..f248c2f187d88b311e2c6d2990ae12fa59ca1a95 100644 (file)
--- a/source3/wscript
+++ b/source3/wscript
@@ -93,6 +93,8 @@ def configure(conf):
         conf.ADD_EXTRA_INCLUDES('#lib/tevent')
     if not conf.env.USING_SYSTEM_TALLOC:
         conf.ADD_EXTRA_INCLUDES('#lib/talloc')
+    if not conf.env.USING_SYSTEM_POPT:
+        conf.ADD_EXTRA_INCLUDES('#lib/popt')
 
     conf.ADD_LDFLAGS("-Wl,--export-dynamic", testflags=True)