[SCM] Samba Shared Repository - branch master updated -
release-4-0-0alpha7-681-g36b957b
Michael Adam
obnox at samba.org
Mon Mar 23 16:51:15 GMT 2009
The branch, master has been updated
via 36b957b5b7a1f70e39eeef224820739f24b999c9 (commit)
via 33d9f46674a270a0715213c17581deef192826e1 (commit)
from 63aae58fdcd9110ba294ac7335d4a4e40136aa8b (commit)
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -----------------------------------------------------------------
commit 36b957b5b7a1f70e39eeef224820739f24b999c9
Author: Michael Adam <obnox at samba.org>
Date: Mon Mar 23 17:47:26 2009 +0100
s3:build: make SHOWFLAGS target phony and add alias showflags
Michael
commit 33d9f46674a270a0715213c17581deef192826e1
Author: Michael Adam <obnox at samba.org>
Date: Mon Mar 23 17:36:46 2009 +0100
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
-----------------------------------------------------------------------
Summary of changes:
lib/replace/libreplace_network.m4 | 4 ++--
source3/Makefile.in | 4 ++++
2 files changed, 6 insertions(+), 2 deletions(-)
Changeset truncated at 500 lines:
diff --git a/lib/replace/libreplace_network.m4 b/lib/replace/libreplace_network.m4
index 3bac72d..2af0231 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}"
diff --git a/source3/Makefile.in b/source3/Makefile.in
index 329ded0..b28109e 100644
--- a/source3/Makefile.in
+++ b/source3/Makefile.in
@@ -1281,6 +1281,10 @@ everything:: all libtalloc libsmbclient libnetapi debug2html smbfilter talloctor
.SUFFIXES:
.SUFFIXES: .c .o .lo
+.PHONY: showflags SHOWFLAGS
+
+showflags: SHOWFLAGS
+
SHOWFLAGS::
@echo "Using CFLAGS = $(CFLAGS)"
@echo " PICFLAG = $(PICFLAG)"
--
Samba Shared Repository
More information about the samba-cvs
mailing list