summaryrefslogtreecommitdiff
path: root/source3/lib/talloc
diff options
context:
space:
mode:
authorGerald W. Carter <jerry@samba.org>2008-04-16 15:48:00 +0200
committerGerald W. Carter <jerry@samba.org>2008-04-16 15:48:00 +0200
commit72556d4c8ca2bf9bc0d342b81621d4626aa96fcb (patch)
tree6118e9bdaa72db1c1881b277cf25ed19482e73c2 /source3/lib/talloc
parentb10510893955966f36cd8aa0229bfcac6db14055 (diff)
downloadsamba-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/lib/talloc')
-rw-r--r--source3/lib/talloc/libtalloc.m48
1 files changed, 4 insertions, 4 deletions
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=""