svn commit: samba r18094 - in branches/SAMBA_4_0/source: . lib/replace

[metze at samba.org]

Author: metze
Date: 2006-09-05 14:29:34 +0000 (Tue, 05 Sep 2006)
New Revision: 18094

WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=18094

Log:
try to fix the samba4 build

metze
Added:
   branches/SAMBA_4_0/source/lib/replace/samba.m4
Modified:
   branches/SAMBA_4_0/source/configure.ac
   branches/SAMBA_4_0/source/lib/replace/config.mk


Changeset:
Modified: branches/SAMBA_4_0/source/configure.ac
===================================================================
--- branches/SAMBA_4_0/source/configure.ac	2006-09-05 14:26:14 UTC (rev 18093)
+++ branches/SAMBA_4_0/source/configure.ac	2006-09-05 14:29:34 UTC (rev 18094)
@@ -11,7 +11,7 @@
 
 # Configuration rules.
 m4_include(build/m4/env.m4)
-m4_include(lib/replace/libreplace.m4)
+m4_include(lib/replace/samba.m4)
 m4_include(lib/replace/win32/config.m4)
 m4_include(lib/replace/repdir/config.m4)
 m4_include(lib/smbreadline/readline.m4)

Modified: branches/SAMBA_4_0/source/lib/replace/config.mk
===================================================================
--- branches/SAMBA_4_0/source/lib/replace/config.mk	2006-09-05 14:26:14 UTC (rev 18093)
+++ branches/SAMBA_4_0/source/lib/replace/config.mk	2006-09-05 14:29:34 UTC (rev 18094)
@@ -14,6 +14,6 @@
 		snprintf.o \
 		dlfcn.o \
 		getpass.o
-PUBLIC_DEPENDENCIES = REPLACE_READDIR DL
+PUBLIC_DEPENDENCIES = REPLACE_READDIR REPLACE_EXT
 # End SUBSYSTEM LIBREPLACE
 ##############################

Added: branches/SAMBA_4_0/source/lib/replace/samba.m4
===================================================================
--- branches/SAMBA_4_0/source/lib/replace/samba.m4	2006-09-05 14:26:14 UTC (rev 18093)
+++ branches/SAMBA_4_0/source/lib/replace/samba.m4	2006-09-05 14:29:34 UTC (rev 18094)
@@ -0,0 +1,27 @@
+SAVE_LIBS="$LIBS"
+SAVE_CFLAGS="$CFLAGS"
+SAVE_CPPFLAGS="$CPPFLAGS"
+SAVE_LDFLAGS="$LDFLAGS"
+
+LIBS=""
+CFLAGS=""
+CPPFLAGS=""
+LDFLAGS=""
+
+m4_include(libreplace.m4)
+
+REPLACE_EXT_LIBS="$LIBS"
+REPLACE_EXT_CFLAGS="$CFLAGS"
+REPLACE_EXT_CPPFLAGS="$CPPFLAGS"
+REPLACE_EXT_LDFLAGS="$LDFLAGS"
+
+LIBS="$SAVE_LIBS"
+CFLAGS="$SAVE_CFLAGS"
+CPPFLAGS="$SAVE_CPPFLAGS"
+LDFLAGS="$SAVE_LDFLAGS"
+
+SMB_EXT_LIB(REPLACE_EXT,
+	    [${REPLACE_EXT_LIBS}],
+	    [${REPLACE_EXT_CFLAGS}],
+	    [${REPLACE_EXT_CPPFLAGS}],
+	    [${REPLACE_EXT_LDFLAGS}])