*** empty log message ***

diff --git a/ChangeLog b/ChangeLog
index 36890302d1de840c11b5f3d4a54d2c8b25cc577c..f6591b36ef62a1f6e6039424c6bb08c9cf4a8625 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,39 @@
+Fri Nov 28 09:28:02 1997  Gordon Matzigkeit  <gord@gnu.org>
+
+       * ltconfig.in, libtool.m4 (NM): Add /usr/ccs/bin to the PATH
+       before checking.  From Kaveh R. Ghazi.
+       (NM): Delete an extraneous egrep from ltconfig.
+
+       * ltconfig.in (finish_cmds): Change back to using `ldconfig -n'.
+       This makes Linux behave like other systems, which is more in line
+       with what libtool needs.
+
 Thu Nov 27 08:53:05 1997  Gordon Matzigkeit  <gord@gnu.org>
 
+       * ltmain.in: Change a whole bunch of `progname' variables to
+       `modename'.  This is for clarity, and to fix a tiny typo in finish
+       mode.
+
+       * libtool.spec (Name, Version): Ditto.
+
+       * configure.in (AM_INIT_AUTOMAKE): Use PRCS to automatically generate
+       the proper package name and version number.
+
+       * ltconfig.in (gnu_ld_acts_native): Treat GNU ld like the native
+       linker on SunOS 4.x.  Suggested by Alexandre Oliva.
+       (deplibs): Change the defaults all over, since most systems cannot
+       handle inter-library depdencies.
+
+       * libtool.m4, ltconfig.in (NM): Only look at the first line of the
+       output from NM when determining whether it supports a command line
+       option.  This prevents false positives on OSes which ignore
+       invalid flags, like HP-UX, which prints `nm: unknown option "B"
+       ignored'.  Reported by Kaveh R. Ghazi.
+
+       * ltconfig.in (finish_cmds): On Linux, update ld.so.cache by
+       removing the `-n' flag from ldconfig.  Suggested by Kenneth
+       Albanowski.
+
        * Makefile.am (maintainer-checkin, maintainer-release): New
        commands to reap the full benefit of using PRCS to maintain
        libtool version numbers.

diff --git a/Makefile.am b/Makefile.am
index acef55e1bb3946477bd432a7f7c80ba792705820..293c62cd2577408a72a5c0f2a39918ed547eef9e 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -91,6 +91,7 @@ $(srcdir)/demo/configure: demo/configure.in demo/aclocal.m4
 $(srcdir)/demo/aclocal.m4: demo/configure.in demo/acinclude.m4
        cd $(srcdir)/demo && $(ACLOCAL)
 
+######################################################################
 # These commands really help my life as a maintainer who uses PRCS.
 # Feel free to copy them to your own project.  I just run a
 # maintainer-checkin whenever I feel like it, then I run a maintainer-release
@@ -115,10 +116,10 @@ maintainer-check-versions:
 
 maintainer-release: maintainer-check-versions distcheck
        cd $(top_srcdir) && $(PRCS) checkin $(PACKAGE)
-       cd $(top_srcdir) && $(PRCS) rekey $(PACKAGE) configure.in
+       cd $(top_srcdir) && $(PRCS) rekey $(PACKAGE) configure.in libtool.spec
        echo "============================="; \
          echo "Congratulations!  $(PACKAGE)-$(VERSION) is now complete."; \
          echo; \
-         echo "Distribute \`$(PACKAGE)-$(VERSION).tar.gz' to the masses, and start thinking about"; \
-         echo "the next development cycle."; \
+         echo "Distribute \`$(PACKAGE)-$(VERSION).tar.gz' to the masses, and don't forget"; \
+         echo "any other details you need to complete this release."; \
          echo "============================="

diff --git a/TODO b/TODO
index b4dd0438aa639b35b03465430d507ffe50e96422..5937ec597d1da213a7f157f35b2b378cb7f30204 100644 (file)
--- a/TODO
+++ b/TODO
@@ -1,15 +1,7 @@
 For next public release:
 ************************
 
-* For every `-L' flag, hardcode a corresponding directory.  For
-aesthetics and least redundancy, this should only be done once for
-each dir (i.e. no duplicates).  So, if the expansion is the same as
-`-Llibdir', then don't add anything.  Also, check that directories
-added by this feature do not duplicate flags added with `-rpath'.
-
-The question is: should this only be done for programs?  The answer
-is, I think, YES!  Libtool libraries and inter-library dependencies
-are tricky enough without trying to factor in this complexity.
+* Integrate the AmigaOS patches found in lt-amiga.diff.
 
 * Document `execute' mode, and the experimental nature of -dlopen and
 -dlpreopen.
@@ -26,6 +18,10 @@ will meet.''
 
 * Document the change from `-allow-undefined' to `-no-undefined'.
 
+* Document what to tell users about adding their libraries to their
+`ldconfig' directories at bootup.  Libtool doesn't do this
+automatically, because it can't.
+
 * Some packages, such as GIMP, choose to put a note about
 `--disable-shared' in their README:
 

diff --git a/libtool.m4 b/libtool.m4
index 6ef59eb807fedc31a80fc4ceddac6a65e5213519..7f0770aea96e6f732224306bc69a11a20d68baf5 100644 (file)
--- a/libtool.m4
+++ b/libtool.m4
@@ -21,7 +21,7 @@
 ## configuration script generated by Autoconf, you may include it under
 ## the same distribution terms that you use for the rest of that program.
 
-# serial 17 AM_PROG_LIBTOOL
+# serial 18 AM_PROG_LIBTOOL
 AC_DEFUN(AM_PROG_LIBTOOL,
 [AC_REQUIRE([AC_CANONICAL_HOST])
 AC_REQUIRE([AC_PROG_RANLIB])
@@ -190,13 +190,15 @@ AC_CACHE_VAL(ac_cv_path_NM,
   ;;
 *)
   IFS="${IFS=  }"; ac_save_ifs="$IFS"; IFS="${IFS}:"
-  for ac_dir in /usr/ucb $PATH /bin; do
+  for ac_dir in /usr/ucb /usr/ccs/bin $PATH /bin; do
     test -z "$ac_dir" && dir=.
     if test -f $ac_dir/nm; then
       # Check to see if the nm accepts a BSD-compat flag.
-      if ($ac_dir/nm -B /dev/null 2>&1; exit 0) | grep /dev/null >/dev/null; then
+      # Adding the `sed 1!d' prevents false positives on HP-UX, which says:
+      #   nm: unknown option "B" ignored
+      if ($ac_dir/nm -B /dev/null 2>&1 | sed '1!d'; exit 0) | egrep /dev/null >dev/null; then
         ac_cv_path_NM="$ac_dir/nm -B"
-      elif ($ac_dir/nm -p /dev/null 2>&1; exit 0) | grep /dev/null >/dev/null; then
+      elif ($ac_dir/nm -p /dev/null 2>&1 | sed '1!d'; exit 0) | egrep /dev/null >/dev/null; then
         ac_cv_path_NM="$ac_dir/nm -p"
       else
         ac_cv_path_NM="$ac_dir/nm"

diff --git a/libtool.spec b/libtool.spec
index 60a9606f288ce7d5bb79a1399b451caa322a5ee3..3b3065b608e2967fc7140d39da09910c7b0e7df3 100644 (file)
--- a/libtool.spec
+++ b/libtool.spec
@@ -2,7 +2,7 @@ Summary: GNU libtool - shared library support for source packages
 # $Format: "Name: $Project$"$
 Name: libtool
 # $Format: "Version: $ProjectMajorVersion$"$
-Version: 1.0i
+Version: 1.0j
 Release: 1
 Copyright: GPL
 Group: Development/Build

diff --git a/ltconfig.in b/ltconfig.in
index cd24f4bb2345e1828c1388d9baaa50367aa37119..9975f9649f3b68ad9f98fc468633b98ca0273715 100755 (executable)
--- a/ltconfig.in
+++ b/ltconfig.in
@@ -687,29 +687,28 @@ hardcode_runpath_var=no
 hardcode_shlibpath_var=unsupported
 runpath_var=
 
+case "$host_os" in
+sunos4*)
+  # On these operating systems, we should treat GNU ld like the system ld.
+  gnu_ld_acts_native=yes
+  ;;
+*)
+  gnu_ld_acts_native=no
+  ;;
+esac
+
 ld_shlibs=yes
-if test "$with_gnu_ld" = yes; then
-  # See if GNU ld supports shared libraries.
+if test "$with_gnu_ld" = yes && test "$gnu_ld_acts_native" != yes; then
 
-  case "$host_os" in
-  sunos4*)
-    ld_shlibs=yes
+  # See if GNU ld supports shared libraries.
+  if $LD --help 2>&1 | egrep ': supported targets:.* elf' > /dev/null; then
     archive_cmds='$CC -shared ${wl}-soname $wl$soname -o $lib$libobjs'
-    hardcode_direct=yes
-    hardcode_shlibpath_var=no
-    ;;
-
-  *)
-    if $LD --help 2>&1 | egrep ': supported targets:.* elf' > /dev/null; then
-      archive_cmds='$CC -shared ${wl}-soname $wl$soname -o $lib$libobjs'
-      runpath_var=LD_RUN_PATH
-      hardcode_runpath_var=yes
-      ld_shlibs=yes
-    else
-      ld_shlibs=no
-    fi
-    ;;
-  esac
+    runpath_var=LD_RUN_PATH
+    hardcode_runpath_var=yes
+    ld_shlibs=yes
+  else
+    ld_shlibs=no
+  fi
 
   if test "$ld_shlibs" = yes; then
     hardcode_libdir_flag_spec='${wl}-rpath $wl$libdir'
@@ -830,7 +829,15 @@ else
     ;;
 
   sunos4*)
-    archive_cmds='$LD -assert pure-text -Bstatic -o $lib$libobjs'
+    if test "$with_gcc" = yes; then
+      archive_cmds='$CC -shared -o $lib$libobjs'
+    else
+      archive_cmds='$LD -assert pure-text -Bstatic -o $lib$libobjs'
+    fi
+
+    if test "$with_gnu_ld" = yes; then
+      export_dynamic_flag_spec='${wl}-export-dynamic'
+    fi
     hardcode_libdir_flag_spec='-L$libdir'
     hardcode_direct=yes
     hardcode_minus_L=yes
@@ -859,13 +866,15 @@ if test -z "$NM"; then
   /*) ;; # Let the user override the test with a path.
   *)
     IFS="${IFS=        }"; ac_save_ifs="$IFS"; IFS="${IFS}:"
-    for ac_dir in /usr/ucb $PATH /bin; do
+    for ac_dir in /usr/ucb /usr/ccs/bin $PATH /bin; do
       test -z "$ac_dir" && dir=.
       if test -f $ac_dir/nm; then
         # Check to see if the nm accepts a BSD-compat flag.
-        if ($ac_dir/nm -B /dev/null 2>&1; exit 0) | grep /dev/null >/dev/null; then
+        # Adding the `sed 1!d' prevents false positives on HP-UX, which says:
+        #   nm: unknown option "B" ignored
+        if ($ac_dir/nm -B /dev/null 2>&1 | sed '1!d'; exit 0) | egrep /dev/null >/dev/null; then
           NM="$ac_dir/nm -B"
-        elif ($ac_dir/nm -p /dev/null 2>&1; exit 0) | grep /dev/null >/dev/null; then
+        elif ($ac_dir/nm -p /dev/null 2>&1 | sed '1!d'; exit 0) | egrep /dev/null >/dev/null; then
           NM="$ac_dir/nm -p"
        else
           NM="$ac_dir/nm"

diff --git a/ltmain.in b/ltmain.in
index cfecfd471f507b5df1dcece6fe12819fda9ebacd..0c14bb29eb1f350aa5ddf202a5bbd03366478826 100644 (file)
--- a/ltmain.in
+++ b/ltmain.in
@@ -50,6 +50,7 @@ fi
 
 # The name of this program.
 progname=`$echo "$0" | sed 's%^.*/%%'`
+modename="$progname"
 
 # Constants.
 PROGRAM=ltmain.sh
@@ -75,13 +76,13 @@ if test "${LC_ALL+set}" = set; then LC_ALL=C; export LC_ALL; fi
 if test "${LANG+set}"   = set; then LANG=C;   export LANG;   fi
 
 if test "$LTCONFIG_VERSION" != "$VERSION"; then
-  echo "$progname: ltconfig version \`$LTCONFIG_VERSION' does not match $PROGRAM version \`$VERSION'" 1>&2
+  echo "$modename: ltconfig version \`$LTCONFIG_VERSION' does not match $PROGRAM version \`$VERSION'" 1>&2
   echo "Fatal configuration error.  See the $PACKAGE docs for more information." 1>&2
   exit 1
 fi
 
 if test "$build_libtool_libs" != yes && test "$build_old_libs" != yes; then
-  echo "$progname: not configured to build any kind of library" 1>&2
+  echo "$modename: not configured to build any kind of library" 1>&2
   echo "Fatal configuration error.  See the $PACKAGE docs for more information." 1>&2
   exit 1
 fi
@@ -168,7 +169,7 @@ do
     ;;
 
   -*)
-    $echo "$progname: unrecognized option \`$arg'" 1>&2
+    $echo "$modename: unrecognized option \`$arg'" 1>&2
     $echo "$help" 1>&2
     exit 1
     ;;
@@ -181,7 +182,7 @@ do
 done
 
 if test -n "$prevopt"; then
-  $echo "$progname: option \`$prevopt' requires an argument" 1>&2
+  $echo "$modename: option \`$prevopt' requires an argument" 1>&2
   $echo "$help" 1>&2
   exit 1
 fi
@@ -219,9 +220,9 @@ if test -z "$show_help"; then
       # Just use the default operation mode.
       if test -z "$mode"; then
         if test -n "$nonopt"; then
-          $echo "$progname: warning: cannot infer operation mode from \`$nonopt'" 1>&2
+          $echo "$modename: warning: cannot infer operation mode from \`$nonopt'" 1>&2
         else
-          $echo "$progname: warning: cannot infer operation mode without MODE-ARGS" 1>&2
+          $echo "$modename: warning: cannot infer operation mode without MODE-ARGS" 1>&2
         fi
       fi
       ;;
@@ -230,20 +231,20 @@ if test -z "$show_help"; then
 
   # Only execute mode is allowed to have -dlopen flags.
   if test -n "$execute_dlfiles" && test "$mode" != execute; then
-    $echo "$progname: unrecognized option \`-dlopen'" 1>&2
+    $echo "$modename: unrecognized option \`-dlopen'" 1>&2
     $echo "$help" 1>&2
     exit 1
   fi
 
   # Change the help message to a mode-specific one.
   generic_help="$help"
-  help="Try \`$progname --help --mode=$mode' for more information."
+  help="Try \`$modename --help --mode=$mode' for more information."
 
   # These modes are in order of execution frequency so that they run quickly.
   case "$mode" in
   # libtool compile mode
   compile)
-    progname="$progname: compile"
+    modename="$modename: compile"
     # Get the compilation command and the source file.
     base_compile=
     lastarg=
@@ -254,7 +255,7 @@ if test -z "$show_help"; then
     do
       # The only flag that cannot be specified is the output filename.
       if test "X$arg" = "X-o"; then
-       $echo "$progname: you cannot specify the output filename with \`-o'" 1>&2
+       $echo "$modename: you cannot specify the output filename with \`-o'" 1>&2
        $echo "$help" 1>&2
        exit 1
       fi
@@ -306,13 +307,13 @@ if test -z "$show_help"; then
     case "$libobj" in
     *.lo) obj=`$echo "$libobj" | sed -e 's/\.lo$/.o/'` ;;
     *)
-      $echo "$progname: cannot determine name of library object from \`$srcfile'" 1>&2
+      $echo "$modename: cannot determine name of library object from \`$srcfile'" 1>&2
       exit 1
       ;;
     esac
 
     if test -z "$base_compile"; then
-      $echo "$progname: you must specify a compilation command" 1>&2
+      $echo "$modename: you must specify a compilation command" 1>&2
       $echo "$help" 1>&2
       exit 1
     fi
@@ -377,7 +378,7 @@ if test -z "$show_help"; then
 
   # libtool link mode
   link)
-    progname="$progname: link"
+    modename="$modename: link"
     CC="$nonopt"
     allow_undefined=yes
     compile_command="$CC"
@@ -407,7 +408,7 @@ if test -z "$show_help"; then
       case "$arg" in
       -all-static | -static)
         if test "X$arg" = "X-all-static" && test "$build_libtool_libs" = yes && test -z "$link_static_flag"; then
-           $echo "$progname: warning: complete static linking is impossible in this configuration" 1>&2
+           $echo "$modename: warning: complete static linking is impossible in this configuration" 1>&2
         fi
         build_libtool_libs=no
        build_old_libs=yes
@@ -468,7 +469,7 @@ if test -z "$show_help"; then
 
       -allow-undefined)
        # FIXME: remove this flag sometime in the future.
-       $echo "$progname: \`-allow-undefined' is deprecated because it is the default" 1>&2
+       $echo "$modename: \`-allow-undefined' is deprecated because it is the default" 1>&2
        continue
        ;;
 
@@ -504,7 +505,7 @@ if test -z "$show_help"; then
          # Add the corresponding hardcode_libdir_flag, if it is not identical.
           ;;
         *)
-          $echo "$progname: \`-L$dir' cannot specify a relative directory" 1>&2
+          $echo "$modename: \`-L$dir' cannot specify a relative directory" 1>&2
           exit 1
           ;;
         esac
@@ -588,7 +589,7 @@ if test -z "$show_help"; then
         # Check to see that this really is a libtool archive.
         if egrep '^# Generated by ltmain.sh' $arg >/dev/null 2>&1; then :
         else
-          $echo "$progname: \`$arg' is not a valid libtool archive" 1>&2
+          $echo "$modename: \`$arg' is not a valid libtool archive" 1>&2
           exit 1
         fi
 
@@ -599,7 +600,7 @@ if test -z "$show_help"; then
         esac
 
         if test -z "$libdir"; then
-          $echo "$progname: \`$arg' contains no -rpath information" 1>&2
+          $echo "$modename: \`$arg' contains no -rpath information" 1>&2
           exit 1
         fi
 
@@ -610,7 +611,7 @@ if test -z "$show_help"; then
         done
 
         if test -z "$linklib"; then
-          $echo "$progname: cannot find name of link library for \`$arg'" 1>&2
+          $echo "$modename: cannot find name of link library for \`$arg'" 1>&2
           exit 1
         fi
 
@@ -712,7 +713,7 @@ if test -z "$show_help"; then
             *)
               absdir=`cd "$dir" && pwd`
               if test -z "$absdir"; then
-                $echo "$progname: cannot determine absolute directory name of \`$dir'" 1>&2
+                $echo "$modename: cannot determine absolute directory name of \`$dir'" 1>&2
                 exit 1
               fi
               dir="$absdir"
@@ -730,7 +731,7 @@ if test -z "$show_help"; then
             ;;
 
           *)
-            $echo "$progname: \`$hardcode_action' is an unknown hardcode action" 1>&2
+            $echo "$modename: \`$hardcode_action' is an unknown hardcode action" 1>&2
             exit 1
             ;;
           esac
@@ -750,7 +751,7 @@ if test -z "$show_help"; then
         else
           # Transform directly to old archives if we don't build new libraries.
           if test -n "$pic_flag" && test -z "$old_library"; then
-            $echo "$progname: cannot find static library for \`$arg'" 1>&2
+            $echo "$modename: cannot find static library for \`$arg'" 1>&2
             exit 1
           fi
 
@@ -790,7 +791,7 @@ if test -z "$show_help"; then
     done
 
     if test -n "$prev"; then
-      $echo "$progname: the \`$prevarg' option requires an argument" 1>&2
+      $echo "$modename: the \`$prevarg' option requires an argument" 1>&2
       $echo "$help" 1>&2
       exit 1
     fi
@@ -799,13 +800,13 @@ if test -z "$show_help"; then
     oldobjs=
     case "$output" in
     "")
-      $echo "$progname: you must specify an output file" 1>&2
+      $echo "$modename: you must specify an output file" 1>&2
       $echo "$help" 1>&2
       exit 1
       ;;
 
     */*)
-      $echo "$progname: output file \`$output' must have no directory components" 1>&2
+      $echo "$modename: output file \`$output' must have no directory components" 1>&2
       exit 1
       ;;
 
@@ -814,7 +815,7 @@ if test -z "$show_help"; then
       case "$output" in
       lib*) ;;
       *)
-       $echo "$progname: libtool library \`$arg' must begin with \`lib'" 1>&2
+       $echo "$modename: libtool library \`$arg' must begin with \`lib'" 1>&2
        $echo "$help" 1>&2
        exit 1
        ;;
@@ -832,13 +833,13 @@ if test -z "$show_help"; then
       age=0
 
       if test -n "$objs"; then
-        $echo "$progname: cannot build libtool library \`$output' from non-libtool objects:$objs" 2>&1
+        $echo "$modename: cannot build libtool library \`$output' from non-libtool objects:$objs" 2>&1
         exit 1
       fi
 
       # How the heck are we supposed to write a wrapper for a shared library?
       if test -n "$link_against_libtool_libs"; then
-        $echo "$progname: libtool library \`$output' may not depend on uninstalled libraries:$link_against_libtool_libs" 1>&2
+        $echo "$modename: libtool library \`$output' may not depend on uninstalled libraries:$link_against_libtool_libs" 1>&2
         exit 1
       fi
 
@@ -846,21 +847,21 @@ if test -z "$show_help"; then
       deplibs="$deplibs -lc"
 
       if test -n "$dlfiles$dlprefiles"; then
-        $echo "$progname: warning: \`-dlopen' is ignored while creating libtool libraries" 1>&2
+        $echo "$modename: warning: \`-dlopen' is ignored while creating libtool libraries" 1>&2
         # Nullify the symbol file.
         compile_command=`$echo "$compile_command" | sed "s% @SYMFILE@%%"`
         finalize_command=`$echo "$finalize_command" | sed "s% @SYMFILE@%%"`
       fi
 
       if test -z "$rpath"; then
-        $echo "$progname: you must specify an installation directory with \`-rpath'" 1>&2
+        $echo "$modename: you must specify an installation directory with \`-rpath'" 1>&2
        $echo "$help" 1>&2
         exit 1
       fi
 
       set dummy $rpath
       if test $# -gt 2; then
-       $echo "$progname: warning: ignoring multiple \`-rpath's for a libtool library" 1>&2
+       $echo "$modename: warning: ignoring multiple \`-rpath's for a libtool library" 1>&2
       fi
       install_libdir="$2"
 
@@ -870,7 +871,7 @@ if test -z "$show_help"; then
       IFS="$save_ifs"
 
       if test -n "$5"; then
-        $echo "$progname: too many parameters to \`-version-info'" 1>&2
+        $echo "$modename: too many parameters to \`-version-info'" 1>&2
         $echo "$help" 1>&2
         exit 1
       fi
@@ -883,8 +884,8 @@ if test -z "$show_help"; then
       case "$current" in
       0 | [1-9] | [1-9][0-9]*) ;;
       *)
-        $echo "$progname: CURRENT \`$current' is not a nonnegative integer" 1>&2
-        $echo "$progname: \`$vinfo' is not valid version information" 1>&2
+        $echo "$modename: CURRENT \`$current' is not a nonnegative integer" 1>&2
+        $echo "$modename: \`$vinfo' is not valid version information" 1>&2
         exit 1
         ;;
       esac
@@ -892,8 +893,8 @@ if test -z "$show_help"; then
       case "$revision" in
       0 | [1-9] | [1-9][0-9]*) ;;
       *)
-        $echo "$progname: REVISION \`$revision' is not a nonnegative integer" 1>&2
-        $echo "$progname: \`$vinfo' is not valid version information" 1>&2
+        $echo "$modename: REVISION \`$revision' is not a nonnegative integer" 1>&2
+        $echo "$modename: \`$vinfo' is not valid version information" 1>&2
         exit 1
         ;;
       esac
@@ -901,15 +902,15 @@ if test -z "$show_help"; then
       case "$age" in
       0 | [1-9] | [1-9][0-9]*) ;;
       *)
-        $echo "$progname: AGE \`$age' is not a nonnegative integer" 1>&2
-        $echo "$progname: \`$vinfo' is not valid version information" 1>&2
+        $echo "$modename: AGE \`$age' is not a nonnegative integer" 1>&2
+        $echo "$modename: \`$vinfo' is not valid version information" 1>&2
         exit 1
         ;;
       esac
 
       if test $age -gt $current; then
-        $echo "$progname: AGE \`$age' is greater than the current interface number \`$current'" 1>&2
-        $echo "$progname: \`$vinfo' is not valid version information" 1>&2
+        $echo "$modename: AGE \`$age' is greater than the current interface number \`$current'" 1>&2
+        $echo "$modename: \`$vinfo' is not valid version information" 1>&2
         exit 1
       fi
 
@@ -949,7 +950,7 @@ if test -z "$show_help"; then
         ;;
 
       *)
-        $echo "$progname: unknown library version type \`$version_type'" 1>&2
+        $echo "$modename: unknown library version type \`$version_type'" 1>&2
         echo "Fatal configuration error.  See the $PACKAGE docs for more information." 1>&2
         exit 1
         ;;
@@ -972,7 +973,7 @@ if test -z "$show_help"; then
       # Check to see if the archive will have undefined symbols.
       if test "$allow_undefined" = yes; then
         if test "$allow_undefined_flag" = unsupported; then
-          $echo "$progname: warning: undefined symbols not allowed in $host shared libraries" 1>&2
+          $echo "$modename: warning: undefined symbols not allowed in $host shared libraries" 1>&2
           build_libtool_libs=no
          build_old_libs=yes
         fi
@@ -1029,33 +1030,33 @@ if test -z "$show_help"; then
 
     *.lo | *.o)
       if test -n "$link_against_libtool_libs"; then
-        $echo "$progname: error: cannot link libtool libraries into reloadable objects" 1>&2
+        $echo "$modename: error: cannot link libtool libraries into reloadable objects" 1>&2
         exit 1
       fi
 
       if test -n "$deplibs"; then
-        $echo "$progname: warning: \`-l' and \`-L' are ignored while creating objects" 1>&2
+        $echo "$modename: warning: \`-l' and \`-L' are ignored while creating objects" 1>&2
       fi
 
       if test -n "$dlfiles$dlprefiles"; then
-        $echo "$progname: warning: \`-dlopen' is ignored while creating objects" 1>&2
+        $echo "$modename: warning: \`-dlopen' is ignored while creating objects" 1>&2
         # Nullify the symbol file.
         compile_command=`$echo "$compile_command" | sed "s% @SYMFILE@%%"`
         finalize_command=`$echo "$finalize_command" | sed "s% @SYMFILE@%%"`
       fi
 
       if test -n "$rpath"; then
-        $echo "$progname: warning: \`-rpath' is ignored while creating objects" 1>&2
+        $echo "$modename: warning: \`-rpath' is ignored while creating objects" 1>&2
       fi
 
       if test -n "$vinfo"; then
-        $echo "$progname: warning: \`-version-info' is ignored while creating objects" 1>&2
+        $echo "$modename: warning: \`-version-info' is ignored while creating objects" 1>&2
       fi
 
       case "$output" in
       *.lo)
         if test -n "$objs"; then
-          $echo "$progname: cannot build library object \`$output' from non-libtool objects" 1>&2
+          $echo "$modename: cannot build library object \`$output' from non-libtool objects" 1>&2
           exit 1
         fi
         libobj="$output"
@@ -1117,7 +1118,7 @@ if test -z "$show_help"; then
 
     *)
       if test -n "$vinfo"; then
-        $echo "$progname: warning: \`-version-info' is ignored while linking programs" 1>&2
+        $echo "$modename: warning: \`-version-info' is ignored while linking programs" 1>&2
       fi
 
       if test -n "$rpath"; then
@@ -1279,7 +1280,7 @@ EOF
            ;;
 
          *)
-           $echo "$progname: unknown suffix for \`$dlsyms'" 1>&2
+           $echo "$modename: unknown suffix for \`$dlsyms'" 1>&2
            exit 1
            ;;
          esac
@@ -1293,12 +1294,12 @@ EOF
         compile_command=`$echo "$compile_command" | sed "s%@SYMFILE@%$objdir/${output}S.o%"`
         finalize_command=`$echo "$finalize_command" | sed "s%@SYMFILE@%$objdir/${output}S.o%"`
       elif test "$export_dynamic" != yes; then
-        test -n "$dlfiles$dlprefiles" && $echo "$progname: warning: \`-dlopen' and \`-dlpreopen' are ignored without \`-export-dynamic'" 1>&2
+        test -n "$dlfiles$dlprefiles" && $echo "$modename: warning: \`-dlopen' and \`-dlpreopen' are ignored without \`-export-dynamic'" 1>&2
       else
         # We keep going just in case the user didn't refer to
         # dld_preloaded_symbols.  The linker will fail if global_symbol_pipe
         # really was required.
-        $echo "$progname: not configured to extract global symbols from dlpreopened files" 1>&2
+        $echo "$modename: not configured to extract global symbols from dlpreopened files" 1>&2
 
         # Nullify the symbol file.
         compile_command=`$echo "$compile_command" | sed "s% @SYMFILE@%%"`
@@ -1368,8 +1369,8 @@ EOF
       case "$hardcode_action" in
       relink)
         # AGH! Flame the AIX and HP-UX people for me, will ya?
-        $echo "$progname: warning: using a buggy system linker" 1>&2
-        $echo "$progname: relinking will be required before \`$output' can be installed" 1>&2
+        $echo "$modename: warning: using a buggy system linker" 1>&2
+        $echo "$modename: relinking will be required before \`$output' can be installed" 1>&2
         ;;
       esac
 
@@ -1569,7 +1570,7 @@ EOF
 
   # libtool install mode
   install)
-    progname="$progname: install"
+    modename="$modename: install"
 
     # There may be an optional /bin/sh argument at the beginning of
     # install_prog (especially on Windows NT).
@@ -1649,22 +1650,22 @@ EOF
     done
 
     if test -z "$install_prog"; then
-      $echo "$progname: you must specify an install program" 1>&2
+      $echo "$modename: you must specify an install program" 1>&2
       $echo "$help" 1>&2
       exit 1
     fi
 
     if test -n "$prev"; then
-      $echo "$progname: the \`$prev' option requires an argument" 1>&2
+      $echo "$modename: the \`$prev' option requires an argument" 1>&2
       $echo "$help" 1>&2
       exit 1
     fi
 
     if test -z "$files"; then
       if test -z "$dest"; then
-        $echo "$progname: no file or destination specified" 1>&2
+        $echo "$modename: no file or destination specified" 1>&2
       else
-        $echo "$progname: you must specify a destination" 1>&2
+        $echo "$modename: you must specify a destination" 1>&2
       fi
       $echo "$help" 1>&2
       exit 1
@@ -1686,7 +1687,7 @@ EOF
       # Not a directory, so check to see that there is only one file specified.
       set dummy $files
       if test $# -gt 2; then
-        $echo "$progname: \`$dest' is not a directory" 1>&2
+        $echo "$modename: \`$dest' is not a directory" 1>&2
         $echo "$help" 1>&2
         exit 1
       fi
@@ -1698,7 +1699,7 @@ EOF
         case "$file" in
         *.lo) ;;
         *)
-          $echo "$progname: \`$destdir' must be an absolute directory name" 1>&2
+          $echo "$modename: \`$destdir' must be an absolute directory name" 1>&2
           $echo "$help" 1>&2
           exit 1
           ;;
@@ -1727,7 +1728,7 @@ EOF
         # Check to see that this really is a libtool archive.
         if egrep '^# Generated by ltmain.sh' $file >/dev/null 2>&1; then :
         else
-          $echo "$progname: \`$file' is not a valid libtool archive" 1>&2
+          $echo "$modename: \`$file' is not a valid libtool archive" 1>&2
           $echo "$help" 1>&2
           exit 1
         fi
@@ -1776,7 +1777,7 @@ EOF
               $show "$striplib $destdir/$realname"
               $run $striplib $destdir/$realname || exit $?
             else
-              $echo "$progname: warning: no library stripping program" 1>&2
+              $echo "$modename: warning: no library stripping program" 1>&2
             fi
           fi
 
@@ -1847,7 +1848,7 @@ EOF
           destfile=
           ;;
         *)
-          $echo "$progname: cannot copy a libtool object to \`$destfile'" 1>&2
+          $echo "$modename: cannot copy a libtool object to \`$destfile'" 1>&2
           $echo "$help" 1>&2
           exit 1
           ;;
@@ -1884,7 +1885,7 @@ EOF
 
           # Check the variables that should have been set.
           if test -z "$link_against_libtool_libs" || test -z "$finalize_command"; then
-            $echo "$progname: invalid libtool wrapper script \`$file'" 1>&2
+            $echo "$modename: invalid libtool wrapper script \`$file'" 1>&2
             exit 1
           fi
 
@@ -1901,26 +1902,26 @@ EOF
             fi
             libfile="$libdir/`$echo "$lib" | sed 's%^.*/%%g'`"
             if test -z "$libdir"; then
-              $echo "$progname: warning: \`$lib' contains no -rpath information" 1>&2
+              $echo "$modename: warning: \`$lib' contains no -rpath information" 1>&2
             elif test -f "$libfile"; then :
             else
-              $echo "$progname: warning: \`$lib' has not been installed in \`$libdir'" 1>&2
+              $echo "$modename: warning: \`$lib' has not been installed in \`$libdir'" 1>&2
               finalize=no
             fi
           done
 
           if test "$hardcode_action" = relink; then
             if test "$finalize" = yes; then
-              $echo "$progname: warning: relinking \`$file' on behalf of your buggy system linker" 1>&2
+              $echo "$modename: warning: relinking \`$file' on behalf of your buggy system linker" 1>&2
               $show "$finalize_command"
               if $run eval "$finalize_command"; then :
               else
-                $echo "$progname: error: relink \`$file' with the above command before installing it" 1>&2
+                $echo "$modename: error: relink \`$file' with the above command before installing it" 1>&2
                 continue
               fi
               file="$objdir/$file"T
             else
-              $echo "$progname: warning: cannot relink \`$file' on behalf of your buggy system linker" 1>&2
+              $echo "$modename: warning: cannot relink \`$file' on behalf of your buggy system linker" 1>&2
             fi
           else
             # Install the binary that we compiled earlier.
@@ -1949,7 +1950,7 @@ EOF
           $show "$old_striplib $oldlib"
           $run $old_striplib $oldlib || exit $?
         else
-          $echo "$progname: warning: no static library stripping program" 1>&2
+          $echo "$modename: warning: no static library stripping program" 1>&2
         fi
       fi
 
@@ -1965,7 +1966,7 @@ EOF
     done
 
     if test -n "$future_libdirs"; then
-      $echo "$progname: warning: remember to run \`$progname --finish$future_libdirs'" 1>&2
+      $echo "$modename: warning: remember to run \`$progname --finish$future_libdirs'" 1>&2
     fi
 
     if test -n "$current_libdirs"; then
@@ -1980,7 +1981,7 @@ EOF
 
   # libtool finish mode
   finish)
-    progname="$progname: finish"
+    modename="$modename: finish"
     libdirs="$nonopt"
 
     if test -n "$finish_cmds" && test -n "$libdirs"; then
@@ -2012,12 +2013,12 @@ EOF
 
   # libtool execute mode
   execute)
-    progname="$progname: execute"
+    modename="$modename: execute"
 
     # The first argument is the command name.
     cmd="$nonopt"
     if test -z "$cmd"; then
-      $echo "$progname: you must specify a COMMAND" 1>&2
+      $echo "$modename: you must specify a COMMAND" 1>&2
       $echo "$help"
       exit 1
     fi
@@ -2026,7 +2027,7 @@ EOF
     for file in $execute_dlfiles; do
       if test -f "$file"; then :
       else
-       $echo "$progname: \`$file' is not a file" 1>&2
+       $echo "$modename: \`$file' is not a file" 1>&2
        $echo "$help" 1>&2
        exit 1
       fi
@@ -2037,7 +2038,7 @@ EOF
         # Check to see that this really is a libtool archive.
         if egrep '^# Generated by ltmain.sh' $file >/dev/null 2>&1; then :
         else
-          $echo "$progname: \`$lib' is not a valid libtool archive" 1>&2
+          $echo "$modename: \`$lib' is not a valid libtool archive" 1>&2
           $echo "$help" 1>&2
           exit 1
         fi
@@ -2055,7 +2056,7 @@ EOF
        # Skip this library if it cannot be dlopened.
        if test -z "$dlname"; then
          # Warn if it was a shared library.
-         test -n "$library_names" && $echo "$progname: warning: \`$file' was not linked with \`-export-dynamic'"
+         test -n "$library_names" && $echo "$modename: warning: \`$file' was not linked with \`-export-dynamic'"
          continue
        fi
 
@@ -2065,7 +2066,7 @@ EOF
        if test -f "$dir/$objdir/$dlname"; then
          dir="$dir/$objdir"
        else
-         $echo "$progname: cannot find \`$dlname' in \`$dir' or \`$dir/$objdir'" 1>&2
+         $echo "$modename: cannot find \`$dlname' in \`$dir' or \`$dir/$objdir'" 1>&2
          exit 1
        fi
        ;;
@@ -2077,7 +2078,7 @@ EOF
        ;;
 
       *)
-       $echo "$progname: warning \`-dlopen' is ignored for non-libtool libraries and objects" 1>&2
+       $echo "$modename: warning \`-dlopen' is ignored for non-libtool libraries and objects" 1>&2
         continue
        ;;
       esac
@@ -2129,7 +2130,7 @@ EOF
       # Now actually exec the command.
       eval "exec \$cmd$args"
 
-      $echo "$progname: cannot exec \$cmd$args"
+      $echo "$modename: cannot exec \$cmd$args"
       exit 1
     else
       # Display what would be done.
@@ -2142,7 +2143,7 @@ EOF
 
   # libtool uninstall mode
   uninstall)
-    progname="$progname: uninstall"
+    modename="$modename: uninstall"
     rm="$nonopt"
     files=
 
@@ -2155,7 +2156,7 @@ EOF
     done
 
     if test -z "$rm"; then
-      $echo "$progname: you must specify an RM program" 1>&2
+      $echo "$modename: you must specify an RM program" 1>&2
       $echo "$help" 1>&2
       exit 1
     fi
@@ -2231,13 +2232,13 @@ EOF
     ;;
 
   "")
-    $echo "$progname: you must specify a MODE" 1>&2
+    $echo "$modename: you must specify a MODE" 1>&2
     $echo "$generic_help" 1>&2
     exit 1
     ;;
   esac
 
-  $echo "$progname: invalid operation mode \`$mode'" 1>&2
+  $echo "$modename: invalid operation mode \`$mode'" 1>&2
   $echo "$generic_help" 1>&2
   exit 1
 fi # test -z "$show_help"
@@ -2245,7 +2246,7 @@ fi # test -z "$show_help"
 # We need to display help for each of the modes.
 case "$mode" in
 "") cat <<EOF
-Usage: $progname [OPTION]... [MODE-ARG]...
+Usage: $modename [OPTION]... [MODE-ARG]...
 
 Provide generalized library-building support services.
 
@@ -2267,14 +2268,14 @@ MODE must be one of the following:
       link            create a library or an executable
       uninstall       remove libraries from an installed directory
 
-MODE-ARGS vary depending on the MODE.  Try \`$progname --help --mode=MODE' for
+MODE-ARGS vary depending on the MODE.  Try \`$modename --help --mode=MODE' for
 a more detailed description of MODE.
 EOF
   ;;
 
 compile)
   cat <<EOF
-Usage: $progname [OPTION]... --mode=compile COMPILE-COMMAND... SOURCEFILE
+Usage: $modename [OPTION]... --mode=compile COMPILE-COMMAND... SOURCEFILE
 
 Compile a source file into a libtool library object.
 
@@ -2289,7 +2290,7 @@ EOF
 
 execute)
   cat <<EOF
-Usage: $progname [OPTION]... --mode=execute COMMAND [ARGS]...
+Usage: $modename [OPTION]... --mode=execute COMMAND [ARGS]...
 
 Automatically set library path, then run a program.
 
@@ -2310,7 +2311,7 @@ EOF
 
 finish)
   cat <<EOF
-Usage: $progname [OPTION]... --mode=finish [LIBDIR]...
+Usage: $modename [OPTION]... --mode=finish [LIBDIR]...
 
 Complete the installation of libtool libraries.
 
@@ -2323,7 +2324,7 @@ EOF
 
 install)
   cat <<EOF
-Usage: $progname [OPTION]... --mode=install INSTALL-COMMAND...
+Usage: $modename [OPTION]... --mode=install INSTALL-COMMAND...
 
 Install executables or libraries.
 
@@ -2337,7 +2338,7 @@ EOF
 
 link)
   cat <<EOF
-Usage: $progname [OPTION]... --mode=link LINK-COMMAND...
+Usage: $modename [OPTION]... --mode=link LINK-COMMAND...
 
 Link object files or libraries together to form another library, or to
 create an executable program.
@@ -2379,7 +2380,7 @@ EOF
 
 uninstall)
   cat <<EOF
-Usage: $progname [OPTION]... --mode=uninstall RM [RM-OPTION]... FILE...
+Usage: $modename [OPTION]... --mode=uninstall RM [RM-OPTION]... FILE...
 
 Remove libraries from an installation directory.
 
@@ -2393,14 +2394,14 @@ EOF
   ;;
 
 *)
-  $echo "$progname: invalid operation mode \`$mode'" 1>&2
+  $echo "$modename: invalid operation mode \`$mode'" 1>&2
   $echo "$help" 1>&2
   exit 1
   ;;
 esac
 
 echo
-$echo "Try \`$progname --help' for more information about other modes."
+$echo "Try \`$modename --help' for more information about other modes."
 
 exit 0