diff options
| author | Michael Adam <obnox@samba.org> | 2009-03-23 17:36:46 +0100 |
|---|---|---|
| committer | Michael Adam <obnox@samba.org> | 2009-03-23 17:48:23 +0100 |
| commit | 33d9f46674a270a0715213c17581deef192826e1 (patch) | |
| tree | f9ee4cc1162d63959d04c781581f58e1324851c1 | |
| parent | 63aae58fdcd9110ba294ac7335d4a4e40136aa8b (diff) | |
| download | samba-33d9f46674a270a0715213c17581deef192826e1.tar.gz samba-33d9f46674a270a0715213c17581deef192826e1.tar.bz2 samba-33d9f46674a270a0715213c17581deef192826e1.zip | |
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
| -rw-r--r-- | lib/replace/libreplace_network.m4 | 4 |
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}" |