merged-build: link in LIBREPLACE into samba4 code as in the native build

metze

diff --git a/source3/samba4-templates.mk b/source3/samba4-templates.mk
index ecebce6d1d8d826426dbd3dacb0af5b0f054f6dd..0024a7531f3d83157d328d2bba1fadb73b7c790d 100644 (file)
--- a/source3/samba4-templates.mk
+++ b/source3/samba4-templates.mk
@@ -19,9 +19,9 @@ endef
 # Link a binary
 # Arguments: target file, depends, flags
 define binary_link_template
-$(1)4: $(2) $(LIBREPLACE_OBJ) ;
+$(1)4: $(2) ;
        @echo Linking $$@
-       @$$(BNLD) $$(BNLD_FLAGS) $$(INTERN_LDFLAGS) -o $$@ $$(INSTALL_LINK_FLAGS) $(3)  $$(LIBS) $$(LIBREPLACE_OBJ)
+       @$$(BNLD) $$(BNLD_FLAGS) $$(INTERN_LDFLAGS) -o $$@ $$(INSTALL_LINK_FLAGS) $(3)  $$(LIBS)
 clean::
        @rm -f $(1)
 
@@ -32,9 +32,9 @@ endef
 # Link a host-machine binary
 # Arguments: target file, depends, flags
 define host_binary_link_template
-$(1)4: $(2) $(LIBREPLACE_OBJ) ;
+$(1)4: $(2) ;
        @echo Linking $$@
-       @$$(HOSTLD) $$(HOSTLD_FLAGS) -L$${builddir}/bin/static -o $$@ $$(INSTALL_LINK_FLAGS) $(3) $$(LIBREPLACE_OBJ)
+       @$$(HOSTLD) $$(HOSTLD_FLAGS) -L$${builddir}/bin/static -o $$@ $$(INSTALL_LINK_FLAGS) $(3)
 
 clean::
        rm -f $(1)

diff --git a/source3/samba4.m4 b/source3/samba4.m4
index e2c754b02bd532205c994f003e44bfb5ca641a53..8107f816ad6f88f85316271d04ccb68ebc9c7eca 100644 (file)
--- a/source3/samba4.m4
+++ b/source3/samba4.m4
@@ -19,6 +19,24 @@ AC_MSG_RESULT($pythondir)
 
 AC_SUBST(pythondir)
 
+SMB_EXT_LIB(LIBREPLACE_EXT, [${LIBDL} ${CRYPT_LIBS}])
+SMB_ENABLE(LIBREPLACE_EXT)
+
+SMB_EXT_LIB(LIBREPLACE_NETWORK, [${LIBREPLACE_NETWORK_LIBS}])
+SMB_ENABLE(LIBREPLACE_NETWORK)
+
+SMB_SUBSYSTEM(LIBREPLACE,
+       [${LIBREPLACE_OBJS}],
+       [LIBREPLACE_EXT LIBREPLACE_NETWORK],
+       [-I../lib/replace])
+
+LIBREPLACE_HOSTCC_OBJS=`echo ${LIBREPLACE_OBJS} |sed -e 's/\.o/\.ho/g'`
+
+SMB_SUBSYSTEM(LIBREPLACE_HOSTCC,
+       [${LIBREPLACE_HOSTCC_OBJS}],
+       [],
+       [-I../lib/replace])
+
 m4_include(lib/smbreadline/readline.m4)
 m4_include(heimdal_build/internal.m4)
 m4_include(../lib/util/fault.m4)