diff options
| author | Steve Langasek <vorlon@debian.org> | 2009-03-17 22:08:28 +0100 |
|---|---|---|
| committer | Michael Adam <obnox@samba.org> | 2009-03-17 22:10:23 +0100 |
| commit | c6b570ce30b5cc3631c0ed780826d5450f681800 (patch) | |
| tree | 9e12d9e1cd63f27dc53cad971d9bd515772542c8 | |
| parent | 211e2555690afc0436c2bafb7ef8d426564cc680 (diff) | |
| download | samba-c6b570ce30b5cc3631c0ed780826d5450f681800.tar.gz samba-c6b570ce30b5cc3631c0ed780826d5450f681800.tar.bz2 samba-c6b570ce30b5cc3631c0ed780826d5450f681800.zip | |
s3: Fix bugs in the detection of the GNU ld version (Bug #6147)
This bug results in a failure to use linker scripts to limit the set of symbols
exported by our shared libraries.
Signed-off-by: Michael Adam <obnox@samba.org>
| -rw-r--r-- | source3/configure.in | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/source3/configure.in b/source3/configure.in index 2c7c182fe9..993290d06b 100644 --- a/source3/configure.in +++ b/source3/configure.in @@ -285,7 +285,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,^.*\([1-9][0-9]*\.[0-9][0-9]*\).*$,\1,p'` + 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_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 @@ -297,7 +297,7 @@ if test "$ac_cv_prog_gnu_ld" = "yes"; then if test "$ac_cv_gnu_ld_vernr_major" -lt 2 || test "$ac_cv_gnu_ld_vernr_minor" -lt 14; then ac_cv_gnu_ld_no_default_allow_shlib_undefined=yes fi - if test "$ac_cv_gnu_ld_vernr_major" -gt 2 || test "$ac_cv_gnu_ld_vernr_major"=2 && test "$ac_cv_gnu_ld_vernr_minor" -ge 12; then + if test "$ac_cv_gnu_ld_vernr_major" -gt 2 || test "$ac_cv_gnu_ld_vernr_major" = 2 && test "$ac_cv_gnu_ld_vernr_minor" -ge 12; then ac_cv_gnu_ld_version_script=yes fi fi |