From 1254bdc86d3d09237aa982d3afa7322d3c5cbb4a Mon Sep 17 00:00:00 2001
From: Gerald Carter <jerry@samba.org>
Date: Mon, 25 Sep 2006 18:18:40 +0000
Subject: r18905: I'm not really proud of this but I don't want to maintain 2
 separate CPPFLAGS variables.  So just cleanup the SAMBA_CPPFLAGS for out of
 tree builds.  This has been tested locally and works. Maybe metze can find a
 better way tomorrow. (This used to be commit
 8aa681df992b8f856f454673f95d4266aba4671c)

---
 source3/configure.in | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/source3/configure.in b/source3/configure.in
index 32af8700ca..db1822948f 100644
--- a/source3/configure.in
+++ b/source3/configure.in
@@ -238,7 +238,10 @@ SAMBA_CPPFLAGS="${SAMBA_CPPFLAGS} -I${srcdir-.}/librpc"
 
 SAMBA_CONFIGURE_CPPFLAGS="${SAMBA_CPPFLAGS} -I${srcdir-.}/popt"
 
-SAMBA_CPPFLAGS=`echo ${SAMBA_CPPFLAGS} | sed -e "s;${srcdir};\$\(srcdir\);g"`
+## cleanup the $(srcdir) in the Makefile if we are outside of the tree
+if test "x${srcdir-.}" != "x."; then
+	SAMBA_CPPFLAGS=`echo ${SAMBA_CPPFLAGS} | sed -e "s;${srcdir};\$\(srcdir\);g"`
+fi
 
 AC_SUBST(configdir)
 AC_SUBST(lockdir)
-- 
cgit