svn commit: samba r18904 - in branches/SAMBA_3_0/source: .
jerry at samba.org
jerry at samba.org
Mon Sep 25 17:34:33 GMT 2006
Author: jerry
Date: 2006-09-25 17:34:32 +0000 (Mon, 25 Sep 2006)
New Revision: 18904
WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=18904
Log:
* Revert previous fix for building out of tree and
add a better one which fixes the network interface detection
breakage (caused by the previous commit).
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 16:59:00 UTC (rev 18903)
+++ branches/SAMBA_3_0/source/configure.in 2006-09-25 17:34:32 UTC (rev 18904)
@@ -229,15 +229,17 @@
done
])
-SAMBA_CPPFLAGS="-Iinclude -I\$(srcdir)/include -I. -I\$(srcdir)"
-SAMBA_CPPFLAGS="${SAMBA_CPPFLAGS} -I\$(srcdir)/lib/replace"
-SAMBA_CPPFLAGS="${SAMBA_CPPFLAGS} -I\$(srcdir)/lib/talloc"
-SAMBA_CPPFLAGS="${SAMBA_CPPFLAGS} -I\$(srcdir)/tdb/include"
-SAMBA_CPPFLAGS="${SAMBA_CPPFLAGS} -I\$(srcdir)/libaddns"
-SAMBA_CPPFLAGS="${SAMBA_CPPFLAGS} -I\$(srcdir)/librpc"
+SAMBA_CPPFLAGS="-Iinclude -I${srcdir-.}/include -I. -I${srcdir-.}"
+SAMBA_CPPFLAGS="${SAMBA_CPPFLAGS} -I${srcdir-.}/lib/replace"
+SAMBA_CPPFLAGS="${SAMBA_CPPFLAGS} -I${srcdir-.}/lib/talloc"
+SAMBA_CPPFLAGS="${SAMBA_CPPFLAGS} -I${srcdir-.}/tdb/include"
+SAMBA_CPPFLAGS="${SAMBA_CPPFLAGS} -I${srcdir-.}/libaddns"
+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"`
+
AC_SUBST(configdir)
AC_SUBST(lockdir)
AC_SUBST(piddir)
More information about the samba-cvs
mailing list