From d132f724bd0e8c8e84e1b61d4d5211131028bc42 Mon Sep 17 00:00:00 2001
From: Andrew Tridgell <tridge@samba.org>
Date: Tue, 22 Aug 2006 01:50:44 +0000
Subject: r17681: fixed standalone talloc build to support building in a
 separate directory (This used to be commit
 c137a7049ed6a74c035ef7fad86ac1e77e31028c)

---
 source4/lib/talloc/Makefile.in  | 9 ++++++---
 source4/lib/talloc/configure.in | 1 +
 2 files changed, 7 insertions(+), 3 deletions(-)

(limited to 'source4/lib')

diff --git a/source4/lib/talloc/Makefile.in b/source4/lib/talloc/Makefile.in
index c1477cea69..e5c4e5274a 100644
--- a/source4/lib/talloc/Makefile.in
+++ b/source4/lib/talloc/Makefile.in
@@ -4,10 +4,13 @@ exec_prefix = @exec_prefix@
 includedir = @includedir@
 libdir = @libdir@
 mandir = @mandir@
+VPATH = @srcdir@
+srcdir = @srcdir@
+builddir = @builddir@
 XSLTPROC = @XSLTPROC@
 INSTALLCMD = @INSTALL@
 CC = @CC@
-CFLAGS = @CFLAGS@ -DHAVE_CONFIG_H=
+CFLAGS = @CFLAGS@ -DHAVE_CONFIG_H= -I$(srcdir)
 EXTRA_TARGETS = @DOC_TARGET@
 
 .SUFFIXES: .c .o .3 .3.xml .xml .html
@@ -25,8 +28,8 @@ install: all
 	${INSTALLCMD} -d ${libdir}
 	${INSTALLCMD} -m 755 libtalloc.a $(libdir)
 	${INSTALLCMD} -d ${includedir}
-	${INSTALLCMD} -m 644 talloc.h $(includedir)
-	${INSTALLCMD} -m 644 talloc.pc $(libdir)/pkgconfig
+	${INSTALLCMD} -m 644 $(srcdir)/talloc.h $(includedir)
+	${INSTALLCMD} -m 644 $(srcdir)/talloc.pc $(libdir)/pkgconfig
 	${INSTALLCMD} -d ${mandir}/man3
 	test -z "$(XSLTPROC)" || ${INSTALLCMD} -m 644 talloc.3 $(mandir)/man3
 
diff --git a/source4/lib/talloc/configure.in b/source4/lib/talloc/configure.in
index fc52679737..253992cb1a 100644
--- a/source4/lib/talloc/configure.in
+++ b/source4/lib/talloc/configure.in
@@ -1,5 +1,6 @@
 AC_PREREQ(2.50)
 AC_INIT(talloc.h)
+AC_CONFIG_SRCDIR([talloc.c])
 AC_SUBST(datarootdir)
 AC_PROG_CC
 if test "x$GCC" = "xyes"; then
-- 
cgit