svn commit: samba r3925 - in branches/SAMBA_3_0/source: .

jerry at samba.org jerry at samba.org
Tue Nov 23 16:35:14 GMT 2004


Author: jerry
Date: 2004-11-23 16:35:14 +0000 (Tue, 23 Nov 2004)
New Revision: 3925

WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=3925

Log:
patch from Thomas Bork <tombork at web.de> to fix configure.in with GNU ld versions that don't output a date string in the --version
Modified:
   branches/SAMBA_3_0/source/configure.in


Changeset:
Modified: branches/SAMBA_3_0/source/configure.in
===================================================================
--- branches/SAMBA_3_0/source/configure.in	2004-11-23 15:27:53 UTC (rev 3924)
+++ branches/SAMBA_3_0/source/configure.in	2004-11-23 16:35:14 UTC (rev 3925)
@@ -298,9 +298,26 @@
 	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'`
 	changequote([,])dnl
 	AC_MSG_RESULT(${ac_cv_gnu_ld_date})
- 	if test "$ac_cv_gnu_ld_date" -lt 20030217; then
- 		ac_cv_gnu_ld_no_default_allow_shlib_undefined=yes
- 	fi
+        if test -n "$ac_cv_gnu_ld_date"; then
+           if test "$ac_cv_gnu_ld_date" -lt 20030217; then
+              ac_cv_gnu_ld_no_default_allow_shlib_undefined=yes
+           fi
+        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_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
+           AC_MSG_RESULT(${ac_cv_gnu_ld_vernr})
+           AC_MSG_CHECKING(GNU ld release version major)
+           AC_MSG_RESULT(${ac_cv_gnu_ld_vernr_major})
+           AC_MSG_CHECKING(GNU ld release version minor)
+           AC_MSG_RESULT(${ac_cv_gnu_ld_vernr_minor})
+           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
+        fi
 fi
 
 dnl needed before AC_TRY_COMPILE



More information about the samba-cvs mailing list