diff options
| author | Gerald W. Carter <jerry@samba.org> | 2008-04-16 15:48:00 +0200 |
|---|---|---|
| committer | Gerald W. Carter <jerry@samba.org> | 2008-04-16 15:48:00 +0200 |
| commit | 72556d4c8ca2bf9bc0d342b81621d4626aa96fcb (patch) | |
| tree | 6118e9bdaa72db1c1881b277cf25ed19482e73c2 /source3 | |
| parent | b10510893955966f36cd8aa0229bfcac6db14055 (diff) | |
| download | samba-72556d4c8ca2bf9bc0d342b81621d4626aa96fcb.tar.gz samba-72556d4c8ca2bf9bc0d342b81621d4626aa96fcb.tar.bz2 samba-72556d4c8ca2bf9bc0d342b81621d4626aa96fcb.zip | |
Fix out of tree build. Remove the embedded srcdir path from talloc and tdb.
(This used to be commit 359921acd436684a0b4cf76ba15f82a224d2c337)
Diffstat (limited to 'source3')
| -rw-r--r-- | source3/Makefile.in | 4 | ||||
| -rw-r--r-- | source3/configure.in | 4 | ||||
| -rw-r--r-- | source3/lib/talloc/libtalloc.m4 | 8 |
3 files changed, 8 insertions, 8 deletions
diff --git a/source3/Makefile.in b/source3/Makefile.in index a2c826fea7..a599b2363b 100644 --- a/source3/Makefile.in +++ b/source3/Makefile.in @@ -151,7 +151,7 @@ LIBTDB_SHARED_TARGET=@LIBTDB_SHARED_TARGET@ LIBTDB_STATIC_TARGET=@LIBTDB_STATIC_TARGET@ LIBTDB=$(LIBTDB_STATIC_TARGET) @LIBTDB_SHARED@ LIBTDB_SYMS=$(srcdir)/exports/libtdb.syms -LIBTDB_HEADERS=@tdbdir@/include/tdb.h +LIBTDB_HEADERS=$(srcdir)/@tdbdir@/include/tdb.h LIBSMBCLIENT=bin/libsmbclient.a @LIBSMBCLIENT_SHARED@ LIBSMBSHAREMODES=bin/libsmbsharemodes.a @LIBSMBSHAREMODES_SHARED@ @@ -2131,7 +2131,7 @@ installlibtalloc: installdirs libtalloc -$(INSTALLLIBCMD_SH) $(LIBTALLOC_SHARED_TARGET) $(DESTDIR)$(LIBDIR) -$(INSTALLLIBCMD_A) $(LIBTALLOC_STATIC_TARGET) $(DESTDIR)$(LIBDIR) @$(SHELL) $(srcdir)/script/installdirs.sh $(INSTALLPERMS_BIN) $(DESTDIR) ${prefix}/include - -$(INSTALLCMD) -m $(INSTALLPERMS_DATA) @tallocdir@/talloc.h $(DESTDIR)${prefix}/include + -$(INSTALLCMD) -m $(INSTALLPERMS_DATA) $(srcdir)/@tallocdir@/talloc.h $(DESTDIR)${prefix}/include installlibtdb: installdirs libtdb @$(SHELL) $(srcdir)/script/installdirs.sh $(INSTALLPERMS_BIN) $(DESTDIR) $(LIBDIR) diff --git a/source3/configure.in b/source3/configure.in index 01808a43f3..98ce92c56e 100644 --- a/source3/configure.in +++ b/source3/configure.in @@ -33,9 +33,9 @@ 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="${srcdir-.}/lib/tdb" +tdbdir="lib/tdb" AC_SUBST(tdbdir) -TDB_CFLAGS="-I$tdbdir/include" +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" diff --git a/source3/lib/talloc/libtalloc.m4 b/source3/lib/talloc/libtalloc.m4 index d2e8eba81a..fd2b4b22cd 100644 --- a/source3/lib/talloc/libtalloc.m4 +++ b/source3/lib/talloc/libtalloc.m4 @@ -1,10 +1,10 @@ dnl find the talloc sources. This is meant to work both for dnl talloc standalone builds, and builds of packages using talloc tallocdir="" -tallocpaths="$srcdir $srcdir/lib/talloc $srcdir/talloc $srcdir/../talloc" +tallocpaths=". lib/talloc talloc ../talloc" for d in $tallocpaths; do - if test -f "$d/talloc.c"; then - tallocdir="$d" + if test -f "$srcdir/$d/talloc.c"; then + tallocdir="$d" AC_SUBST(tallocdir) break; fi @@ -15,7 +15,7 @@ fi TALLOC_OBJ="talloc.o" AC_SUBST(TALLOC_OBJ) -TALLOC_CFLAGS="-I$tallocdir" +TALLOC_CFLAGS="-I$srcdir/$tallocdir" AC_SUBST(TALLOC_CFLAGS) TALLOC_LIBS="" |