summaryrefslogtreecommitdiff
path: root/source3/configure.in
diff options
context:
space:
mode:
authorJelmer Vernooij <jelmer@samba.org>2008-09-09 19:03:49 +0200
committerJelmer Vernooij <jelmer@samba.org>2008-09-09 19:03:49 +0200
commit66060a0ba711605fc4c00b3f3eb1af9739ab5b01 (patch)
treeba8f7c4c7e51fdac106aed1cf7b388ddb65e641d /source3/configure.in
parent6061b3fa6464c43f0f78a84d75a811ee8fb6ba92 (diff)
downloadsamba-66060a0ba711605fc4c00b3f3eb1af9739ab5b01.tar.gz
samba-66060a0ba711605fc4c00b3f3eb1af9739ab5b01.tar.bz2
samba-66060a0ba711605fc4c00b3f3eb1af9739ab5b01.zip
Rename object variables to avoid clashes with Samba 4.
(This used to be commit c77758de5d6df28abaffe3f8a1d7b5cbc615605e)
Diffstat (limited to 'source3/configure.in')
-rw-r--r--source3/configure.in10
1 files changed, 6 insertions, 4 deletions
diff --git a/source3/configure.in b/source3/configure.in
index a7292232d9..f813e87fb7 100644
--- a/source3/configure.in
+++ b/source3/configure.in
@@ -37,12 +37,14 @@ tdbdir="lib/tdb"
AC_SUBST(tdbdir)
TDB_CFLAGS="-I${srcdir-.}/$tdbdir/include"
AC_SUBST(TDB_CFLAGS)
-TDB_OBJ="common/tdb.o common/dump.o common/transaction.o common/error.o common/traverse.o"
-TDB_OBJ="$TDB_OBJ common/freelist.o common/freelistcheck.o common/io.o common/lock.o common/open.o"
-AC_SUBST(TDB_OBJ)
LIBTDB_OBJ0=""
-for o in $TDB_OBJ; do LIBTDB_OBJ0="$LIBTDB_OBJ0 lib/tdb/$o"; done
+for o in common/tdb.o common/dump.o common/transaction.o common/error.o \
+ common/traverse.o common/freelist.o common/freelistcheck.o \
+ common/io.o common/lock.o common/open.o;
+do
+ LIBTDB_OBJ0="$LIBTDB_OBJ0 lib/tdb/$o"
+done
AC_SUBST(LIBTDB_OBJ0)
SAMBA_CPPFLAGS="-Iinclude -I${srcdir-.}/include -I. -I${srcdir-.}"