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)

diff --git a/source3/configure.in b/source3/configure.in
index 32af8700ca8bfb71b1f6eaa5f04913a7eb8bddf1..db1822948f2e74d0e51c340dbc801e90e2fb65fe 100644 (file)
--- 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)