diff options
| author | Jelmer Vernooij <jelmer@samba.org> | 2008-09-04 23:43:58 +0200 |
|---|---|---|
| committer | Jelmer Vernooij <jelmer@samba.org> | 2008-09-04 23:43:58 +0200 |
| commit | 174fd4a73153fb5ed5b660f66da84c25636059af (patch) | |
| tree | e8dd27bda37e833df80dcda9712e0c3a3ba7cbbd /source3/configure.in | |
| parent | e83fbdf5985f10925ca28c3858926bdfef64d4ba (diff) | |
| download | samba-174fd4a73153fb5ed5b660f66da84c25636059af.tar.gz samba-174fd4a73153fb5ed5b660f66da84c25636059af.tar.bz2 samba-174fd4a73153fb5ed5b660f66da84c25636059af.zip | |
Use different variable names for talloc and tdb object file names than
Samba 4.
(This used to be commit 3f821e8c88665a1e6a3d07a438cd978527306221)
Diffstat (limited to 'source3/configure.in')
| -rw-r--r-- | source3/configure.in | 14 |
1 files changed, 6 insertions, 8 deletions
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}" |