summaryrefslogtreecommitdiff
path: root/source3
diff options
context:
space:
mode:
authorMichael Adam <obnox@samba.org>2008-02-08 17:16:51 +0100
committerMichael Adam <obnox@samba.org>2008-02-13 09:25:31 +0100
commit2a9cbe3c138153df0a5564c978ca9bfd42baa8a2 (patch)
treec4b06cdaf3a2794df67d1f50b2b675c3c99ee7d3 /source3
parent57794a0550458c11e933f875574f0fff0f23893a (diff)
downloadsamba-2a9cbe3c138153df0a5564c978ca9bfd42baa8a2.tar.gz
samba-2a9cbe3c138153df0a5564c978ca9bfd42baa8a2.tar.bz2
samba-2a9cbe3c138153df0a5564c978ca9bfd42baa8a2.zip
Use data from lib/talloc/libtalloc.m4 instead of hard coded data.
Michael (This used to be commit 880238c65c13c8b280e2f34431aa331a16af4a7b)
Diffstat (limited to 'source3')
-rw-r--r--source3/Makefile.in7
-rw-r--r--source3/configure.in10
2 files changed, 13 insertions, 4 deletions
diff --git a/source3/Makefile.in b/source3/Makefile.in
index edda70af35..69a08a0c2a 100644
--- a/source3/Makefile.in
+++ b/source3/Makefile.in
@@ -294,7 +294,8 @@ LIBREPLACE_OBJ = @LIBREPLACE_OBJS@
SOCKET_WRAPPER_OBJ = @SOCKET_WRAPPER_OBJS@
NSS_WRAPPER_OBJ = @NSS_WRAPPER_OBJS@
-TALLOC_OBJ = lib/talloc/talloc.o
+TALLOC_OBJ = @TALLOC_OBJS@
+
LIBTALLOC_OBJ0 = $(TALLOC_OBJ)
LIBTALLOC_OBJ = $(LIBTALLOC_OBJ0)
@@ -881,7 +882,7 @@ SHARESEC_OBJ = $(SHARESEC_OBJ0) $(PARAM_OBJ) $(LIB_NONSMBD_OBJ) $(REGOBJS_OBJ)
$(ERRORMAP_OBJ) $(RPC_PARSE_OBJ1) $(LIBSAMBA_OBJ) $(DOSERR_OBJ) \
$(POPT_LIB_OBJ) $(SECRETS_OBJ)
-TALLOCTORT_OBJ = lib/talloc/testsuite.o $(PARAM_OBJ) $(LIB_NONSMBD_OBJ) \
+TALLOCTORT_OBJ = @tallocdir@/testsuite.o $(PARAM_OBJ) $(LIB_NONSMBD_OBJ) \
$(RPC_PARSE_OBJ1) $(DOSERR_OBJ) $(LIBSAMBA_OBJ) $(SECRETS_OBJ)
REPLACETORT_OBJ = lib/replace/test/testsuite.o \
@@ -1956,7 +1957,7 @@ installlibtalloc: installdirs libtalloc
@$(SHELL) $(srcdir)/script/installdirs.sh $(INSTALLPERMS_BIN) $(DESTDIR) $(LIBDIR)
-$(INSTALLLIBCMD_SH) bin/libtalloc.@SHLIBEXT@ $(DESTDIR)$(LIBDIR)
-$(INSTALLLIBCMD_A) bin/libtalloc.a $(DESTDIR)$(LIBDIR)
- -$(INSTALLCMD) -m $(INSTALLPERMS_DATA) $(srcdir)/lib/talloc/talloc.h $(DESTDIR)${prefix}/include
+ -$(INSTALLCMD) -m $(INSTALLPERMS_DATA) @tallocdir@/talloc.h $(DESTDIR)${prefix}/include
installlibsmbsharemodes: installdirs libsmbsharemodes
@$(SHELL) $(srcdir)/script/installdirs.sh $(INSTALLPERMS_BIN) $(DESTDIR) $(LIBDIR)
diff --git a/source3/configure.in b/source3/configure.in
index fe16d939ee..8d8fcab03d 100644
--- a/source3/configure.in
+++ b/source3/configure.in
@@ -273,9 +273,17 @@ done
AC_LIBREPLACE_CC_CHECKS
+m4_include(lib/talloc/libtalloc.m4)
+
+TALLOC_OBJS=""
+for obj in ${TALLOC_OBJ}; do
+ TALLOC_OBJS="${TALLOCOBJS} ${tallocdir}/${obj}"
+done
+AC_SUBST(TALLOC_OBJS)
+
SAMBA_CPPFLAGS="-Iinclude -I${srcdir-.}/include -I. -I${srcdir-.}"
SAMBA_CPPFLAGS="${SAMBA_CPPFLAGS} -I${srcdir-.}/lib/replace"
-SAMBA_CPPFLAGS="${SAMBA_CPPFLAGS} -I${srcdir-.}/lib/talloc"
+SAMBA_CPPFLAGS="${SAMBA_CPPFLAGS} ${TALLOC_CFLAGS}"
SAMBA_CPPFLAGS="${SAMBA_CPPFLAGS} -I${srcdir-.}/lib/tdb/include"
SAMBA_CPPFLAGS="${SAMBA_CPPFLAGS} -I${srcdir-.}/libaddns"
SAMBA_CPPFLAGS="${SAMBA_CPPFLAGS} -I${srcdir-.}/librpc"