* 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 9f8e94cc2688b851cd1bfe3dbf403b4cd06074bc..353c101c54ed19215b428a1dcdb84ea1103e1db9 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,12 @@
 2005-02-01  Ralf Wildenhues  <Ralf.Wildenhues@gmx.de>
 
+       * 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.
+
        * tests/Makefile.am: Add `atconfig' to DISTCLEANFILES.
 
        * clcommit.m4sh: Test whether the shell understands `read -r'.  Use as

diff --git a/m4/libtool.m4 b/m4/libtool.m4
index 74a229fef1502ae8999f995912100b05870c3418..3fba328f97777368846a5a1d3fddd1917a0c4626 100644 (file)
--- a/m4/libtool.m4
+++ b/m4/libtool.m4
@@ -1801,7 +1801,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
     ;;
@@ -1880,7 +1880,7 @@ freebsd* | dragonfly*)
   freebsd2*)
     shlibpath_overrides_runpath=yes
     ;;
-  freebsd3.[01]* | freebsdelf3.[01]*)
+  freebsd3.[[01]]* | freebsdelf3.[[01]]*)
     shlibpath_overrides_runpath=yes
     hardcode_into_libs=yes
     ;;
@@ -3675,7 +3675,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
@@ -3812,7 +3812,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`
@@ -4768,7 +4768,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`
@@ -4967,7 +4967,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
@@ -5404,7 +5404,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
@@ -5840,7 +5840,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