This reverts GTK to libtool-1.0f, libtool-1.0h has some problems linking libgdk to libX11 and libXext. -Jay

1 files changed, 164 insertions, 184 deletions

diff --git a/ltmain.sh b/ltmain.sh
index 978e91c81..cb46c8498 100644
--- a/ltmain.sh
+++ b/ltmain.sh
@@ -22,14 +22,40 @@
 # configuration script generated by Autoconf, you may include it under
 # the same distribution terms that you use for the rest of that program.
 
+#FIXME: echo=echo
+echo='printf %s\n'
+if test "X`$echo '\t'`" = 'X\t'; then :
+else
+  # The Solaris and AIX default echo program unquotes backslashes.
+  # This makes it impossible to quote backslashes using
+  #   echo "$something" | sed 's/\\/\\\\/g'
+  # So, we emulate echo with printf '%s\n'
+  echo='printf %s\n'
+  if test "X`$echo '\t'`" = 'X\t'; then :
+  else
+    # Oops.  We have no working printf.  Try to find a not-so-buggy echo.
+    echo=echo
+    IFS="${IFS= 	}"; save_ifs="$IFS"; IFS="${IFS}:"
+    save_PATH="$PATH"
+    PATH="$PATH":/usr/ucb
+    for dir in $PATH; do
+      if test -f $dir/echo && test "X`$dir/echo '\t'`" = 'X\t'; then
+        echo="$dir/echo"
+        break
+      fi
+    done
+    IFS="$save_ifs"
+    PATH="$save_PATH"
+  fi
+fi
+
 # The name of this program.
 progname=`$echo "$0" | sed 's%^.*/%%'`
-modename="$progname"
 
 # Constants.
 PROGRAM=ltmain.sh
 PACKAGE=libtool
-VERSION=1.0h
+VERSION=1.0f
 
 default_mode=
 help="Try \`$progname --help' for more information."
@@ -40,7 +66,7 @@ rm="rm -f"
 
 # Sed substitution that helps us do robust quoting.  It backslashifies
 # metacharacters that are still active within double-quoted strings.
-sed_quote_subst='s/\([\\`\\"$\\\\]\)/\\\1/g'
+sed_quote_subst='s/\([\\"$\\\\]\)/\\\1/g'
 
 # NLS nuisances.
 # Only set LANG and LC_ALL to C if already set.
@@ -50,14 +76,14 @@ 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 "$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
+  $echo "$progname: 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 "$modename: not configured to build any kind of library" 1>&2
-  echo "Fatal configuration error.  See the $PACKAGE docs for more information." 1>&2
+  $echo "$progname: 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
 
@@ -105,7 +131,7 @@ do
     ;;
 
   --version)
-    echo "$PROGRAM (GNU $PACKAGE) $VERSION"
+    $echo "$PROGRAM (GNU $PACKAGE) $VERSION"
     exit 0
     ;;
 
@@ -114,16 +140,16 @@ do
     ;;
 
   --features)
-    echo "host: $host"
+    $echo "host: $host"
     if test "$build_libtool_libs" = yes; then
-      echo "enable shared libraries"
+      $echo "enable shared libraries"
     else
-      echo "disable shared libraries"
+      $echo "disable shared libraries"
     fi
     if test "$build_old_libs" = yes; then
-      echo "enable static libraries"
+      $echo "enable static libraries"
     else
-      echo "disable static libraries"
+      $echo "disable static libraries"
     fi
     exit 0
     ;;
@@ -143,7 +169,7 @@ do
     ;;
 
   -*)
-    $echo "$modename: unrecognized option \`$arg'" 1>&2
+    $echo "$progname: unrecognized option \`$arg'" 1>&2
     $echo "$help" 1>&2
     exit 1
     ;;
@@ -156,7 +182,7 @@ do
 done
 
 if test -n "$prevopt"; then
-  $echo "$modename: option \`$prevopt' requires an argument" 1>&2
+  $echo "$progname: option \`$prevopt' requires an argument" 1>&2
   $echo "$help" 1>&2
   exit 1
 fi
@@ -194,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 "$modename: warning: cannot infer operation mode from \`$nonopt'" 1>&2
+          $echo "$progname: warning: cannot infer operation mode from \`$nonopt'" 1>&2
         else
-          $echo "$modename: warning: cannot infer operation mode without MODE-ARGS" 1>&2
+          $echo "$progname: warning: cannot infer operation mode without MODE-ARGS" 1>&2
         fi
       fi
       ;;
@@ -205,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 "$modename: unrecognized option \`-dlopen'" 1>&2
+    $echo "$progname: 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 \`$modename --help --mode=$mode' for more information."
+  help="Try \`$progname --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)
-    modename="$modename: compile"
+    progname="$progname: compile"
     # Get the compilation command and the source file.
     base_compile=
     lastarg=
@@ -229,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 "$modename: you cannot specify the output filename with \`-o'" 1>&2
+	$echo "$progname: you cannot specify the output filename with \`-o'" 1>&2
 	$echo "$help" 1>&2
 	exit 1
       fi
@@ -281,13 +307,13 @@ if test -z "$show_help"; then
     case "$libobj" in
     *.lo) obj=`$echo "$libobj" | sed -e 's/\.lo$/.o/'` ;;
     *)
-      $echo "$modename: cannot determine name of library object from \`$srcfile'" 1>&2
+      $echo "$progname: cannot determine name of library object from \`$srcfile'" 1>&2
       exit 1
       ;;
     esac
 
     if test -z "$base_compile"; then
-      $echo "$modename: you must specify a compilation command" 1>&2
+      $echo "$progname: you must specify a compilation command" 1>&2
       $echo "$help" 1>&2
       exit 1
     fi
@@ -343,8 +369,8 @@ if test -z "$show_help"; then
     # Create an invalid libtool object if no PIC, so that we don't accidentally
     # link it into a program.
     if test "$build_libtool_libs" != yes; then
-      $show "echo timestamp > $libobj"
-      $run eval "echo timestamp > \$libobj" || exit $?
+      $show "$echo timestamp > $libobj"
+      $run eval "\$echo timestamp > \$libobj" || exit $?
     fi
 
     exit 0
@@ -352,9 +378,9 @@ if test -z "$show_help"; then
 
   # libtool link mode
   link)
-    modename="$modename: link"
+    progname="$progname: link"
     CC="$nonopt"
-    allow_undefined=yes
+    allow_undefined=no
     compile_command="$CC"
     finalize_command="$CC"
 
@@ -382,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 "$modename: warning: complete static linking is impossible in this configuration" 1>&2
+	    $echo "$progname: warning: complete static linking is impossible in this configuration" 1>&2
         fi
         build_libtool_libs=no
 	build_old_libs=yes
@@ -442,8 +468,7 @@ if test -z "$show_help"; then
 	;;
 
       -allow-undefined)
-	# FIXME: remove this flag sometime in the future.
-	$echo "$modename: \`-allow-undefined' is deprecated because it is the default" 1>&2
+	allow_undefined=yes
 	continue
 	;;
 
@@ -479,7 +504,7 @@ if test -z "$show_help"; then
 	  # Add the corresponding hardcode_libdir_flag, if it is not identical.
           ;;
         *)
-          $echo "$modename: \`-L$dir' cannot specify a relative directory" 1>&2
+          $echo "$progname: \`-L$dir' cannot specify a relative directory" 1>&2
           exit 1
           ;;
         esac
@@ -488,11 +513,6 @@ if test -z "$show_help"; then
 
       -l*) deplibs="$deplibs $arg" ;;
 
-      -no-undefined)
-	allow_undefined=no
-	continue
-	;;
-
       -o) prev=output ;;
 
       -rpath)
@@ -563,7 +583,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 "$modename: \`$arg' is not a valid libtool archive" 1>&2
+          $echo "$progname: \`$arg' is not a valid libtool archive" 1>&2
           exit 1
         fi
 
@@ -574,7 +594,7 @@ if test -z "$show_help"; then
         esac
 
         if test -z "$libdir"; then
-          $echo "$modename: \`$arg' contains no -rpath information" 1>&2
+          $echo "$progname: \`$arg' contains no -rpath information" 1>&2
           exit 1
         fi
 
@@ -585,7 +605,7 @@ if test -z "$show_help"; then
         done
 
         if test -z "$linklib"; then
-          $echo "$modename: cannot find name of link library for \`$arg'" 1>&2
+          $echo "$progname: cannot find name of link library for \`$arg'" 1>&2
           exit 1
         fi
 
@@ -687,7 +707,7 @@ if test -z "$show_help"; then
             *)
               absdir=`cd "$dir" && pwd`
               if test -z "$absdir"; then
-                $echo "$modename: cannot determine absolute directory name of \`$dir'" 1>&2
+                $echo "$progname: cannot determine absolute directory name of \`$dir'" 1>&2
                 exit 1
               fi
               dir="$absdir"
@@ -705,7 +725,7 @@ if test -z "$show_help"; then
             ;;
 
           *)
-            $echo "$modename: \`$hardcode_action' is an unknown hardcode action" 1>&2
+            $echo "$progname: \`$hardcode_action' is an unknown hardcode action" 1>&2
             exit 1
             ;;
           esac
@@ -725,7 +745,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 "$modename: cannot find static library for \`$arg'" 1>&2
+            $echo "$progname: cannot find static library for \`$arg'" 1>&2
             exit 1
           fi
 
@@ -758,14 +778,12 @@ if test -z "$show_help"; then
       esac
 
       # Now actually substitute the argument into the commands.
-      if test -n "$arg"; then
-	compile_command="$compile_command $arg"
-	finalize_command="$finalize_command $arg"
-      fi
+      compile_command="$compile_command $arg"
+      finalize_command="$finalize_command $arg"
     done
 
     if test -n "$prev"; then
-      $echo "$modename: the \`$prevarg' option requires an argument" 1>&2
+      $echo "$progname: the \`$prevarg' option requires an argument" 1>&2
       $echo "$help" 1>&2
       exit 1
     fi
@@ -774,13 +792,13 @@ if test -z "$show_help"; then
     oldobjs=
     case "$output" in
     "")
-      $echo "$modename: you must specify an output file" 1>&2
+      $echo "$progname: you must specify an output file" 1>&2
       $echo "$help" 1>&2
       exit 1
       ;;
 
     */*)
-      $echo "$modename: output file \`$output' must have no directory components" 1>&2
+      $echo "$progname: output file \`$output' must have no directory components" 1>&2
       exit 1
       ;;
 
@@ -789,7 +807,7 @@ if test -z "$show_help"; then
       case "$output" in
       lib*) ;;
       *)
-	$echo "$modename: libtool library \`$arg' must begin with \`lib'" 1>&2
+	$echo "$progname: libtool library \`$arg' must begin with \`lib'" 1>&2
 	$echo "$help" 1>&2
 	exit 1
 	;;
@@ -807,13 +825,13 @@ if test -z "$show_help"; then
       age=0
 
       if test -n "$objs"; then
-        $echo "$modename: cannot build libtool library \`$output' from non-libtool objects:$objs" 2>&1
+        $echo "$progname: 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 "$modename: libtool library \`$output' may not depend on uninstalled libraries:$link_against_libtool_libs" 1>&2
+        $echo "$progname: libtool library \`$output' may not depend on uninstalled libraries:$link_against_libtool_libs" 1>&2
         exit 1
       fi
 
@@ -821,21 +839,21 @@ if test -z "$show_help"; then
       deplibs="$deplibs -lc"
 
       if test -n "$dlfiles$dlprefiles"; then
-        $echo "$modename: warning: \`-dlopen' is ignored while creating libtool libraries" 1>&2
+        $echo "$progname: 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 "$modename: you must specify an installation directory with \`-rpath'" 1>&2
+        $echo "$progname: 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 "$modename: warning: ignoring multiple \`-rpath's for a libtool library" 1>&2
+	$echo "$progname: warning: ignoring multiple \`-rpath's for a libtool library" 1>&2
       fi
       install_libdir="$2"
 
@@ -845,7 +863,7 @@ if test -z "$show_help"; then
       IFS="$save_ifs"
 
       if test -n "$5"; then
-        $echo "$modename: too many parameters to \`-version-info'" 1>&2
+        $echo "$progname: too many parameters to \`-version-info'" 1>&2
         $echo "$help" 1>&2
         exit 1
       fi
@@ -858,8 +876,8 @@ if test -z "$show_help"; then
       case "$current" in
       0 | [1-9] | [1-9][0-9]*) ;;
       *)
-        $echo "$modename: CURRENT \`$current' is not a nonnegative integer" 1>&2
-        $echo "$modename: \`$vinfo' is not valid version information" 1>&2
+        $echo "$progname: CURRENT \`$current' is not a nonnegative integer" 1>&2
+        $echo "$progname: \`$vinfo' is not valid version information" 1>&2
         exit 1
         ;;
       esac
@@ -867,8 +885,8 @@ if test -z "$show_help"; then
       case "$revision" in
       0 | [1-9] | [1-9][0-9]*) ;;
       *)
-        $echo "$modename: REVISION \`$revision' is not a nonnegative integer" 1>&2
-        $echo "$modename: \`$vinfo' is not valid version information" 1>&2
+        $echo "$progname: REVISION \`$revision' is not a nonnegative integer" 1>&2
+        $echo "$progname: \`$vinfo' is not valid version information" 1>&2
         exit 1
         ;;
       esac
@@ -876,15 +894,15 @@ if test -z "$show_help"; then
       case "$age" in
       0 | [1-9] | [1-9][0-9]*) ;;
       *)
-        $echo "$modename: AGE \`$age' is not a nonnegative integer" 1>&2
-        $echo "$modename: \`$vinfo' is not valid version information" 1>&2
+        $echo "$progname: AGE \`$age' is not a nonnegative integer" 1>&2
+        $echo "$progname: \`$vinfo' is not valid version information" 1>&2
         exit 1
         ;;
       esac
 
       if test $age -gt $current; then
-        $echo "$modename: AGE \`$age' is greater than the current interface number \`$current'" 1>&2
-        $echo "$modename: \`$vinfo' is not valid version information" 1>&2
+        $echo "$progname: AGE \`$age' is greater than the current interface number \`$current'" 1>&2
+        $echo "$progname: \`$vinfo' is not valid version information" 1>&2
         exit 1
       fi
 
@@ -924,8 +942,8 @@ if test -z "$show_help"; then
         ;;
 
       *)
-        $echo "$modename: unknown library version type \`$version_type'" 1>&2
-        echo "Fatal configuration error.  See the $PACKAGE docs for more information." 1>&2
+        $echo "$progname: unknown library version type \`$version_type'" 1>&2
+        $echo "Fatal configuration error.  See the $PACKAGE docs for more information." 1>&2
         exit 1
         ;;
       esac
@@ -947,7 +965,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 "$modename: warning: undefined symbols not allowed in $host shared libraries" 1>&2
+          $echo "$progname: warning: undefined symbols not allowed in $host shared libraries" 1>&2
           build_libtool_libs=no
 	  build_old_libs=yes
         fi
@@ -989,9 +1007,9 @@ if test -z "$show_help"; then
         IFS="$save_ifs"
 
         # Create links to the real library.
-        for linkname in $linknames; do
-          $show "(cd $objdir && $LN_S $realname $linkname)"
-          $run eval '(cd $objdir && $LN_S $realname $linkname)' || exit $?
+        for link in $linknames; do
+          $show "(cd $objdir && $LN_S $realname $link)"
+          $run eval '(cd $objdir && $LN_S $realname $link)' || exit $?
         done
 
         # If -export-dynamic was specified, set the dlname.
@@ -1004,33 +1022,33 @@ if test -z "$show_help"; then
 
     *.lo | *.o)
       if test -n "$link_against_libtool_libs"; then
-        $echo "$modename: error: cannot link libtool libraries into reloadable objects" 1>&2
+        $echo "$progname: error: cannot link libtool libraries into reloadable objects" 1>&2
         exit 1
       fi
 
       if test -n "$deplibs"; then
-        $echo "$modename: warning: \`-l' and \`-L' are ignored while creating objects" 1>&2
+        $echo "$progname: warning: \`-l' and \`-L' are ignored while creating objects" 1>&2
       fi
 
       if test -n "$dlfiles$dlprefiles"; then
-        $echo "$modename: warning: \`-dlopen' is ignored while creating objects" 1>&2
+        $echo "$progname: 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 "$modename: warning: \`-rpath' is ignored while creating objects" 1>&2
+        $echo "$progname: warning: \`-rpath' is ignored while creating objects" 1>&2
       fi
 
       if test -n "$vinfo"; then
-        $echo "$modename: warning: \`-version-info' is ignored while creating objects" 1>&2
+        $echo "$progname: warning: \`-version-info' is ignored while creating objects" 1>&2
       fi
 
       case "$output" in
       *.lo)
         if test -n "$objs"; then
-          $echo "$modename: cannot build library object \`$output' from non-libtool objects" 1>&2
+          $echo "$progname: cannot build library object \`$output' from non-libtool objects" 1>&2
           exit 1
         fi
         libobj="$output"
@@ -1064,8 +1082,8 @@ if test -z "$show_help"; then
       if test "$build_libtool_libs" != yes; then
         # Create an invalid libtool object if no PIC, so that we don't
         # accidentally link it into a program.
-        $show "echo timestamp > $libobj"
-        $run eval "echo timestamp > $libobj" || exit $?
+        $show "$echo timestamp > $libobj"
+        $run eval "\$echo timestamp > $libobj" || exit $?
         exit 0
       fi
 
@@ -1092,7 +1110,7 @@ if test -z "$show_help"; then
 
     *)
       if test -n "$vinfo"; then
-        $echo "$modename: warning: \`-version-info' is ignored while linking programs" 1>&2
+        $echo "$progname: warning: \`-version-info' is ignored while linking programs" 1>&2
       fi
 
       if test -n "$rpath"; then
@@ -1185,7 +1203,7 @@ if test -z "$show_help"; then
 	  if sort "$nlist" | uniq > "$nlist"T; then
 	    mv -f "$nlist"T "$nlist"
 	    wcout=`wc "$nlist" 2>/dev/null`
-	    count=`echo "$wcout" | sed 's/^[ 	]*\([0-9][0-9]*\).*$/\1/'`
+	    count=`$echo "$wcout" | sed 's/^[ 	]*\([0-9][0-9]*\).*$/\1/'`
 	    (test "$count" -ge 0) 2>/dev/null || count=-1
 	  else
 	    $rm "$nlist"T
@@ -1212,7 +1230,7 @@ EOF
 	    if test -f "$nlist"; then
 	      sed -e 's/^.* \(.*\)$/extern char \1;/' < "$nlist" >> "$objdir/$dlsyms"
 	    else
-	      echo '/* NONE */' >> "$objdir/$dlsyms"
+	      $echo '/* NONE */' >> "$objdir/$dlsyms"
 EOF
 	    fi
 
@@ -1240,7 +1258,7 @@ dld_preloaded_symbols[] =
 EOF
 
 	    if test -f "$nlist"; then
-	      sed 's/^\(.*\) \(.*\)$/  {"\1", (__ptr_t) \&\2},/' < "$nlist" >> "$objdir/$dlsyms"
+	      sed 's/^\(.*\) \(.*\)$/  {"\1", \&\2},/' < "$nlist" >> "$objdir/$dlsyms"
 	    fi
 
 	    cat <<\EOF >> "$objdir/$dlsyms"
@@ -1254,7 +1272,7 @@ EOF
 	    ;;
 
 	  *)
-	    $echo "$modename: unknown suffix for \`$dlsyms'" 1>&2
+	    echo "$progname: unknown suffix for \`$dlsyms'" 1>&2
 	    exit 1
 	    ;;
 	  esac
@@ -1268,12 +1286,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 "$modename: warning: \`-dlopen' and \`-dlpreopen' are ignored without \`-export-dynamic'" 1>&2
+        test -n "$dlfiles$dlprefiles" && $echo "$progname: 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 "$modename: not configured to extract global symbols from dlpreopened files" 1>&2
+        $echo "$progname: not configured to extract global symbols from dlpreopened files" 1>&2
 
         # Nullify the symbol file.
         compile_command=`$echo "$compile_command" | sed "s% @SYMFILE@%%"`
@@ -1343,8 +1361,8 @@ EOF
       case "$hardcode_action" in
       relink)
         # AGH! Flame the AIX and HP-UX people for me, will ya?
-        $echo "$modename: warning: using a buggy system linker" 1>&2
-        $echo "$modename: relinking will be required before \`$output' can be installed" 1>&2
+        $echo "$progname: warning: using a buggy system linker" 1>&2
+        $echo "$progname: relinking will be required before \`$output' can be installed" 1>&2
         ;;
       esac
 
@@ -1457,7 +1475,7 @@ EOF
     # The program doesn't exist.
     \$echo "\$0: error: \$progdir/\$program does not exist" 1>&2
     \$echo "This script is just a wrapper for \$program." 1>&2
-    echo "See the $PACKAGE documentation for more information." 1>&2
+    \$echo "See the $PACKAGE documentation for more information." 1>&2
     exit 1
   fi
 fi
@@ -1544,7 +1562,7 @@ EOF
 
   # libtool install mode
   install)
-    modename="$modename: install"
+    progname="$progname: install"
 
     # There may be an optional /bin/sh argument at the beginning of
     # install_prog (especially on Windows NT).
@@ -1624,22 +1642,22 @@ EOF
     done
 
     if test -z "$install_prog"; then
-      $echo "$modename: you must specify an install program" 1>&2
+      $echo "$progname: you must specify an install program" 1>&2
       $echo "$help" 1>&2
       exit 1
     fi
 
     if test -n "$prev"; then
-      $echo "$modename: the \`$prev' option requires an argument" 1>&2
+      $echo "$progname: 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 "$modename: no file or destination specified" 1>&2
+        $echo "$progname: no file or destination specified" 1>&2
       else
-        $echo "$modename: you must specify a destination" 1>&2
+        $echo "$progname: you must specify a destination" 1>&2
       fi
       $echo "$help" 1>&2
       exit 1
@@ -1661,7 +1679,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 "$modename: \`$dest' is not a directory" 1>&2
+        $echo "$progname: \`$dest' is not a directory" 1>&2
         $echo "$help" 1>&2
         exit 1
       fi
@@ -1673,7 +1691,7 @@ EOF
         case "$file" in
         *.lo) ;;
         *)
-          $echo "$modename: \`$destdir' must be an absolute directory name" 1>&2
+          $echo "$progname: \`$destdir' must be an absolute directory name" 1>&2
           $echo "$help" 1>&2
           exit 1
           ;;
@@ -1702,7 +1720,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 "$modename: \`$file' is not a valid libtool archive" 1>&2
+          $echo "$progname: \`$file' is not a valid libtool archive" 1>&2
           $echo "$help" 1>&2
           exit 1
         fi
@@ -1751,7 +1769,7 @@ EOF
               $show "$striplib $destdir/$realname"
               $run $striplib $destdir/$realname || exit $?
             else
-              $echo "$modename: warning: no library stripping program" 1>&2
+              $echo "$progname: warning: no library stripping program" 1>&2
             fi
           fi
 
@@ -1822,7 +1840,7 @@ EOF
           destfile=
           ;;
         *)
-          $echo "$modename: cannot copy a libtool object to \`$destfile'" 1>&2
+          $echo "$progname: cannot copy a libtool object to \`$destfile'" 1>&2
           $echo "$help" 1>&2
           exit 1
           ;;
@@ -1859,7 +1877,7 @@ EOF
 
           # Check the variables that should have been set.
           if test -z "$link_against_libtool_libs" || test -z "$finalize_command"; then
-            $echo "$modename: invalid libtool wrapper script \`$file'" 1>&2
+            $echo "$progname: invalid libtool wrapper script \`$file'" 1>&2
             exit 1
           fi
 
@@ -1876,26 +1894,26 @@ EOF
             fi
             libfile="$libdir/`$echo "$lib" | sed 's%^.*/%%g'`"
             if test -z "$libdir"; then
-              $echo "$modename: warning: \`$lib' contains no -rpath information" 1>&2
+              $echo "$progname: warning: \`$lib' contains no -rpath information" 1>&2
             elif test -f "$libfile"; then :
             else
-              $echo "$modename: warning: \`$lib' has not been installed in \`$libdir'" 1>&2
+              $echo "$progname: 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 "$modename: warning: relinking \`$file' on behalf of your buggy system linker" 1>&2
+              $echo "$progname: warning: relinking \`$file' on behalf of your buggy system linker" 1>&2
               $show "$finalize_command"
               if $run eval "$finalize_command"; then :
               else
-                $echo "$modename: error: relink \`$file' with the above command before installing it" 1>&2
+                $echo "$progname: error: relink \`$file' with the above command before installing it" 1>&2
                 continue
               fi
               file="$objdir/$file"T
             else
-              $echo "$modename: warning: cannot relink \`$file' on behalf of your buggy system linker" 1>&2
+              $echo "$progname: warning: cannot relink \`$file' on behalf of your buggy system linker" 1>&2
             fi
           else
             # Install the binary that we compiled earlier.
@@ -1924,7 +1942,7 @@ EOF
           $show "$old_striplib $oldlib"
           $run $old_striplib $oldlib || exit $?
         else
-          $echo "$modename: warning: no static library stripping program" 1>&2
+          $echo "$progname: warning: no static library stripping program" 1>&2
         fi
       fi
 
@@ -1940,7 +1958,7 @@ EOF
     done
 
     if test -n "$future_libdirs"; then
-      $echo "$modename: warning: remember to run \`$progname --finish$future_libdirs'" 1>&2
+      $echo "$progname: warning: remember to run \`$progname --finish$future_libdirs'" 1>&2
     fi
 
     if test -n "$current_libdirs"; then
@@ -1955,51 +1973,44 @@ EOF
 
   # libtool finish mode
   finish)
-    modename="$modename: finish"
+    progname="$progname: finish"
     libdirs="$nonopt"
 
-    if test -n "$finish_cmds$finish_eval" && test -n "$libdirs"; then
+    if test -n "$finish_cmds" && test -n "$libdirs"; then
       for dir
       do
         libdirs="$libdirs $dir"
       done
 
       for libdir in $libdirs; do
-	if test -n "$finish_cmds"; then
-	  # Do each command in the finish commands.
-	  cmds=`eval \\$echo \"$finish_cmds\"`
-          IFS="${IFS= 	}"; save_ifs="$IFS"; IFS=';'
-          for cmd in $cmds; do
-            IFS="$save_ifs"
-            $show "$cmd"
-            $run eval "$cmd"
-          done
+        # Do each command in the postinstall commands.
+        cmds=`eval \\$echo \"$finish_cmds\"`
+        IFS="${IFS= 	}"; save_ifs="$IFS"; IFS=';'
+        for cmd in $cmds; do
           IFS="$save_ifs"
-	fi
-	if test -n "$finish_eval"; then
-	  # Do the single finish_eval.
-	  cmds=`eval \\$echo \"$finish_eval\"`
-	  $run eval "$cmds"
-	fi
+          $show "$cmd"
+          $run eval "$cmd"
+        done
+        IFS="$save_ifs"
       done
     fi
 
-    echo "To link against installed libraries in LIBDIR, users may have to:"
+    $echo "To link against installed libraries in LIBDIR, users may have to:"
     if test -n "$shlibpath_var"; then
-      echo "   - add LIBDIR to their \`$shlibpath_var' environment variable"
+      $echo "   - add LIBDIR to their \`$shlibpath_var' environment variable"
     fi
-    echo "   - use the \`-LLIBDIR' linker flag"
+    $echo "   - use the \`-LLIBDIR' linker flag"
     exit 0
     ;;
 
   # libtool execute mode
   execute)
-    modename="$modename: execute"
+    progname="$progname: execute"
 
     # The first argument is the command name.
     cmd="$nonopt"
     if test -z "$cmd"; then
-      $echo "$modename: you must specify a COMMAND" 1>&2
+      $echo "$progname: you must specify a COMMAND" 1>&2
       $echo "$help"
       exit 1
     fi
@@ -2008,7 +2019,7 @@ EOF
     for file in $execute_dlfiles; do
       if test -f "$file"; then :
       else
-	$echo "$modename: \`$file' is not a file" 1>&2
+	$echo "$progname: \`$file' is not a file" 1>&2
 	$echo "$help" 1>&2
 	exit 1
       fi
@@ -2019,7 +2030,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 "$modename: \`$lib' is not a valid libtool archive" 1>&2
+          $echo "$progname: \`$lib' is not a valid libtool archive" 1>&2
           $echo "$help" 1>&2
           exit 1
         fi
@@ -2037,7 +2048,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 "$modename: warning: \`$file' was not linked with \`-export-dynamic'"
+	  test -n "$library_names" && $echo "$progname: warning: \`$file' was not linked with \`-export-dynamic'"
 	  continue
 	fi
 
@@ -2047,7 +2058,7 @@ EOF
 	if test -f "$dir/$objdir/$dlname"; then
 	  dir="$dir/$objdir"
 	else
-	  $echo "$modename: cannot find \`$dlname' in \`$dir' or \`$dir/$objdir'" 1>&2
+	  $echo "$progname: cannot find \`$dlname' in \`$dir' or \`$dir/$objdir'" 1>&2
 	  exit 1
 	fi
 	;;
@@ -2059,7 +2070,7 @@ EOF
 	;;
 
       *)
-	$echo "$modename: warning \`-dlopen' is ignored for non-libtool libraries and objects" 1>&2
+	$echo "$progname: warning \`-dlopen' is ignored for non-libtool libraries and objects" 1>&2
         continue
 	;;
       esac
@@ -2111,7 +2122,7 @@ EOF
       # Now actually exec the command.
       eval "exec \$cmd$args"
 
-      $echo "$modename: cannot exec \$cmd$args"
+      $echo "$progname: cannot exec \$cmd$args"
       exit 1
     else
       # Display what would be done.
@@ -2124,7 +2135,7 @@ EOF
 
   # libtool uninstall mode
   uninstall)
-    modename="$modename: uninstall"
+    progname="$progname: uninstall"
     rm="$nonopt"
     files=
 
@@ -2137,7 +2148,7 @@ EOF
     done
 
     if test -z "$rm"; then
-      $echo "$modename: you must specify an RM program" 1>&2
+      $echo "$progname: you must specify an RM program" 1>&2
       $echo "$help" 1>&2
       exit 1
     fi
@@ -2163,33 +2174,6 @@ EOF
           test -n "$dlname" && rmfiles="$rmfiles $dir/$dlname"
           test -n "$old_library" && rmfiles="$rmfiles $dir/$old_library"
 
-	  $show "$rm $rmfiles"
-	  $run $rm $rmfiles
-
-	  if test -n "$library_names"; then
-	    # Do each command in the postuninstall commands.
-	    cmds=`eval \\$echo \"$postuninstall_cmds\"`
-	    IFS="${IFS= 	}"; save_ifs="$IFS"; IFS=';'
-	    for cmd in $cmds; do
-	      IFS="$save_ifs"
-	      $show "$cmd"
-	      $run eval "$cmd"
-	    done
-	    IFS="$save_ifs"
-	  fi
-
-          if test -n "$old_library"; then
-	    # Do each command in the old_postuninstall commands.
-	    cmds=`eval \\$echo \"$old_postuninstall_cmds\"`
-	    IFS="${IFS= 	}"; save_ifs="$IFS"; IFS=';'
-	    for cmd in $cmds; do
-	      IFS="$save_ifs"
-	      $show "$cmd"
-	      $run eval "$cmd"
-	    done
-	    IFS="$save_ifs"
-	  fi
-
           # FIXME: should reinstall the best remaining shared library.
         fi
         ;;
@@ -2199,27 +2183,23 @@ EOF
           oldobj=`$echo "$name" | sed 's/\.lo$/\.o/'`
           rmfiles="$rmfiles $dir/$oldobj"
         fi
-	$show "$rm $rmfiles"
-	$run $rm $rmfiles
         ;;
-
-      *)
-      	$show "$rm $rmfiles"
-	$run $rm $rmfiles
-	;;
       esac
+
+      $show "$rm $rmfiles"
+      $run $rm $rmfiles
     done
     exit 0
     ;;
 
   "")
-    $echo "$modename: you must specify a MODE" 1>&2
+    $echo "$progname: you must specify a MODE" 1>&2
     $echo "$generic_help" 1>&2
     exit 1
     ;;
   esac
 
-  $echo "$modename: invalid operation mode \`$mode'" 1>&2
+  $echo "$progname: invalid operation mode \`$mode'" 1>&2
   $echo "$generic_help" 1>&2
   exit 1
 fi # test -z "$show_help"
@@ -2227,7 +2207,7 @@ fi # test -z "$show_help"
 # We need to display help for each of the modes.
 case "$mode" in
 "") cat <<EOF
-Usage: $modename [OPTION]... [MODE-ARG]...
+Usage: $progname [OPTION]... [MODE-ARG]...
 
 Provide generalized library-building support services.
 
@@ -2249,14 +2229,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 \`$modename --help --mode=MODE' for
+MODE-ARGS vary depending on the MODE.  Try \`$progname --help --mode=MODE' for
 a more detailed description of MODE.
 EOF
   ;;
 
 compile)
   cat <<EOF
-Usage: $modename [OPTION]... --mode=compile COMPILE-COMMAND... SOURCEFILE
+Usage: $progname [OPTION]... --mode=compile COMPILE-COMMAND... SOURCEFILE
 
 Compile a source file into a libtool library object.
 
@@ -2271,7 +2251,7 @@ EOF
 
 execute)
   cat <<EOF
-Usage: $modename [OPTION]... --mode=execute COMMAND [ARGS]...
+Usage: $progname [OPTION]... --mode=execute COMMAND [ARGS]...
 
 Automatically set library path, then run a program.
 
@@ -2292,7 +2272,7 @@ EOF
 
 finish)
   cat <<EOF
-Usage: $modename [OPTION]... --mode=finish [LIBDIR]...
+Usage: $progname [OPTION]... --mode=finish [LIBDIR]...
 
 Complete the installation of libtool libraries.
 
@@ -2305,7 +2285,7 @@ EOF
 
 install)
   cat <<EOF
-Usage: $modename [OPTION]... --mode=install INSTALL-COMMAND...
+Usage: $progname [OPTION]... --mode=install INSTALL-COMMAND...
 
 Install executables or libraries.
 
@@ -2319,7 +2299,7 @@ EOF
 
 link)
   cat <<EOF
-Usage: $modename [OPTION]... --mode=link LINK-COMMAND...
+Usage: $progname [OPTION]... --mode=link LINK-COMMAND...
 
 Link object files or libraries together to form another library, or to
 create an executable program.
@@ -2330,12 +2310,12 @@ a program from several object files.
 The following components of LINK-COMMAND are treated specially:
 
   -all-static       do not do any dynamic linking at all
+  -allow-undefined  allow a libtool library to reference undefined symbols
   -dlopen FILE      \`-dlpreopen' FILE if it cannot be dlopened at runtime
   -dlpreopen FILE   link in FILE and add its symbols to dld_preloaded_symbols
   -export-dynamic   allow symbols from OUTPUT-FILE to be resolved with dlsym(3)
   -LLIBDIR          search LIBDIR for required installed libraries
   -lNAME            OUTPUT-FILE requires the installed library libNAME
-  -no-undefined     declare that a library does not refer to external symbols
   -o OUTPUT-FILE    create OUTPUT-FILE from the specified objects
   -rpath LIBDIR     the created library will eventually be installed in LIBDIR
   -static           do not do any dynamic linking of libtool libraries
@@ -2361,7 +2341,7 @@ EOF
 
 uninstall)
   cat <<EOF
-Usage: $modename [OPTION]... --mode=uninstall RM [RM-OPTION]... FILE...
+Usage: $progname [OPTION]... --mode=uninstall RM [RM-OPTION]... FILE...
 
 Remove libraries from an installation directory.
 
@@ -2375,14 +2355,14 @@ EOF
   ;;
 
 *)
-  $echo "$modename: invalid operation mode \`$mode'" 1>&2
+  $echo "$progname: invalid operation mode \`$mode'" 1>&2
   $echo "$help" 1>&2
   exit 1
   ;;
 esac
 
-echo
-$echo "Try \`$modename --help' for more information about other modes."
+$echo
+$echo "Try \`$progname --help' for more information about other modes."
 
 exit 0