s3-waf: renamed samba-util to samba-util3

also added alias samba-util when not using a toplevel build

Pair-Programmed-With: Andrew Bartlett <abartlet@samba.org>

diff --git a/source3/wscript_build b/source3/wscript_build
index a93dceb52de60b8864201f98dc208e07e715e34d..23a835b9d139469203701c91ace16327fbaa8e1b 100644 (file)
--- a/source3/wscript_build
+++ b/source3/wscript_build
@@ -806,7 +806,7 @@ bld.SAMBA3_SUBSYSTEM('KRBCLIENT',
 
 bld.SAMBA3_SUBSYSTEM('LIBS',
                     source=LIB_SRC,
-                    deps='LIBCRYPTO ndr ndr-util security NDR_SECURITY charset NDR_MESSAGING LIBASYNC_REQ tdb-wrap3 samba-util CHARSET UTIL_TDB SAMBA_VERSION',
+                    deps='LIBCRYPTO ndr ndr-util security NDR_SECURITY charset NDR_MESSAGING LIBASYNC_REQ tdb-wrap3 samba-util3 CHARSET UTIL_TDB SAMBA_VERSION',
                     vars=locals())
 
 bld.SAMBA3_SUBSYSTEM('LIB_NONSMBD',
@@ -994,7 +994,7 @@ bld.SAMBA3_SUBSYSTEM('CHARSET',
                     public_deps='ICONV_WRAPPER CODEPOINTS',
                     deps='DYNCONFIG')
 
-bld.SAMBA3_SUBSYSTEM('samba-util',
+bld.SAMBA3_SUBSYSTEM('samba-util3',
                     source=UTIL_SRC,
                     deps='talloc CHARSET LIBCRYPTO',
                     vars=locals())
@@ -1343,6 +1343,7 @@ if not bld.env.toplevel_build:
     bld.SAMBA3_SUBSYSTEM('POPT_SAMBA', source='', deps='POPT_SAMBA3')
     bld.SAMBA3_SUBSYSTEM('tdb-wrap', source='', deps='tdb-wrap3')
     bld.SAMBA3_SUBSYSTEM('errors', source='', deps='errors3')
+    bld.SAMBA3_SUBSYSTEM('samba-util', source='', deps='samba-util3')