From: Ralf Wildenhues Date: Tue, 1 Feb 2005 17:44:28 +0000 (+0000) Subject: * m4/libtool.m4 (_LT_SYS_DYNAMIC_LINKER) X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b0b88cb4171082b4e00c3a92e2e1752006b680e9;p=thirdparty%2Flibtool.git * m4/libtool.m4 (_LT_SYS_DYNAMIC_LINKER) [ pw32, freebsd3.[01], freebsdelf3.[01] ] (_LT_LINKER_SHLIBS) [ linux with GNU ld < 2.11, aix4.[012]* ] (_LT_LANG_CXX_CONFIG) [ aix4.[012]*, freebsd[12], solaris2.[0-5] ] (_LT_LANG_GCJ_CONFIG): Fix [] quoting. Should fix various spurious failures. --- diff --git a/ChangeLog b/ChangeLog index d2fe5584b..6b0504d67 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,12 @@ 2005-02-01 Ralf Wildenhues + * m4/libtool.m4 (_LT_SYS_DYNAMIC_LINKER) + [ pw32, freebsd3.[01], freebsdelf3.[01] ] + (_LT_LINKER_SHLIBS) [ linux with GNU ld < 2.11, aix4.[012]* ] + (_LT_LANG_CXX_CONFIG) [ aix4.[012]*, freebsd[12], solaris2.[0-5] ] + (_LT_LANG_GCJ_CONFIG): Fix [] quoting. Should fix various spurious + failures. + * clcommit.m4sh: Test whether the shell understands `read -r'. Use as `$read_r' if available, so `\' is preserved in commit notices. diff --git a/m4/libtool.m4 b/m4/libtool.m4 index 8b823876d..c30050afa 100644 --- a/m4/libtool.m4 +++ b/m4/libtool.m4 @@ -1795,7 +1795,7 @@ cygwin* | mingw* | pw32*) ;; pw32*) # pw32 DLLs use 'pw' prefix rather than 'lib' - library_names_spec='`$ECHO ${libname} | sed -e 's/^lib/pw/'``$ECHO ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}' + library_names_spec='`$ECHO ${libname} | sed -e 's/^lib/pw/'``$ECHO ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext}' ;; esac ;; @@ -1874,7 +1874,7 @@ freebsd* | dragonfly*) freebsd2*) shlibpath_overrides_runpath=yes ;; - freebsd3.[01]* | freebsdelf3.[01]*) + freebsd3.[[01]]* | freebsdelf3.[[01]]*) shlibpath_overrides_runpath=yes hardcode_into_libs=yes ;; @@ -3669,7 +3669,7 @@ _LT_EOF _LT_TAGVAR(archive_cmds, $1)='$CC -shared'"$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' case `$LD -v 2>&1` in - *\ [01].* | *\ 2.[[0-9]].* | *\ 2.10.*) ;; # catch versions < 2.11 + *\ [[01]].* | *\ 2.[[0-9]].* | *\ 2.10.*) ;; # catch versions < 2.11 *\ 2.11.93.0.2\ *) supports_anon_versioning=yes ;; # RH7.3 ... *\ 2.11.92.0.12\ *) supports_anon_versioning=yes ;; # Mandrake 8.2 ... *\ 2.11.*) ;; # other 2.11 versions @@ -3806,7 +3806,7 @@ _LT_EOF _LT_TAGVAR(link_all_deplibs, $1)=yes if test "$GCC" = yes; then - case $host_os in aix4.[012]|aix4.[012].*) + case $host_os in aix4.[[012]]|aix4.[[012]].*) # We only want to do this on AIX 4.2 and lower, the check # below for broken collect2 doesn't work under 4.3+ collect2name=`${CC} -print-prog-name=collect2` @@ -4762,7 +4762,7 @@ if test "$_lt_caught_CXX_error" != yes; then _LT_TAGVAR(link_all_deplibs, $1)=yes if test "$GXX" = yes; then - case $host_os in aix4.[012]|aix4.[012].*) + case $host_os in aix4.[[012]]|aix4.[[012]].*) # We only want to do this on AIX 4.2 and lower, the check # below for broken collect2 doesn't work under 4.3+ collect2name=`${CC} -print-prog-name=collect2` @@ -4961,7 +4961,7 @@ if test "$_lt_caught_CXX_error" != yes; then esac ;; - freebsd[12]*) + freebsd[[12]]*) # C++ shared libraries reported to be fairly broken before # switch to ELF _LT_TAGVAR(ld_shlibs, $1)=no @@ -5398,7 +5398,7 @@ if test "$_lt_caught_CXX_error" != yes; then _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir' _LT_TAGVAR(hardcode_shlibpath_var, $1)=no case $host_os in - solaris2.[0-5] | solaris2.[0-5].*) ;; + solaris2.[[0-5]] | solaris2.[[0-5]].*) ;; *) # The C++ compiler is used as linker so we must use $wl # flag to pass the commands to the underlying system @@ -5834,7 +5834,7 @@ _LT_TAGVAR(objext, $1)=$objext lt_simple_compile_test_code="class foo {}\n" # Code to be used in simple link tests -lt_simple_link_test_code='public class conftest { public static void main(String[] argv) {}; }\n' +lt_simple_link_test_code='public class conftest { public static void main(String[[]] argv) {}; }\n' # ltmain only uses $CC for tagged configurations so make sure $CC is set. _LT_TAG_COMPILER