libutil: make waf rules usable by s3 waf build
authorAndrew Tridgell <tridge@samba.org>
Thu, 17 Feb 2011 04:42:10 +0000 (15:42 +1100)
committerAndrew Tridgell <tridge@samba.org>
Fri, 18 Feb 2011 04:09:47 +0000 (15:09 +1100)
we need samba-util to be s4 only for now, because of the debug system
differences

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

lib/util/wscript_build

index 6930b65b379b59f09afa9a8c3c5a856d97a325d6..5180c8c2a4c45770037e4a25c3e6371378090174 100644 (file)
@@ -1,43 +1,44 @@
 #!/usr/bin/env python
 
-bld.SAMBA_LIBRARY('samba-util',
-       source='''
-               become_daemon.c
-               blocking.c
-               data_blob.c
-               debug.c
-               dprintf.c
-               fault.c
-               fsusage.c
-               genrand.c
-               idtree.c
-               ms_fnmatch.c
-               params.c
-               parmlist.c
-               rbtree.c
-               rfc1738.c
-               select.c
-               signal.c
-               smb_threads.c
-               substitute.c
-               system.c
-               talloc_stack.c
-               time.c
-               util.c
-               util_file.c
-               util_id.c
-               util_net.c
-               util_str.c
-               util_strlist.c
-               xfile.c
-               ''',
-       public_deps='talloc LIBCRYPTO CHARSET execinfo uid_wrapper',
-       public_headers='attr.h byteorder.h data_blob.h debug.h memory.h safe_string.h time.h talloc_stack.h xfile.h dlinklist.h util.h',
-       header_path= [ ('dlinklist.h util.h', '.'), ('*', 'util') ],
-       local_include=False,
-       vnum='0.0.1',
-       pc_files='samba-util.pc'
-       )
+if bld.env._SAMBA_BUILD_ == 4:
+    bld.SAMBA_LIBRARY('samba-util',
+                      source='''
+                      become_daemon.c
+                      blocking.c
+                      data_blob.c
+                      debug.c
+                      dprintf.c
+                      fault.c
+                      fsusage.c
+                      genrand.c
+                      idtree.c
+                      ms_fnmatch.c
+                      params.c
+                      parmlist.c
+                      rbtree.c
+                      rfc1738.c
+                      select.c
+                      signal.c
+                      smb_threads.c
+                      substitute.c
+                      system.c
+                      talloc_stack.c
+                      time.c
+                      util.c
+                      util_file.c
+                      util_id.c
+                      util_net.c
+                      util_str.c
+                      util_strlist.c
+                      xfile.c
+                      ''',
+                      public_deps='talloc LIBCRYPTO CHARSET execinfo uid_wrapper',
+                      public_headers='attr.h byteorder.h data_blob.h debug.h memory.h safe_string.h time.h talloc_stack.h xfile.h dlinklist.h util.h',
+                      header_path= [ ('dlinklist.h util.h', '.'), ('*', 'util') ],
+                      local_include=False,
+                      vnum='0.0.1',
+                      pc_files='samba-util.pc'
+                      )
 
 
 bld.SAMBA_SUBSYSTEM('ASN1_UTIL',