*** empty log message ***

diff --git a/ChangeLog b/ChangeLog
index 9519d863c164363579eeedad98b6809b0450b16f..19dd2e9cf731d4c25cd060dd547935bd60d338e9 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+Fri Jun 20 08:21:34 1997  Gordon Matzigkeit  <gord@gnu.ai.mit.edu>
+
+       * ltmain.sh.in: Redo two robustness fixes.  Alexandre had the
+       correct approach, but I botched them.
+
+       * ltconfig.in (dynamic_linker): Disable shared libraries on
+       MkLinux unless GNU libc is in use.  Reported by Akim Demaille.
+
 Thu Jun 19 14:24:06 1997  Gordon Matzigkeit  <gord@gnu.ai.mit.edu>
 
        * ltmain.sh.in (install): Add a missing `test' command.  Reported

diff --git a/NEWS b/NEWS
index b3b94b149bc403257da6df00cb697e71d8656ee9..bd71dce65d86cfe86cef6b25c3a8455dd8b4b2ef 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -1,6 +1,6 @@
 NEWS - list of user-visible changes between releases of GNU libtool.
 
-New in 0.9h:
+New in 0.9i:
 * Bug fixes.
 * Better configuration test to find the system linker.  The old test
   was failing because people frequently install GNU ld, but don't

diff --git a/PACKAGES b/PACKAGES
index 62b6ef4806a39017f4ac6240fff534899f90f988..369b3e291024e20e7e638ef6a56cb676aa49c3ca 100644 (file)
--- a/PACKAGES
+++ b/PACKAGES
@@ -12,3 +12,7 @@ SANE (Scanner Access Now Easy):  http://www.azstarnet.com/~davidm/
 Nonfree:
 ========
 KDE (K Desktop Environment): http://www.kde.org/
+
+Possible:
+=========
+OmniBroker (CORBA tool): http://www.ooc.com/ob.html

diff --git a/ltconfig.in b/ltconfig.in
index 2d43ae801200a235f112bca9d955602375acf4b2..fb6fec90eadffb19906d285b485f3c00183f3dd7 100755 (executable)
--- a/ltconfig.in
+++ b/ltconfig.in
@@ -538,9 +538,8 @@ with_gnu_ld=no
 set dummy $LD
 linker="$2"
 echo $ac_n "checking if $LD is GNU ld... $ac_c" 1>&6
-# I'd rather use --version here, but apparently some GNU ld's don't accept
-# it, but do accept -v.
-if $LD -v 2>&1 | egrep '(GNU ld|with BFD)' > /dev/null; then
+# I'd rather use --version here, but apparently some GNU ld's only accept -v.
+if $LD -v 2>&1 </dev/null | egrep '(GNU ld|with BFD)' > /dev/null; then
   with_gnu_ld=yes
   linker="GNU ld"
 fi
@@ -786,7 +785,6 @@ irix5* | irix6*)
 # No shared lib support for Linux oldld, aout, or coff.
 linux-gnuoldld* | linux-gnuaout* | linux-gnucoff*)
   dynamic_linker=no
-  can_build_shared=no
   ;;
 
 # This must be Linux ELF.
@@ -796,6 +794,16 @@ linux-gnu*)
   soname_spec='$libname.so.$major'
   finish_cmds='ldconfig -n $libdir'
   shlibpath_var=LD_LIBRARY_PATH
+
+  if test -f /lib/ld.so.1; then
+    dynamic_linker='GNU ld.so'
+  else
+    # Only the GNU ld.so supports shared libraries on MkLinux.
+    case "$host_cpu" in
+    powerpc*) dynamic_linker=no ;;
+    *) dynamic_linker='Linux ld.so' ;;
+    esac
+  fi
   ;;
 
 netbsd* | openbsd*)
@@ -835,11 +843,10 @@ sunos4*)
 
 *)
   dynamic_linker=no
-  can_build_shared=no
   ;;
 esac
 echo "$ac_t""$dynamic_linker"
-
+test "$dynamic_linker" = no && can_build_shared=no
 
 # FIXME need to add library stripping features
 # strip -x works for most platforms, though not for static libraries on NetBSD

diff --git a/ltmain.sh.in b/ltmain.sh.in
index e1856e8d5b1909e545d1b684e30760ed10460315..fa3349420b5389b81496ff10301ed5e112e200e3 100644 (file)
--- a/ltmain.sh.in
+++ b/ltmain.sh.in
@@ -63,81 +63,70 @@ show=echo
 show_help=
 
 # Parse our command line options once, thoroughly.
-seen_nonopt=no
-seen_c_flag=no
-seen_static_flag=no
 while test $# -gt 0
 do
   arg="$1"
   shift
 
-  if test "$seen_nonopt" != yes; then
-    case "$arg" in
-    -*=*) optarg=`echo "$arg" | sed 's/[-_a-zA-Z0-9]*=//'` ;;
-    *) optarg= ;;
-    esac
+  case "$arg" in
+  -*=*) optarg=`echo "$arg" | sed 's/[-_a-zA-Z0-9]*=//'` ;;
+  *) optarg= ;;
+  esac
 
-    # If the previous option needs an argument, assign it.
-    if test -n "$prev"; then
-      eval "$prev=\$arg"
-      prev=
-      prevopt=
-      continue
-    fi
+  # If the previous option needs an argument, assign it.
+  if test -n "$prev"; then
+    eval "$prev=\$arg"
+    prev=
+    prevopt=
+    continue
+  fi
 
-    # Have we seen a non-optional argument yet?
-    case "$arg" in
-    --help)
-      show_help=yes
-      ;;
+  # Have we seen a non-optional argument yet?
+  case "$arg" in
+  --help)
+    show_help=yes
+    ;;
 
-    --version)
-      echo "$PROGRAM (GNU $PACKAGE) $VERSION"
-      exit 0
-      ;;
+  --version)
+    echo "$PROGRAM (GNU $PACKAGE) $VERSION"
+    exit 0
+    ;;
 
-    --dry-run | -n)
-      run=:
-      ;;
+  --dry-run | -n)
+    run=:
+    ;;
 
-    --features)
-      echo "host: $host"
-      if test "$build_libtool_libs" = yes; then
-        echo "enable shared libraries"
-      else
-       echo "disable shared libraries"
-      fi
-      if test "$build_old_libs" = yes; then
-       echo "enable static libraries"
-      else
-       echo "disable static libraries"
-      fi
-      exit 0
-      ;;
+  --features)
+    echo "host: $host"
+    if test "$build_libtool_libs" = yes; then
+      echo "enable shared libraries"
+    else
+      echo "disable shared libraries"
+    fi
+    if test "$build_old_libs" = yes; then
+      echo "enable static libraries"
+    else
+      echo "disable static libraries"
+    fi
+    exit 0
+    ;;
 
-    --finish) mode="finish" ;;
+  --finish) mode="finish" ;;
 
-    --mode) prevopt="--mode" prev=mode ;;
-    --mode=*) mode="$optarg" ;;
+  --mode) prevopt="--mode" prev=mode ;;
+  --mode=*) mode="$optarg" ;;
 
-    -*)
-      echo "$progname: unrecognized option \`$arg'" 1>&2
-      echo "$help" 1>&2
-      exit 1
-      ;;
+  -*)
+    echo "$progname: unrecognized option \`$arg'" 1>&2
+    echo "$help" 1>&2
+    exit 1
+    ;;
 
-    *)
-      nonopt="$arg"
-      seen_nonopt=yes
-      ;;
-    esac
-  else
-    # Just check for flags that other modes need to have knowledge of.
-    case "$arg" in
-    -c) seen_c_flag=yes ;;
-    -static) seen_static_flag=yes ;;
-    esac
-  fi
+  *)
+    nonopt="$arg"
+    break
+    ;;
+  esac
 done
 
 
@@ -154,11 +143,16 @@ if test -z "$show_help"; then
   if test "$mode" = NONE; then
     case "$nonopt" in
     *cc)
-      if test "$seen_c_flag" = yes; then
-        mode=compile
-      else
-        mode=link
-      fi
+      mode=link
+      for arg
+      do
+        case "$arg" in
+        -c)
+           mode=compile
+           break
+           ;;
+        esac
+      done
       ;;
     *install*|cp)
       mode=install
@@ -318,9 +312,16 @@ if test -z "$show_help"; then
     vinfo=
 
     # We need to know -static, to get the right output filenames.
-    if test "$seen_static_flag" = yes; then
-      build_libtool_libs=no build_old_libs=yes
-    fi
+    for arg
+    do
+      case "$arg" in
+      -static)
+        build_libtool_libs=no
+        build_old_libs=yes
+        break
+        ;;
+      esac
+    done
 
     for arg
     do

diff --git a/tests/Makefile.am b/tests/Makefile.am
index 35ed357d9f5fd72da00262b45e76ac0a68e27d73..95483ccf5f3680f0659452e326e3e39df9e3c57e 100644 (file)
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -4,7 +4,7 @@ AUTOMAKE_OPTIONS = gnits
 
 makesequence = demo-make.test demo-exec.test \
        demo-inst.test demo-unst.test hardcode.test
-TESTS =        demo-conf.test $(makesequence) \
+TESTS =        assign.test demo-conf.test $(makesequence) \
        link.test link-2.test suffix.test test-e.test
 
 EXTRA_DIST = defs tlibtool $(TESTS)