From 33d9f46674a270a0715213c17581deef192826e1 Mon Sep 17 00:00:00 2001 From: Michael Adam Date: Mon, 23 Mar 2009 17:36:46 +0100 Subject: libreplace: use libreplace_SAVE_CPPFLAGS instead of SAVE_CPPFLAGS This fixes Samba3's double listing of -I options in CFLAGS, since samba3's configure wraps the call to AC_LIBREPLACE_NETWORK_CHECKS into a SAVE_CPPFLAGS="${CPPFLAGS}" .. CPPFLAGS="${SAVE_CPPFLAGS}" sequence... :-) Michael --- lib/replace/libreplace_network.m4 | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'lib/replace/libreplace_network.m4') 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}" -- cgit