From eeeb4aa931111b9091eaf3af8c7e709155a23ccf Mon Sep 17 00:00:00 2001 From: "Gerald (Jerry) Carter" Date: Mon, 24 Mar 2008 14:27:01 -0500 Subject: 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. (This used to be commit 6e9287c5c3a6bbd15ec495593978c1a76e64ee60) --- source3/Makefile.in | 2 +- source3/configure.in | 2 +- source3/script/mksyms.sh | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/source3/Makefile.in b/source3/Makefile.in index 19bdad39e4..d9d0ea2d48 100644 --- a/source3/Makefile.in +++ b/source3/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/source3/configure.in b/source3/configure.in index 8b227d0142..bcfad68875 100644 --- a/source3/configure.in +++ b/source3/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/source3/script/mksyms.sh b/source3/script/mksyms.sh index 637ec5027c..51d3fbd999 100755 --- a/source3/script/mksyms.sh +++ b/source3/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 -- cgit