summaryrefslogtreecommitdiff
path: root/source4/lib
diff options
context:
space:
mode:
authorStefan Metzmacher <metze@samba.org>2008-09-14 18:46:34 +0200
committerStefan Metzmacher <metze@samba.org>2008-09-14 18:46:34 +0200
commit121bcbdb7fdfb11e4864eb79cc1bd6d726a7c307 (patch)
tree437483ba0493141f7341c9525c2e884c71cf1bcf /source4/lib
parent6b7c4413fec1337b843d40c4192ccc7f28df83d5 (diff)
downloadsamba-121bcbdb7fdfb11e4864eb79cc1bd6d726a7c307.tar.gz
samba-121bcbdb7fdfb11e4864eb79cc1bd6d726a7c307.tar.bz2
samba-121bcbdb7fdfb11e4864eb79cc1bd6d726a7c307.zip
Fix out of tree build. Remove the embedded srcdir path from talloc and tdb.
(partialy cherry picked from commit 359921acd436684a0b4cf76ba15f82a224d2c337) metze (This used to be commit d89b8fee5210c7b4d8fad24edea34f9732aec708)
Diffstat (limited to 'source4/lib')
-rw-r--r--source4/lib/talloc/libtalloc.m48
1 files changed, 4 insertions, 4 deletions
diff --git a/source4/lib/talloc/libtalloc.m4 b/source4/lib/talloc/libtalloc.m4
index d2e8eba81a..fd2b4b22cd 100644
--- a/source4/lib/talloc/libtalloc.m4
+++ b/source4/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=""