[SCM] Samba Shared Repository - branch master updated

[Stefan Metzmacher]

The branch, master has been updated
       via  8966a28... s4:heimdal_build/wscript_build: remove more network related stuff from HEIMDAL_ROKEN_H
       via  e390edb... s4:heimdal_build/wscript_build: use LIBREPLACE_H for asn1_compile and compile_et
       via  b2e1441... lib/replace: create a LIBREPLACE_H subsystem
      from  e15939b... Plumb SMB2 stubs into all the places we defer SMB1 operations.

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master


- Log -----------------------------------------------------------------
commit 8966a28b6867b8acaf8e9b89e25849299ba5e088
Author: Stefan Metzmacher <metze at samba.org>
Date:   Sat Apr 10 10:07:11 2010 +0200

    s4:heimdal_build/wscript_build: remove more network related stuff from HEIMDAL_ROKEN_H
    
    metze

commit e390edb46b2abdbb8bf5a6191d05a5a454125c16
Author: Stefan Metzmacher <metze at samba.org>
Date:   Sat Apr 10 09:54:49 2010 +0200

    s4:heimdal_build/wscript_build: use LIBREPLACE_H for asn1_compile and compile_et
    
    metze

commit b2e144186419726175b1690da5cf82e991bc72c0
Author: Stefan Metzmacher <metze at samba.org>
Date:   Sat Apr 10 09:51:28 2010 +0200

    lib/replace: create a LIBREPLACE_H subsystem
    
    metze

-----------------------------------------------------------------------

Summary of changes:
 lib/replace/wscript                 |   15 ++++++++++++---
 source4/heimdal_build/wscript_build |   11 ++++++-----
 2 files changed, 18 insertions(+), 8 deletions(-)


Changeset truncated at 500 lines:

diff --git a/lib/replace/wscript b/lib/replace/wscript
index 511cbea..9af1e57 100644
--- a/lib/replace/wscript
+++ b/lib/replace/wscript
@@ -295,10 +295,19 @@ def configure(conf):
 def build(bld):
     bld.RECURSE('buildtools/wafsamba')
 
-    REPLACE_SOURCE = 'replace.c snprintf.c'
+    REPLACE_H_SOURCE = 'replace.c snprintf.c'
+
+    if bld.CONFIG_SET('REPLACE_STRPTIME'):       REPLACE_H_SOURCE += ' strptime.c'
+    if not bld.CONFIG_SET('HAVE_TIMEGM'):        REPLACE_H_SOURCE += ' timegm.c'
+
+    bld.SAMBA_SUBSYSTEM('LIBREPLACE_H',
+        REPLACE_H_SOURCE,
+        cflags='-DSOCKET_WRAPPER_DISABLE=1 -DNSS_WRAPPER_DISABLE=1 -D_SAMBA_HOSTCC_',
+        group='compiler_libraries'
+    )
+
+    REPLACE_SOURCE = REPLACE_H_SOURCE
 
-    if bld.CONFIG_SET('REPLACE_STRPTIME'):       REPLACE_SOURCE += ' strptime.c'
-    if not bld.CONFIG_SET('HAVE_TIMEGM'):        REPLACE_SOURCE += ' timegm.c'
     if not bld.CONFIG_SET('HAVE_GETIFADDRS'):    REPLACE_SOURCE += ' getifaddrs.c'
     if not bld.CONFIG_SET('HAVE_DLOPEN'):        REPLACE_SOURCE += ' dlfcn.c'
     if not bld.CONFIG_SET('HAVE_SOCKETPAIR'):    REPLACE_SOURCE += ' socketpair.c'
diff --git a/source4/heimdal_build/wscript_build b/source4/heimdal_build/wscript_build
index f095ff7..7f605db 100644
--- a/source4/heimdal_build/wscript_build
+++ b/source4/heimdal_build/wscript_build
@@ -180,10 +180,8 @@ HEIMDAL_ROKEN_H_SOURCE = '''
 	../heimdal/lib/roken/issuid.c
 	../heimdal/lib/roken/net_read.c
 	../heimdal/lib/roken/net_write.c
-	../heimdal/lib/roken/socket.c
 	../heimdal/lib/roken/parse_time.c
 	../heimdal/lib/roken/parse_units.c
-	../heimdal/lib/roken/roken_gethostby.c
 	../heimdal/lib/roken/signal.c
 	../heimdal/lib/roken/vis.c
 	../heimdal/lib/roken/strlwr.c
@@ -203,7 +201,8 @@ HEIMDAL_ROKEN_H_SOURCE = '''
 
 if not bld.CONFIG_SET('HAVE_GETPROGNAME'):
 	HEIMDAL_ROKEN_H_SOURCE += '''
-		../heimdal/lib/roken/getprogname.c ../heimdal/lib/roken/setprogname.c
+		../heimdal/lib/roken/getprogname.c
+		../heimdal/lib/roken/setprogname.c
 	'''
 
 if not bld.CONFIG_SET('HAVE_CLOSEFROM'):
@@ -211,6 +210,8 @@ if not bld.CONFIG_SET('HAVE_CLOSEFROM'):
 
 HEIMDAL_ROKEN_SOURCE = HEIMDAL_ROKEN_H_SOURCE + '''
 	../heimdal/lib/roken/resolve.c
+	../heimdal/lib/roken/socket.c
+	../heimdal/lib/roken/roken_gethostby.c
 '''
 
 bld.SAMBA_SUBSYSTEM('HEIMDAL_ROKEN',
@@ -417,7 +418,7 @@ bld.SAMBA_BINARY('asn1_compile',
         cflags='-DSOCKET_WRAPPER_DISABLE=1 -DNSS_WRAPPER_DISABLE=1 -D_SAMBA_HOSTCC_',
         includes='../heimdal/lib/asn1 ../heimdal/lib/roken',
         group='build_compilers',
-	deps='HEIMDAL_ROKEN_H replace',
+	deps='HEIMDAL_ROKEN_H LIBREPLACE_H',
         install=False
 	)
 
@@ -428,7 +429,7 @@ bld.SAMBA_BINARY('compile_et',
 	includes='../heimdal/lib/com_err',
         group='build_compilers',
         cflags='-DSOCKET_WRAPPER_DISABLE=1 -DNSS_WRAPPER_DISABLE=1 -D_SAMBA_HOSTCC_',
-	deps='HEIMDAL_ROKEN_H replace',
+	deps='HEIMDAL_ROKEN_H LIBREPLACE_H',
         install=False
 	)
 


-- 
Samba Shared Repository