Fix libtdb some to move back towards allowing out of tree builds

Remaining problem is that not all *.syms linker scripts are generated
so the LD command needs to look in a single place.  Out of tree
builds now work but report write access to the source tree in order
to create the $(srcdir)/expotrs/libtdb.sysms file.

diff --git a/source/Makefile.in b/source/Makefile.in
index 19bdad39e4abe6886107a467517316beb46e64cf..d9d0ea2d48ef51e55effdd222c854cb0a3f0ac84 100644 (file)
--- a/source/Makefile.in
+++ b/source/Makefile.in
@@ -150,7 +150,7 @@ LIBTALLOC=$(LIBTALLOC_STATIC_TARGET) @LIBTALLOC_SHARED@
 LIBTDB_SHARED_TARGET=@LIBTDB_SHARED_TARGET@
 LIBTDB_STATIC_TARGET=@LIBTDB_STATIC_TARGET@
 LIBTDB=$(LIBTDB_STATIC_TARGET) @LIBTDB_SHARED@
-LIBTDB_SYMS=exports/libtdb.syms
+LIBTDB_SYMS=$(srcdir)/exports/libtdb.syms
 LIBTDB_HEADERS=@tdbdir@/include/tdb.h
 
 LIBSMBCLIENT=bin/libsmbclient.a @LIBSMBCLIENT_SHARED@

diff --git a/source/configure.in b/source/configure.in
index 8b227d01421fa23d20d271244b76a6e66fa68262..bcfad68875d825368d4252df7f8f85faf2b2ffaf 100644 (file)
--- a/source/configure.in
+++ b/source/configure.in
@@ -33,7 +33,7 @@ AC_SUBST(TALLOC_OBJS)
 
 # 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="${srcdir-.}/lib/tdb"
 AC_SUBST(tdbdir)
 TDB_CFLAGS="-I$tdbdir/include"
 AC_SUBST(TDB_CFLAGS)

diff --git a/source/script/mksyms.sh b/source/script/mksyms.sh
index 637ec5027c40aeedf5934cbd3ff69f533d37cd11..51d3fbd99925069bf9beead03f3a41c58881b2a6 100755 (executable)
--- a/source/script/mksyms.sh
+++ b/source/script/mksyms.sh
@@ -34,7 +34,7 @@ echo creating $symsfile
 
 mkdir -p `dirname $symsfile`
 
-${awk} -f script/mksyms.awk $proto_src > $symsfile_tmp
+${awk} -f `dirname $0`/mksyms.awk $proto_src > $symsfile_tmp
 
 if cmp -s $symsfile $symsfile_tmp 2>/dev/null
 then