diff options
| author | Herb Lewis <herb@samba.org> | 2008-09-04 14:48:27 -0700 |
|---|---|---|
| committer | Herb Lewis <herb@samba.org> | 2008-09-04 14:48:27 -0700 |
| commit | 14a7860681124ee75e966bd1e86f04f206fcec4c (patch) | |
| tree | 496dcedcede975ddd65f547ffcfb6e48dc0b5d4c /source3 | |
| parent | 24992010cb57556ee2b65776f26e586ea0e3895d (diff) | |
| parent | 174fd4a73153fb5ed5b660f66da84c25636059af (diff) | |
| download | samba-14a7860681124ee75e966bd1e86f04f206fcec4c.tar.gz samba-14a7860681124ee75e966bd1e86f04f206fcec4c.tar.bz2 samba-14a7860681124ee75e966bd1e86f04f206fcec4c.zip | |
Merge branch 'v3-devel' of ssh://git.samba.org/data/git/samba into v3-devel
(This used to be commit 0311d171970e888754cf614adfdfc1f8e0f5b04e)
Diffstat (limited to 'source3')
| -rw-r--r-- | source3/Makefile.in | 5 | ||||
| -rw-r--r-- | source3/configure.in | 14 |
2 files changed, 8 insertions, 11 deletions
diff --git a/source3/Makefile.in b/source3/Makefile.in index 5793b5ef4d..c4ccf728b0 100644 --- a/source3/Makefile.in +++ b/source3/Makefile.in @@ -1560,9 +1560,8 @@ MKSYMS_SH = $(srcdir)/script/mksyms.sh # #------------------------------------------------------------------- -TALLOC_OBJ = @TALLOC_OBJS@ -LIBTALLOC_OBJ0 = $(TALLOC_OBJ) +LIBTALLOC_OBJ0 = @LIBTALLOC_OBJ0@ LIBTALLOC_OBJ = $(LIBTALLOC_OBJ0) $(LIBREPLACE_OBJ) LIBTALLOC_SHARED_TARGET=@LIBTALLOC_SHARED_TARGET@ @@ -1627,7 +1626,7 @@ shlibs test_shlibs: @LIBTALLOC_SHARED@ # #------------------------------------------------------------------- -LIBTDB_OBJ0 = @TDB_OBJS@ +LIBTDB_OBJ0 = @LIBTDB_OBJ0@ LIBTDB_OBJ = $(LIBTDB_OBJ0) $(LIBREPLACE_OBJ) LIBTDB_SHARED_TARGET=@LIBTDB_SHARED_TARGET@ diff --git a/source3/configure.in b/source3/configure.in index bc5a827b8c..81f41c1257 100644 --- a/source3/configure.in +++ b/source3/configure.in @@ -25,11 +25,11 @@ AC_LIBREPLACE_CC_CHECKS m4_include(lib/talloc/libtalloc.m4) -TALLOC_OBJS="" +LIBTALLOC_OBJ0="" for obj in ${TALLOC_OBJ}; do - TALLOC_OBJS="${TALLOC_OBJS} ${tallocdir}/${obj}" + LIBTALLOC_OBJ0="${LIBTALLOC_OBJ0} ${tallocdir}/${obj}" done -AC_SUBST(TALLOC_OBJS) +AC_SUBST(LIBTALLOC_OBJ0) # TODO: These should come from m4_include(lib/tdb/libtdb.m4) # but currently this fails: things have to get merged from s4. @@ -41,12 +41,10 @@ TDB_OBJ="common/tdb.o common/dump.o common/transaction.o common/error.o common/t TDB_OBJ="$TDB_OBJ common/freelist.o common/freelistcheck.o common/io.o common/lock.o common/open.o" AC_SUBST(TDB_OBJ) -TDB_OBJS="" -for obj in ${TDB_OBJ}; do - TDB_OBJS="${TDB_OBJS} ${tdbdir}/${obj}" -done -AC_SUBST(TDB_OBJS) +LIBTDB_OBJ0="" +for o in $TDB_OBJ; do LIBTDB_OBJ0="$LIBTDB_OBJ0 lib/tdb/$o"; done +AC_SUBST(LIBTDB_OBJ0) SAMBA_CPPFLAGS="-Iinclude -I${srcdir-.}/include -I. -I${srcdir-.}" SAMBA_CPPFLAGS="${SAMBA_CPPFLAGS} -I${srcdir-.}/lib/replace" SAMBA_CPPFLAGS="${SAMBA_CPPFLAGS} ${TALLOC_CFLAGS}" |