[SCM] Samba Shared Repository - branch master updated

[Volker Lendecke]

The branch, master has been updated
       via  6e40fa9... s3: Fix the GNU ld version detection on SLES
      from  b1192bb... lib/replace: Don't use StrnCpy inside crypt.c

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master


- Log -----------------------------------------------------------------
commit 6e40fa9b016cdbd43c973c9b61b581258c0c24a9
Author: Volker Lendecke <vl at samba.org>
Date:   Sun Apr 4 20:09:36 2010 +0200

    s3: Fix the GNU ld version detection on SLES
    
    On SLES 11 "ld -v" gives
    
    GNU ld (GNU Binutils; SUSE Linux Enterprise 11) 2.19
    
    The regexp to intended to detect the "2.19" is confused by the "11" in the
    version string. I'm not really into regexps, and awk '{print $NF}' to me is a
    simple (and hopefully portable) way to print the last field.

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

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


Changeset truncated at 500 lines:

diff --git a/source3/configure.in b/source3/configure.in
index 76526d9..26ec10b 100644
--- a/source3/configure.in
+++ b/source3/configure.in
@@ -233,7 +233,7 @@ if test "$ac_cv_prog_gnu_ld" = "yes"; then
         else
            AC_MSG_CHECKING(GNU ld release version)
            changequote(,)dnl
-           ac_cv_gnu_ld_vernr=`echo $ac_cv_gnu_ld_version | sed -n 's,^[^0-9]*\([1-9][0-9]*\.[0-9][0-9]*\).*$,\1,p'`
+           ac_cv_gnu_ld_vernr=`echo $ac_cv_gnu_ld_version | awk '{print $NF}' | sed -n 's,\([1-9][0-9]*\.[0-9][0-9]*\).*$,\1,p'`
            ac_cv_gnu_ld_vernr_major=`echo $ac_cv_gnu_ld_vernr | cut -d '.' -f 1`
            ac_cv_gnu_ld_vernr_minor=`echo $ac_cv_gnu_ld_vernr | cut -d '.' -f 2`
            changequote([,])dnl


-- 
Samba Shared Repository