Author: jerry Date: 2006-09-25 18:18:40 +0000 (Mon, 25 Sep 2006) New Revision: 18905
WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=18905 Log: 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. Modified: branches/SAMBA_3_0/source/configure.in Changeset: Modified: branches/SAMBA_3_0/source/configure.in =================================================================== --- branches/SAMBA_3_0/source/configure.in 2006-09-25 17:34:32 UTC (rev 18904) +++ branches/SAMBA_3_0/source/configure.in 2006-09-25 18:18:40 UTC (rev 18905) @@ -238,7 +238,10 @@ 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)