diff options
| -rw-r--r-- | buildtools/wafsamba/samba3.py | 3 | ||||
| -rw-r--r-- | source3/wscript | 2 |
2 files changed, 5 insertions, 0 deletions
diff --git a/buildtools/wafsamba/samba3.py b/buildtools/wafsamba/samba3.py index 6759450f60..9344e55e87 100644 --- 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 7c01e8fcce..f248c2f187 100644 --- 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) |