diff options
| author | Stefan Metzmacher <metze@samba.org> | 2009-02-03 16:10:52 +0100 |
|---|---|---|
| committer | Stefan Metzmacher <metze@samba.org> | 2009-02-03 16:31:02 +0100 |
| commit | adc9d105cdce4500d16f86b39401ae3aa3b0cacd (patch) | |
| tree | 6450eb1ba640fa9522e61c23178700c302a23510 | |
| parent | c3ab29265546a56377a22ddc67701871ea41262c (diff) | |
| download | samba-adc9d105cdce4500d16f86b39401ae3aa3b0cacd.tar.gz samba-adc9d105cdce4500d16f86b39401ae3aa3b0cacd.tar.bz2 samba-adc9d105cdce4500d16f86b39401ae3aa3b0cacd.zip | |
merged-build: link in LIBREPLACE into samba4 code as in the native build
metze
| -rw-r--r-- | source3/samba4-templates.mk | 8 | ||||
| -rw-r--r-- | source3/samba4.m4 | 18 |
2 files changed, 22 insertions, 4 deletions
diff --git a/source3/samba4-templates.mk b/source3/samba4-templates.mk index ecebce6d1d..0024a7531f 100644 --- 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 e2c754b02b..8107f816ad 100644 --- 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) |