r18094: try to fix the samba4 build

metze
(This used to be commit 3c00983e2cda2ea55585c25926014e7374d613ce)

diff --git a/source4/configure.ac b/source4/configure.ac
index e3244d2656976e55fdd5ba113b530fc11d8234fe..45a9c85b18a15c4cd7abb70febd685cc06ed8e25 100644 (file)
--- a/source4/configure.ac
+++ b/source4/configure.ac
@@ -11,7 +11,7 @@ AC_CONFIG_HEADER(include/config_tmp.h)
 
 # 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)

diff --git a/source4/lib/replace/config.mk b/source4/lib/replace/config.mk
index 49a1e7fe1b1cac38ae56f2b5e22e9fe647f0e426..a05db5abad2e70437d5742eb04c745f2a407e970 100644 (file)
--- a/source4/lib/replace/config.mk
+++ b/source4/lib/replace/config.mk
@@ -14,6 +14,6 @@ OBJ_FILES = replace.o \
                snprintf.o \
                dlfcn.o \
                getpass.o
-PUBLIC_DEPENDENCIES = REPLACE_READDIR DL
+PUBLIC_DEPENDENCIES = REPLACE_READDIR REPLACE_EXT
 # End SUBSYSTEM LIBREPLACE
 ##############################

diff --git a/source4/lib/replace/samba.m4 b/source4/lib/replace/samba.m4
new file mode 100644 (file)
index 0000000..6183b7e
--- /dev/null
+++ b/source4/lib/replace/samba.m4
@@ -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}])