* libltdl/config/ltmain.m4sh (func_mode_link) < test_compile >:

Fix a couple of instances where `test .. -ne ..' would possibly
compare non-numbers.  Clean up a bit.

diff --git a/ChangeLog b/ChangeLog
index 53ef97b74fbc51198d4b01ba61111d5e3a43a4c0..a140c542568ada2cdb2b1c7cb2dc88356201bae0 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
 2006-02-05  Ralf Wildenhues  <Ralf.Wildenhues@gmx.de>
 
+       * libltdl/config/ltmain.m4sh (func_mode_link) < test_compile >:
+       Fix a couple of instances where `test .. -ne ..' would possibly
+       compare non-numbers.  Clean up a bit.
+
        * tests/convenience.at, tests/deplibs-ident.at: Add new keyword
        `libtool' for tests that exercise the unmodified `libtool'
        script that is generated at build time.

diff --git a/libltdl/config/ltmain.m4sh b/libltdl/config/ltmain.m4sh
index 5a24b697bbda07e511d9dcca687dc5684a5196e2..f80a7db3c7451914fce0ac27e901214c4c3e650c 100644 (file)
--- a/libltdl/config/ltmain.m4sh
+++ b/libltdl/config/ltmain.m4sh
@@ -4594,13 +4594,12 @@ func_mode_link ()
          int main() { return 0; }
 EOF
          $opt_dry_run || $RM conftest
-         $LTCC $LTCFLAGS -o conftest conftest.c $deplibs
-         if test "$?" -eq 0 ; then
+         if $LTCC $LTCFLAGS -o conftest conftest.c $deplibs; then
            ldd_output=`ldd conftest`
            for i in $deplibs; do
              name=`expr $i : '-l\(.*\)'`
              # If $name is empty we are operating on a -L argument.
-             if test "$name" != "" && test "$name" -ne "0"; then
+             if test "$name" != "" && test "$name" != "0"; then
                if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then
                  case " $predeps $postdeps " in
                  *" $i "*)
@@ -4639,9 +4638,7 @@ EOF
              # If $name is empty we are operating on a -L argument.
              if test "$name" != "" && test "$name" != "0"; then
                $opt_dry_run || $RM conftest
-               $LTCC $LTCFLAGS -o conftest conftest.c $i
-               # Did it work?
-               if test "$?" -eq 0 ; then
+               if $LTCC $LTCFLAGS -o conftest conftest.c $i; then
                  ldd_output=`ldd conftest`
                  if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then
                    case " $predeps $postdeps " in
@@ -4673,7 +4670,7 @@ EOF
                  droppeddeps=yes
                  $ECHO
                  $ECHO "*** Warning!  Library $i is needed by this library but I was not able to"
-                 $ECHO "***  make it link in!  You will probably need to install it or some"
+                 $ECHO "*** make it link in!  You will probably need to install it or some"
                  $ECHO "*** library that it depends on before this library will be fully"
                  $ECHO "*** functional.  Installing it before continuing would be even better."
                fi