From 10935a33544824207c4e7df946908c857d20c946 Mon Sep 17 00:00:00 2001
From: Andrew Tridgell <tridge@samba.org>
Date: Wed, 17 Mar 2010 00:22:54 -0600
Subject: build: optionally enable builtin popt

---
 source4/wscript       | 2 ++
 source4/wscript_build | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

(limited to 'source4')

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')
-- 
cgit