summaryrefslogtreecommitdiff
path: root/source4
diff options
context:
space:
mode:
authorAndrew Tridgell <tridge@samba.org>2010-03-17 00:22:54 -0600
committerAndrew Tridgell <tridge@samba.org>2010-04-06 20:26:51 +1000
commit10935a33544824207c4e7df946908c857d20c946 (patch)
tree470f9b5d0393addca4abfe0c16a698fe6b763563 /source4
parentcb0bf90b1045d68315ce9d7c61cb1493bfb71306 (diff)
downloadsamba-10935a33544824207c4e7df946908c857d20c946.tar.gz
samba-10935a33544824207c4e7df946908c857d20c946.tar.bz2
samba-10935a33544824207c4e7df946908c857d20c946.zip
build: optionally enable builtin popt
Diffstat (limited to 'source4')
-rw-r--r--source4/wscript2
-rw-r--r--source4/wscript_build2
2 files changed, 3 insertions, 1 deletions
diff --git a/source4/wscript b/source4/wscript
index ae6a64f484..fe5df0d959 100644
--- a/source4/wscript
+++ b/source4/wscript
@@ -17,6 +17,7 @@ def set_options(opt):
opt.recurse('../lib/nss_wrapper')
opt.recurse('../lib/socket_wrapper')
opt.recurse('../lib/uid_wrapper')
+ opt.recurse('../lib/popt')
def configure(conf):
conf.define('PACKAGE_NAME', 'samba')
@@ -60,6 +61,7 @@ def configure(conf):
conf.sub_config('../lib/nss_wrapper')
conf.sub_config('../lib/socket_wrapper')
conf.sub_config('../lib/uid_wrapper')
+ conf.sub_config('../lib/popt')
conf.sub_config('lib/smbreadline')
conf.SAMBA_CONFIG_H('include/config.h')
diff --git a/source4/wscript_build b/source4/wscript_build
index b351f488d5..9bcebe9ec8 100644
--- a/source4/wscript_build
+++ b/source4/wscript_build
@@ -15,7 +15,6 @@ bld.SAMBA_MKVERSION('version.h')
# this sets up some aliases
bld.TARGET_ALIAS('attr', 'XATTR')
bld.TARGET_ALIAS('execinfo', 'EXECINFO')
-bld.TARGET_ALIAS('popt', 'LIBPOPT')
bld.TARGET_ALIAS('tevent', 'LIBTEVENT_EXT')
bld.TARGET_ALIAS('z', 'ZLIB')
bld.TARGET_ALIAS('pam', 'PAM')
@@ -74,6 +73,7 @@ bld.BUILD_SUBDIR('lib/cmdline')
bld.BUILD_SUBDIR('../lib/socket_wrapper')
bld.BUILD_SUBDIR('../lib/nss_wrapper')
bld.BUILD_SUBDIR('../lib/uid_wrapper')
+bld.BUILD_SUBDIR('../lib/popt')
bld.BUILD_SUBDIR('lib/stream')
bld.BUILD_SUBDIR('../lib/util')
bld.BUILD_SUBDIR('../lib/tdr')