Rename object variables to avoid clashes with Samba 4.

(This used to be commit c77758de5d6df28abaffe3f8a1d7b5cbc615605e)

diff --git a/source3/Makefile.in b/source3/Makefile.in
index c4ccf728b0a7ae71086e6fc3ceee280855fd5e0b..5604718e83326929d2015af7705e0d2600681053 100644 (file)
--- a/source3/Makefile.in
+++ b/source3/Makefile.in
@@ -230,7 +230,7 @@ MODULES = $(VFS_MODULES) $(PDB_MODULES) $(RPC_MODULES) $(IDMAP_MODULES) \
 # object file lists
 ######################################################################
 
-TDB_OBJ = lib/util_tdb.o \
+TDB_LIB_OBJ = lib/util_tdb.o \
          lib/dbwrap.o lib/dbwrap_tdb.o \
          lib/dbwrap_ctdb.o \
          lib/dbwrap_rbt.o @LIBTDB_STATIC@
@@ -318,7 +318,7 @@ LIB_OBJ = $(LIBSAMBAUTIL_OBJ) \
          lib/interfaces.o lib/rbtree.o lib/memcache.o \
          lib/util_transfer_file.o lib/async_req.o \
          lib/async_sock.o \
-         $(TDB_OBJ) \
+         $(TDB_LIB_OBJ) \
          $(VERSION_OBJ) lib/charcnv.o lib/debug.o lib/fault.o \
          lib/interface.o lib/md4.o \
          lib/pidfile.o \

diff --git a/source3/configure.in b/source3/configure.in
index a7292232d9dcd0f94f4587820d88a5ad7ba0a2e3..f813e87fb751a5d1b6b66f0b799a270d8e3d31a4 100644 (file)
--- 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-.}"