[SCM] Samba Shared Repository - branch v4-0-test updated

[Karolin Seeger]

The branch, v4-0-test has been updated
       via  0dc05cc build/autoconf: put ld check variable in quotes
       via  3e2980d build/autoconf: fix check for GNU ld version
      from  97c3b5d waf: Fix correct linking of libreplace with cmdline-credentials.

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v4-0-test


- Log -----------------------------------------------------------------
commit 0dc05cc3a4d83429d9ba80ad4f548edccf5575b8
Author: Björn Jacke <bj at sernet.de>
Date:   Wed Feb 20 17:06:49 2013 +0100

    build/autoconf: put ld check variable in quotes
    
    Signed-off-by: Bjoern Jacke <bj at sernet.de>
    Reviewed-by: Stefan Metzmacher <metze at samba.org>
    (cherry picked from commit ac9620b942d6d51a1c35c4177c3f241351fc1ebd)
    
    The last 2 patches address bug #7825 - need to fix GNU ld version detection with
    old gcc releases.
    
    Autobuild-User(v4-0-test): Karolin Seeger <kseeger at samba.org>
    Autobuild-Date(v4-0-test): Mon Feb 25 12:54:32 CET 2013 on sn-devel-104

commit 3e2980d5d1251967126154ed4d4b5183829ff818
Author: Björn Jacke <bj at sernet.de>
Date:   Tue Feb 19 15:30:34 2013 +0100

    build/autoconf: fix check for GNU ld version
    
    we need to look for the version once in the stdout and once in the stderr
    output. Some version of ld output to stdout, some output to stderr. redirecting
    stderr to stdout messes the output up in our case, that's why we have to do two
    runs. See also bug #7825.
    
    Signed-off-by: Bjoern Jacke <bj at sernet.de>
    Reviewed-by: Stefan Metzmacher <metze at samba.org>
    
    Autobuild-User(master): Björn Jacke <bj at sernet.de>
    Autobuild-Date(master): Tue Feb 19 20:56:12 CET 2013 on sn-devel-104
    (cherry picked from commit ff8ba0628f6f13a5be1df94e5ac2e83008b7c69c)

-----------------------------------------------------------------------

Summary of changes:
 source3/configure.in |    6 +++++-
 1 files changed, 5 insertions(+), 1 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source3/configure.in b/source3/configure.in
index a4e0763..df5422b 100644
--- a/source3/configure.in
+++ b/source3/configure.in
@@ -227,7 +227,11 @@ dnl Certain versions of GNU ld the default is not to have the
 dnl --allow-shlib-undefined flag defined.  This causes a stackload of
 dnl warnings when building modules.
 if test "$ac_cv_prog_gnu_ld" = "yes"; then
-	ac_cv_gnu_ld_version=`$CC -Wl,-v /dev/null 2>&1 < /dev/null | grep "GNU ld"`
+	ac_cv_gnu_ld_version=`$CC -Wl,-v /dev/null 2> /dev/null < /dev/null | grep "GNU ld"`
+	# we need to make a 2nd (separate!) check on the output of stderr, see bug #7825:
+	if test -z "$ac_cv_gnu_ld_version" ; then
+	  ac_cv_gnu_ld_version=`$CC -Wl,-v /dev/null 2>&1 > /dev/null < /dev/null | grep "GNU ld"`
+	fi
 	AC_MSG_CHECKING(GNU ld release date)
 	changequote(,)dnl
 	ac_cv_gnu_ld_date=`echo $ac_cv_gnu_ld_version | sed -n 's,^.*\([2-9][0-9][0-9][0-9]\)[-]*\([01][0-9]\)[-]*\([0-3][0-9]\).*$,\1\2\3,p'`


-- 
Samba Shared Repository