* NEWS: updated

* libtool.m4: check for main in libm instead of cos
* ltmain.in: cosmetic fixes, don't try to link libraries only once
  (although it's not necessary on many platforms and looks ugly...),

diff --git a/ChangeLog b/ChangeLog
index 1d3b7828d7b87e85584ac953699420355fa4c221..ede1df029bc0251d94768ce99834a07e2e2b003c 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+1999-04-03 Thomas Tanner  <tanner@gmx.de>
+
+       * NEWS: updated
+       * libtool.m4: check for main in libm instead of cos
+       * ltmain.in: cosmetic fixes, don't try to link libraries only once
+         (although it's not necessary on many platforms and looks ugly...),
+
 1999-04-02  Alexandre Oliva  <oliva@dcc.unicamp.br>
 
        * ltmain.in (convenience): fixed race condition when more than one 

diff --git a/NEWS b/NEWS
index ba7931f1644407b9bf0aa55c5865c097a9dfde90..1a7bf32e9eb50bdb471959ea231a8ffc436a6599 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -8,10 +8,17 @@ New in 1.3b: 1999-??-??; CVS version 1.3a, Libtool team:
 * New demos and tests
 * Various bugfixes
 \f
-New in 1.3: 1999-03-??; CVS version 1.2g, Libtool team:
+New in 1.3: 1999-04-??; CVS version 1.2g, Libtool team:
+* AM_PROG_LIBTOOL is smaller and faster
+* Shared libraries on AmigaOS up to version 4 are now disabled
+  since they don't meet libtool's requirements for shared libraries
+* -L supports now relative directories
+* Libltdl has a new license: LGPL with a special exception
+* Libltdl can be used as stand-alone package
 * dlopen support for BeOS
 * Improved support for BeOS and Cygwin
 * Documentation updates
+* New tests
 * Bugfixes
 \f
 New in 1.2f: 1999-03-15; CVS version 1.2e, Libtool team:

diff --git a/libtool.m4 b/libtool.m4
index eed89b4ae0ded5bfe7f23b52b2abc064e65be581..2e20e203d4a32a8fb96c50de2980b9d8bbc769d0 100644 (file)
--- a/libtool.m4
+++ b/libtool.m4
@@ -359,10 +359,10 @@ case "$host" in
   ;;
 *-ncr-sysv4.3*)
   AC_CHECK_LIB(mw, _mwvalidcheckl, LIBM="-lmw")
-  AC_CHECK_LIB(m, cos, LIBM="$LIBM -lm")
+  AC_CHECK_LIB(m, main, LIBM="$LIBM -lm")
   ;;
 *)
-  AC_CHECK_LIB(m, cos, LIBM="-lm")
+  AC_CHECK_LIB(m, main, LIBM="-lm")
   ;;
 esac
 ])

diff --git a/ltconfig.in b/ltconfig.in
index 5366850531b62e4d72c678c22b314a3bcf7f2c40..7f8b10605f8317088ecbe1fee986b378d44ab937 100755 (executable)
--- a/ltconfig.in
+++ b/ltconfig.in
@@ -1163,7 +1163,7 @@ else
     if test "$with_gcc" = yes; then
       collect2name=`${CC} -print-prog-name=collect2`
       if test -f "$collect2name" && \
-         strings "$collect2name" | grep resolve_lib_name >/dev/null
+        strings "$collect2name" | grep resolve_lib_name >/dev/null
       then
        # We have reworked collect2
        hardcode_direct=yes

diff --git a/ltmain.in b/ltmain.in
index 90c7c143250e8f7e879fe920837b826424d55832..4f428003d6ae88cb9ea16c89f1ad391bb3bd4f38 100644 (file)
--- a/ltmain.in
+++ b/ltmain.in
@@ -1046,7 +1046,7 @@ compiler."
        module=yes
        continue
        ;;
-       
+
       -no-undefined)
        allow_undefined=no
        continue
@@ -2431,7 +2431,6 @@ EOF
       # Find libtool libraries and add their dependencies
       old_deplibs="$deplibs"
       deplibs=
-      absdeplibs=
       newdependency_libs=
       new_lib_search_path=
       for deplib in $old_deplibs; do
@@ -2439,7 +2438,6 @@ EOF
        case "$deplib" in
        -L*)
          deplibs="$deplibs $deplib"
-         absdeplibs="$absdeplibs $deplib"
          new_lib_search_path="$new_lib_search_path "`$echo "X$deplib" | $Xsed -e 's/^-L//'`
          continue
          ;;
@@ -2456,7 +2454,6 @@ EOF
          done
          if test "$found" != yes; then
            deplibs="$deplibs $deplib"
-           absdeplibs="$absdeplibs $deplib"
            continue
          fi
          ;;
@@ -2502,25 +2499,8 @@ EOF
          exit 1
        fi
 
-       ladir=`$echo "X$lib" | $Xsed -e 's%/[^/]*$%%'`
-       test "X$ladir" = "X$lib" && ladir="."
-       # We need an absolute path.
-       case "$ladir" in
-       /* | [A-Za-z]:[/\\]*) ;;
-       *)
-         abs_ladir=`cd "$ladir" && pwd`
-         if test -z "$abs_ladir"; then
-           $echo "$modename: cannot determine absolute directory name of \`$ladir'" 1>&2
-           exit 1
-         fi
-         ladir="$abs_ladir"
-         ;;
-       esac
-       laname=`$echo "X$lib" | $Xsed -e 's%^.*/%%'`
        new_lib_search_path="$new_lib_search_path `$echo "X$lib" | $Xsed -e 's%/[^/]*$%%'`"
-
        deplibs="$deplibs $lib"
-       absdeplibs="$absdeplibs $ladir/$laname"
 
        for deplib in $dependency_libs; do
          case "$deplib" in
@@ -2530,24 +2510,15 @@ EOF
          esac
          
          if test "$link_all_deplibs" != no || \
-            test "$fast_install" = yes || \
+            test "$fast_install" != no || \
             test "$build_libtool_libs" = no || \
             test -z "$library_names"; then
            # Need to link against all dependency_libs
-           case "$absdeplibs " in
-           *" $deplib "*) ;;
-           *)
-             deplibs="$deplibs $deplib"
-             absdeplibs="$absdeplibs $deplib"
-             ;;
-           esac
+           deplibs="$deplibs $deplib"
          else
            # Need to hardcode shared library paths
            # or/and link against static libraries
-           case "$newdependency_libs " in
-           *" $deplib "*) ;;
-           *) newdependency_libs="$newdependency_libs $deplib" ;;
-           esac
+           newdependency_libs="$newdependency_libs $deplib"
          fi
        done
       done