mirror of
https://github.com/samba-team/samba.git
synced 2025-08-29 13:49:30 +03:00
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
This commit is contained in:
@ -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}"
|
||||
|
||||
|
Reference in New Issue
Block a user