4 files changed, 12 insertions, 9 deletions
diff --git a/source4/lib/cmdline/wscript_build b/source4/lib/cmdline/wscript_build
index 4494c7d2eb..0229089167 100644
--- a/source4/lib/cmdline/wscript_build
+++ b/source4/lib/cmdline/wscript_build
@@ -3,12 +3,12 @@
 bld.SAMBA_SUBSYSTEM('LIBCMDLINE_CREDENTIALS',
 	source='credentials.c',
 	autoproto='credentials.h',
-	public_deps='CREDENTIALS LIBPOPT'
+	public_deps='CREDENTIALS popt'
 	)
 
 bld.SAMBA_SUBSYSTEM('POPT_SAMBA',
 	source='popt_common.c',
-	public_deps='LIBPOPT',
+	public_deps='popt',
 	public_headers='popt_common.h:popt.h',
         header_path='samba',
         deps='talloc'
@@ -18,7 +18,7 @@ bld.SAMBA_SUBSYSTEM('POPT_SAMBA',
 bld.SAMBA_SUBSYSTEM('POPT_CREDENTIALS',
 	source='popt_credentials.c',
 	autoproto='popt_credentials.h',
-	public_deps='CREDENTIALS LIBCMDLINE_CREDENTIALS LIBPOPT',
+	public_deps='CREDENTIALS LIBCMDLINE_CREDENTIALS popt',
 	deps='LIBSAMBA-UTIL'
 	)
 
diff --git a/source4/lib/ldb/wscript b/source4/lib/ldb/wscript
index 97e345b834..e0269d7607 100644
--- a/source4/lib/ldb/wscript
+++ b/source4/lib/ldb/wscript
@@ -11,6 +11,7 @@ import wafsamba
 
 LIBTDB_DIR= srcdir + '/lib/tdb'
 LIBTEVENT_DIR= srcdir + '/lib/tevent'
+LIBPOPT_DIR= srcdir + '/lib/popt'
 
 def set_options(opt):
     opt.BUILTIN_DEFAULT('replace')
@@ -21,6 +22,7 @@ def set_options(opt):
 def configure(conf):
     conf.sub_config(LIBTDB_DIR)
     conf.sub_config(LIBTEVENT_DIR)
+    conf.sub_config(LIBPOPT_DIR)
     # where does the default LIBDIR end up? in conf.env somewhere?
     #
     conf.CONFIG_PATH('LDB_MODULESDIR', conf.SUBST_ENV_VAR('MODULESDIR') + '/ldb')
@@ -39,6 +41,7 @@ def configure(conf):
 def build(bld):
     bld.BUILD_SUBDIR(LIBTDB_DIR)
     bld.BUILD_SUBDIR(LIBTEVENT_DIR)
+    bld.BUILD_SUBDIR(LIBPOPT_DIR)
 
     # in Samba4 we build some extra modules, and add extra
     # capabilities to the ldb cmdline tools
diff --git a/source4/lib/registry/wscript_build b/source4/lib/registry/wscript_build
index 16276674f6..66f2aa86d5 100644
--- a/source4/lib/registry/wscript_build
+++ b/source4/lib/registry/wscript_build
@@ -30,7 +30,7 @@ bld.SAMBA_BINARY('regdiff',
 	source='tools/regdiff.c',
 	manpages='man/regdiff.1',
 	installdir='BINDIR',
-	deps='LIBSAMBA-HOSTCONFIG registry LIBPOPT POPT_SAMBA POPT_CREDENTIALS'
+	deps='LIBSAMBA-HOSTCONFIG registry popt POPT_SAMBA POPT_CREDENTIALS'
 	)
 
 
@@ -38,7 +38,7 @@ bld.SAMBA_BINARY('regpatch',
 	source='tools/regpatch.c',
 	manpages='man/regpatch.1',
 	installdir='BINDIR',
-	deps='LIBSAMBA-HOSTCONFIG registry LIBPOPT POPT_SAMBA POPT_CREDENTIALS registry_common'
+	deps='LIBSAMBA-HOSTCONFIG registry popt POPT_SAMBA POPT_CREDENTIALS registry_common'
 	)
 
 
@@ -46,7 +46,7 @@ bld.SAMBA_BINARY('regshell',
 	source='tools/regshell.c',
 	manpages='man/regshell.1',
 	installdir='BINDIR',
-	deps='LIBSAMBA-HOSTCONFIG LIBPOPT registry POPT_SAMBA POPT_CREDENTIALS SMBREADLINE registry_common'
+	deps='LIBSAMBA-HOSTCONFIG popt registry POPT_SAMBA POPT_CREDENTIALS SMBREADLINE registry_common'
 	)
 
 
@@ -54,7 +54,7 @@ bld.SAMBA_BINARY('regtree',
 	source='tools/regtree.c',
 	manpages='man/regtree.1',
 	installdir='BINDIR',
-	deps='LIBSAMBA-HOSTCONFIG LIBPOPT registry POPT_SAMBA POPT_CREDENTIALS registry_common'
+	deps='LIBSAMBA-HOSTCONFIG popt registry POPT_SAMBA POPT_CREDENTIALS registry_common'
 	)
 
 
diff --git a/source4/lib/wmi/wscript_build b/source4/lib/wmi/wscript_build
index 04ef860d67..fd8c17a667 100644
--- a/source4/lib/wmi/wscript_build
+++ b/source4/lib/wmi/wscript_build
@@ -13,14 +13,14 @@ bld.SAMBA_SUBSYSTEM('WMI',
 bld.SAMBA_BINARY('wmic',
 	source='tools/wmic.c',
 	installdir='BINDIR',
-	deps='POPT_SAMBA POPT_CREDENTIALS LIBPOPT WMI'
+	deps='POPT_SAMBA POPT_CREDENTIALS popt WMI'
 	)
 
 
 bld.SAMBA_BINARY('wmis',
 	source='tools/wmis.c',
 	installdir='BINDIR',
-	deps='POPT_SAMBA POPT_CREDENTIALS LIBPOPT WMI'
+	deps='POPT_SAMBA POPT_CREDENTIALS popt WMI'
 	)