diff options
author | Gerald Carter <jerry@samba.org> | 2006-09-25 17:34:32 +0000 |
---|---|---|
committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 12:14:45 -0500 |
commit | e2a5072b9676a3b39654ec8dcd30b575e9d87dfb (patch) | |
tree | ed9dc9eac8a37878902277853db784c592dedac6 /source3 | |
parent | dd992469ddaa849e9a3ec9ae115f574210711c2b (diff) | |
download | samba-e2a5072b9676a3b39654ec8dcd30b575e9d87dfb.tar.gz samba-e2a5072b9676a3b39654ec8dcd30b575e9d87dfb.tar.bz2 samba-e2a5072b9676a3b39654ec8dcd30b575e9d87dfb.zip |
r18904: * 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).
(This used to be commit 7e908acdefe4728fc6ad04770915466ac9556a33)
Diffstat (limited to 'source3')
-rw-r--r-- | source3/configure.in | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/source3/configure.in b/source3/configure.in index c65f636a3b..32af8700ca 100644 --- a/source3/configure.in +++ b/source3/configure.in @@ -229,15 +229,17 @@ do 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) |