[SCM] Samba Shared Repository - branch v3-4-test updated -
release-4-0-0alpha7-620-gd2a09b6
Michael Adam
obnox at samba.org
Wed Apr 1 14:42:25 GMT 2009
The branch, v3-4-test has been updated
via d2a09b6b1c1aa4a3a42a8a305ca6f824465d2d53 (commit)
via 38a7ba0d7fd17f76037117b0808c73e03f7fe02b (commit)
via 6a59971f5286e588c87f6d2635e7d36a2ec3aa26 (commit)
via 4cb1d0eef7155f9beaabd92d5e93d3b7974bc372 (commit)
via dcff24b20290bd07f962d21b5a9b8bc7172b68d0 (commit)
via cf43aadee5cd70597d5dc6750bff4486ed768204 (commit)
via d9403162871e5d9fa8e1823139fda1a039d842c2 (commit)
via 8c98c32b9184b7d67a7fef2526fe73a5afb8a34c (commit)
via 34074d6baa9f667a67aae56e2294b8dabff2b07d (commit)
from e45edef8261f6c77de181cb896aa36987e5a36b4 (commit)
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-4-test
- Log -----------------------------------------------------------------
commit d2a09b6b1c1aa4a3a42a8a305ca6f824465d2d53
Author: Michael Adam <obnox at samba.org>
Date: Tue Mar 31 08:50:57 2009 +0200
s3:build: add a SHOWCFLAGS target for debugging how CFLAGS are assebled
Michael
(cherry picked from commit 9aab2631c6294ebc3e4a7ab2367e22e3d552d41b)
commit 38a7ba0d7fd17f76037117b0808c73e03f7fe02b
Author: Michael Adam <obnox at samba.org>
Date: Tue Mar 31 08:50:16 2009 +0200
s3:build: line-wrap assignment of FLAGS for readability
Michael
(cherry picked from commit b2e8bc28a5f589b86269907ff384a9e4c1f3aaca)
commit 6a59971f5286e588c87f6d2635e7d36a2ec3aa26
Author: Björn Jacke <bj at sernet.de>
Date: Wed Mar 11 15:44:45 2009 +0100
remove needless rpath stuff for default paths as early as possible
Signed-off-by: Michael Adam <obnox at samba.org>
(cherry picked from commit c7dba467f268d0007c58e7de4985dc5386a44c6f)
commit 4cb1d0eef7155f9beaabd92d5e93d3b7974bc372
Author: Björn Jacke <bj at sernet.de>
Date: Wed Mar 11 15:32:49 2009 +0100
clean up lib64 linking paths the same way as lib
Signed-off-by: Michael Adam <obnox at samba.org>
(cherry picked from commit 066cbb5835feae90e2ce4172e3c58bf50a2b004b)
commit dcff24b20290bd07f962d21b5a9b8bc7172b68d0
Author: Björn Jacke <bj at sernet.de>
Date: Sun Mar 8 12:54:04 2009 +0100
to be portable, use options first, arguments last
Signed-off-by: Michael Adam <obnox at samba.org>
(cherry picked from commit da06a345cc290ca29234bc231fc9174d2780cf4f)
commit cf43aadee5cd70597d5dc6750bff4486ed768204
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
(cherry picked from commit 33d9f46674a270a0715213c17581deef192826e1)
commit d9403162871e5d9fa8e1823139fda1a039d842c2
Author: Jelmer Vernooij <jelmer at samba.org>
Date: Sat Mar 14 23:01:57 2009 +0100
Properly strip /usr/lib and /usr/include for the merged build.
(cherry picked from commit a3d2b77ddd9808b35300446cebca1b403ca56f78)
commit 8c98c32b9184b7d67a7fef2526fe73a5afb8a34c
Author: Michael Adam <obnox at samba.org>
Date: Mon Mar 23 14:22:37 2009 +0100
s3:build: prevent from setting "-O -g", check for $debug first.
This makes configure actually behave as the comments describe.
The reversal of order was introduced by mistake in
90ea8ae9b1ed3b7ed1c93076517e026e629ea1aa
Michael
(cherry picked from commit a4cc3e253852794f477ef5d836537b50111d0e42)
commit 34074d6baa9f667a67aae56e2294b8dabff2b07d
Author: Björn Jacke <bj at sernet.de>
Date: Wed Mar 18 22:19:06 2009 +0100
don't set -O twice
Signed-off-by: Michael Adam <obnox at samba.org>
(cherry picked from commit 2dc8ce59b28d3a028551ac5087f31cf83d04e064)
-----------------------------------------------------------------------
Summary of changes:
lib/replace/libreplace_network.m4 | 4 ++--
source3/Makefile.in | 26 +++++++++++++++++++++++++-
source3/configure.in | 12 ++++++------
source3/m4/aclocal.m4 | 10 ++++++++--
source3/samba4.m4 | 8 ++++++++
source3/script/installmo.sh | 2 +-
source4/aclocal.m4 | 10 ++++++++--
7 files changed, 58 insertions(+), 14 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 ac8131a..a8b5cfa 100644
--- a/source3/Makefile.in
+++ b/source3/Makefile.in
@@ -160,7 +160,16 @@ CODEPAGEDIR = @codepagedir@
# the directory where pid files go
PIDDIR = @piddir@
-FLAGS = -I. -I$(srcdir) @FLAGS1@ @SAMBA_CPPFLAGS@ $(CPPFLAGS) $(ISA) -I$(srcdir)/lib -I.. -D_SAMBA_BUILD_=3 -I../source4
+FLAGS = -I. \
+ -I$(srcdir) \
+ @FLAGS1@ \
+ @SAMBA_CPPFLAGS@ \
+ $(CPPFLAGS) \
+ $(ISA) \
+ -I$(srcdir)/lib \
+ -I.. \
+ -I../source4 \
+ -D_SAMBA_BUILD_=3
PATH_FLAGS = -DSMB_PASSWD_FILE=\"$(SMB_PASSWD_FILE)\" \
-DPRIVATE_DIR=\"$(PRIVATE_DIR)\" \
@@ -1283,6 +1292,21 @@ SHOWFLAGS::
@echo " SHLIBEXT = @SHLIBEXT@"
@echo " SONAMEFLAG = @SONAMEFLAG@"
+# "showcflags" target for debuggin how CFLAGS are composed:
+
+.PHONY: showcflags SHOWCFLAGS
+
+showcflags: SHOWCFLAGS
+
+SHOWCFLAGS::
+ @echo "CFLAGS = $(CFLAGS)"
+ @echo "FLAGS = $(FLAGS)"
+ @echo ""
+ @echo "FLAGS1 = @FLAGS1@"
+ @echo "SAMBA_CPPFLAGS = @SAMBA_CPPFLAGS@"
+ @echo "CPPFLAGS = $(CPPFLAGS)"
+ @echo "ISA = $(ISA)"
+
MAKEDIR = || exec false; \
if test -d "$$dir"; then :; else \
echo mkdir "$$dir"; \
diff --git a/source3/configure.in b/source3/configure.in
index b4f6362..ce2779a 100644
--- a/source3/configure.in
+++ b/source3/configure.in
@@ -152,13 +152,11 @@ AC_SUBST(NSCD_LIBS)
# do this here since AC_CACHE_CHECK apparently sets the CFLAGS to "-g -O2"
# if it has no value. This prevent *very* large debug binaries from occurring
# by default.
-if test "x$CFLAGS" = x; then
- CFLAGS="-O"
-fi
if test "x$debug" = "xyes" ; then
CFLAGS="${CFLAGS} -g"
-else
- CFLAGS="${CFLAGS} -O"
+fi
+if test "x$CFLAGS" = x; then
+ CFLAGS="-O"
fi
m4_include(../lib/socket_wrapper/config.m4)
@@ -3277,6 +3275,9 @@ if test x"$with_ads_support" != x"no"; then
ac_save_CPPFLAGS=$CPPFLAGS
ac_save_LDFLAGS=$LDFLAGS
+ # remove needless evil rpath stuff as early as possible:
+ LIB_REMOVE_USR_LIB(KRB5_LIBS)
+ LIB_REMOVE_USR_LIB(KRB5_LDFLAGS)
CFLAGS="$KRB5_CFLAGS $CFLAGS"
CPPFLAGS="$KRB5_CPPFLAGS $CPPFLAGS"
LDFLAGS="$KRB5_LDFLAGS $LDFLAGS"
@@ -6404,7 +6405,6 @@ AC_ZLIB([ZLIB_OBJS=""], [
dnl Remove -L/usr/lib/? from LDFLAGS and LIBS
LIB_REMOVE_USR_LIB(LDFLAGS)
LIB_REMOVE_USR_LIB(LIBS)
-LIB_REMOVE_USR_LIB(KRB5_LIBS)
dnl Remove -I/usr/include/? from CFLAGS and CPPFLAGS
CFLAGS_REMOVE_USR_INCLUDE(CFLAGS)
diff --git a/source3/m4/aclocal.m4 b/source3/m4/aclocal.m4
index aae729c..dff4970 100644
--- a/source3/m4/aclocal.m4
+++ b/source3/m4/aclocal.m4
@@ -386,11 +386,17 @@ AC_DEFUN(LIB_REMOVE_USR_LIB,[
case [$]l[$]i in
-L/usr/lib) ;;
-L/usr/lib/) ;;
- -Wl,-rpath,/usr/lib) ;;
- -Wl,-rpath,/usr/lib/) ;;
+ -L/usr/lib64) ;;
+ -L/usr/lib64/) ;;
+ -Wl,-rpath,/usr/lib) l="";;
+ -Wl,-rpath,/usr/lib/) l="";;
+ -Wl,-rpath,/usr/lib64) l="";;
+ -Wl,-rpath,/usr/lib64/) l="";;
-Wl,-rpath) l=[$]i;;
-Wl,-rpath-Wl,/usr/lib) l="";;
-Wl,-rpath-Wl,/usr/lib/) l="";;
+ -Wl,-rpath-Wl,/usr/lib64) l="";;
+ -Wl,-rpath-Wl,/usr/lib64/) l="";;
*)
s=" "
if test x"[$]ac_new_flags" = x""; then
diff --git a/source3/samba4.m4 b/source3/samba4.m4
index f62493e..b5c7c74 100644
--- a/source3/samba4.m4
+++ b/source3/samba4.m4
@@ -154,6 +154,14 @@ fi
dnl Samba 4 files
AC_SUBST(LD)
AC_LIBREPLACE_SHLD_FLAGS
+dnl Remove -L/usr/lib/? from LDFLAGS and LIBS
+LIB_REMOVE_USR_LIB(LDFLAGS)
+LIB_REMOVE_USR_LIB(LIBS)
+LIB_REMOVE_USR_LIB(KRB5_LIBS)
+
+dnl Remove -I/usr/include/? from CFLAGS and CPPFLAGS
+CFLAGS_REMOVE_USR_INCLUDE(CFLAGS)
+CFLAGS_REMOVE_USR_INCLUDE(CPPFLAGS)
SMB_WRITE_MAKEVARS(samba4-config.mk, [prefix exec_prefix CPPFLAGS LDSHFLAGS POPT_OBJ CFLAGS TALLOC_OBJ POPT_LIBS srcdir builddir])
oldbuilddir="$builddir"
diff --git a/source3/script/installmo.sh b/source3/script/installmo.sh
index 9c4ab1e..5ca3371 100644
--- a/source3/script/installmo.sh
+++ b/source3/script/installmo.sh
@@ -35,7 +35,7 @@ for dir in $SRCDIR/locale/*; do
if test "$mode" = 'install'; then
echo "Installing $f as $FNAME"
touch "$FNAME"
- $MSGFMT "$f" -f -o "$FNAME"
+ $MSGFMT -f -o "$FNAME" "$f"
if test ! -f "$FNAME"; then
echo "Cannot install $FNAME. Does $USER have privileges?"
exit 1
diff --git a/source4/aclocal.m4 b/source4/aclocal.m4
index 240a994..8ad8f47 100644
--- a/source4/aclocal.m4
+++ b/source4/aclocal.m4
@@ -31,11 +31,17 @@ AC_DEFUN(LIB_REMOVE_USR_LIB,[
case [$]l[$]i in
-L/usr/lib) ;;
-L/usr/lib/) ;;
- -Wl,-rpath,/usr/lib) ;;
- -Wl,-rpath,/usr/lib/) ;;
+ -L/usr/lib64) ;;
+ -L/usr/lib64/) ;;
+ -Wl,-rpath,/usr/lib) l="";;
+ -Wl,-rpath,/usr/lib/) l="";;
+ -Wl,-rpath,/usr/lib64) l="";;
+ -Wl,-rpath,/usr/lib64/) l="";;
-Wl,-rpath) l=[$]i;;
-Wl,-rpath-Wl,/usr/lib) l="";;
-Wl,-rpath-Wl,/usr/lib/) l="";;
+ -Wl,-rpath-Wl,/usr/lib64) l="";;
+ -Wl,-rpath-Wl,/usr/lib64/) l="";;
*)
s=" "
if test x"[$]ac_new_flags" = x""; then
--
Samba Shared Repository
More information about the samba-cvs
mailing list