summaryrefslogtreecommitdiffstats
path: root/lib/replace
diff options
context:
space:
mode:
authorAndrew Tridgell <tridge@samba.org>2009-03-24 10:53:06 +1100
committerAndrew Tridgell <tridge@samba.org>2009-03-24 10:53:06 +1100
commit0e3339a46b1747156f35d136dbbc93b503b85b1c (patch)
tree783aafc4b94db5ba1be889cbe4b44363dfee5d54 /lib/replace
parent7f113904eba5361d963075bcea7e36fd98ca34aa (diff)
parent36b957b5b7a1f70e39eeef224820739f24b999c9 (diff)
downloadsamba-0e3339a46b1747156f35d136dbbc93b503b85b1c.tar.gz
samba-0e3339a46b1747156f35d136dbbc93b503b85b1c.tar.xz
samba-0e3339a46b1747156f35d136dbbc93b503b85b1c.zip
Merge branch 'master' of ssh://git.samba.org/data/git/samba
Diffstat (limited to 'lib/replace')
-rw-r--r--lib/replace/libreplace_network.m44
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/replace/libreplace_network.m4 b/lib/replace/libreplace_network.m4
index 3bac72d136..2af02312ab 100644
--- a/lib/replace/libreplace_network.m4
+++ b/lib/replace/libreplace_network.m4
@@ -170,7 +170,7 @@ fi
# The following tests need LIBS="${LIBREPLACE_NETWORK_LIBS}"
old_LIBS=$LIBS
LIBS="${LIBREPLACE_NETWORK_LIBS}"
-SAVE_CPPFLAGS="$CPPFLAGS"
+libreplace_SAVE_CPPFLAGS="$CPPFLAGS"
CPPFLAGS="$CPPFLAGS -I$libreplacedir"
AC_CHECK_FUNCS(socketpair,[],[LIBREPLACE_NETWORK_OBJS="${LIBREPLACE_NETWORK_OBJS} socketpair.o"])
@@ -381,7 +381,7 @@ if test x"$libreplace_cv_HAVE_IPV6" = x"yes"; then
fi
LIBS=$old_LIBS
-CPPFLAGS="$SAVE_CPPFLAGS"
+CPPFLAGS="$libreplace_SAVE_CPPFLAGS"
LIBREPLACEOBJ="${LIBREPLACEOBJ} ${LIBREPLACE_NETWORK_OBJS}"