Merge branch 'singlereplace' into single

[kai/samba.git] / source3 / configure.in

diff --git a/source3/configure.in b/source3/configure.in
index 70ea8839d165f6342a38d48863db5ef88c356e57..2801125b1138eac552b3a3fab41ce14aea78a69d 100644 (file)
--- a/source3/configure.in
+++ b/source3/configure.in
@@ -23,7 +23,7 @@ m4_include(m4/check_path.m4)
 
 AC_LIBREPLACE_CC_CHECKS
 
 
 AC_LIBREPLACE_CC_CHECKS
 

-m4_include(lib/talloc/libtalloc.m4)
+m4_include(../talloc/libtalloc.m4)

 
 LIBTALLOC_OBJ0=""
 for obj in ${TALLOC_OBJ}; do
 
 LIBTALLOC_OBJ0=""
 for obj in ${TALLOC_OBJ}; do


@@ -33,7 +33,7 @@ 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.
 
 # TODO: These should come from m4_include(lib/tdb/libtdb.m4)
 # but currently this fails: things have to get merged from s4.

-tdbdir="lib/tdb"
+tdbdir="../tdb"

 AC_SUBST(tdbdir)
 TDB_CFLAGS="-I${srcdir-.}/$tdbdir/include"
 AC_SUBST(TDB_CFLAGS)
 AC_SUBST(tdbdir)
 TDB_CFLAGS="-I${srcdir-.}/$tdbdir/include"
 AC_SUBST(TDB_CFLAGS)


@@ -43,7 +43,7 @@ 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 
             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"
+       LIBTDB_OBJ0="$LIBTDB_OBJ0 $tdbdir/$o"

 done
 
 AC_SUBST(LIBTDB_OBJ0)
 done
 
 AC_SUBST(LIBTDB_OBJ0)