Sync the CVS version with the generated one

1 files changed, 72 insertions, 56 deletions

diff --git a/ltmain.in b/ltmain.in
index 7c26afe9..7dc3ba6a 100644
--- a/ltmain.in
+++ b/ltmain.in
@@ -1,9 +1,18 @@
+#  -*- buffer-read-only: t -*- vi: set ro:
+# 
+# DO NOT EDIT THIS FILE   (ltmain.in)
+# 
+# It has been AutoGen-ed  Sunday May 13, 2001 at 08:35:45 AM PDT
+# From the definitions    ltstr.def
+# and the template file   ltmain.tpl
+#
 # ltmain.sh - Provide generalized library-building support services.
 # NOTE: Changing this file will not affect anything until you rerun ltconfig.
 #
 # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001
 # Free Software Foundation, Inc.
 # Originally by Gordon Matzigkeit <gord@gnu.ai.mit.edu>, 1996
+# Massively rewritten by Bruce Korb <bkorb@gnu.org>
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -60,6 +69,10 @@ TIMESTAMP="@TIMESTAMP@"
 
 default_mode=
 help="Try \`$progname --help' for more information."
+
+# Global variables.
+lo2o="s/\\.lo\$/.${objext}/"
+o2lo="s/\\.${objext}\$/.lo/"
 magic="%%%MAGIC variable%%%"
 mkdir="mkdir"
 mv="mv -f"
@@ -105,8 +118,6 @@ run=
 show="$echo"
 show_help=
 execute_dlfiles=
-lo2o="s/\\.lo\$/.${objext}/"
-o2lo="s/\\.${objext}\$/.lo/"
 
 # Parse our command line options once, thoroughly.
 while test $# -gt 0
@@ -1761,11 +1772,12 @@ EOF
 	  case $linkmode in
 	  lib)
 	    if test "$deplibs_check_method" != pass_all; then
-	      echo
-	      echo "*** Warning: This library needs some functionality provided by $deplib."
-	      echo "*** I have the capability to make that library automatically link in when"
-	      echo "*** you link to this library.  But I can only do this if you have a"
-	      echo "*** shared version of the library, which you do not appear to have."
+cat 1>&2 <<_EOF_
+*** Warning: This library needs some functionality provided by $deplib.
+*** I can automatically link to that library when you link
+*** to this library, but I can only do this if you have a shared
+*** version of $deplib.  You do not appear to have one.
+_EOF_
 	    else
 	      echo
 	      echo "*** Warning: Linking the shared library $output against the"
@@ -2226,11 +2238,12 @@ EOF
 
 	    # Just print a warning and add the library to dependency_libs so
 	    # that the program can be linked against the static library.
-	    echo
-	    echo "*** Warning: This library needs some functionality provided by $lib."
-	    echo "*** I have the capability to make that library automatically link in when"
-	    echo "*** you link to this library.  But I can only do this if you have a"
-	    echo "*** shared version of the library, which you do not appear to have."
+cat 1>&2 <<_EOF_
+*** Warning: This library needs some functionality provided by $lib.
+*** I can automatically link to that library when you link
+*** to this library, but I can only do this if you have a shared
+*** version of $lib.  You do not appear to have one.
+_EOF_
 	    if test "$module" = yes; then
 	      echo "*** Therefore, libtool will create a static module, that should work "
 	      echo "*** as long as the dlopening application is linked with the -dlopen flag."
@@ -2806,11 +2819,12 @@ EOF
 		  newdeplibs="$newdeplibs $i"
 		else
 		  droppeddeps=yes
-		  echo
-		  echo "*** Warning: This library needs some functionality provided by $i."
-		  echo "*** I have the capability to make that library automatically link in when"
-		  echo "*** you link to this library.  But I can only do this if you have a"
-		  echo "*** shared version of the library, which you do not appear to have."
+cat 1>&2 <<_EOF_
+*** Warning: This library needs some functionality provided by $i.
+*** I can automatically link to that library when you link
+*** to this library, but I can only do this if you have a shared
+*** version of $i.  You do not appear to have one.
+_EOF_
 		fi
 	      else
 		newdeplibs="$newdeplibs $i"
@@ -2836,11 +2850,12 @@ EOF
 		    newdeplibs="$newdeplibs $i"
 		  else
 		    droppeddeps=yes
-		    echo
-		    echo "*** Warning: This library needs some functionality provided by $i."
-		    echo "*** I have the capability to make that library automatically link in when"
-		    echo "*** you link to this library.  But I can only do this if you have a"
-		    echo "*** shared version of the library, which you do not appear to have."
+cat 1>&2 <<_EOF_
+*** Warning: This library needs some functionality provided by $i.
+*** I can automatically link to that library when you link
+*** to this library, but I can only do this if you have a shared
+*** version of $i.  You do not appear to have one.
+_EOF_
 		  fi
 		else
 		  droppeddeps=yes
@@ -2896,11 +2911,12 @@ EOF
 	      done
 	      if test -n "$a_deplib" ; then
 		droppeddeps=yes
-		echo
-		echo "*** Warning: This library needs some functionality provided by $a_deplib."
-		echo "*** I have the capability to make that library automatically link in when"
-		echo "*** you link to this library.  But I can only do this if you have a"
-		echo "*** shared version of the library, which you do not appear to have."
+cat 1>&2 <<_EOF_
+*** Warning: This library needs some functionality provided by $a_deplib.
+*** I can automatically link to that library when you link
+*** to this library, but I can only do this if you have a shared
+*** version of $a_deplib.  You do not appear to have one.
+_EOF_
 	      fi
 	    else
 	      # Add a -L argument.
@@ -2930,11 +2946,12 @@ EOF
 	      done
 	      if test -n "$a_deplib" ; then
 		droppeddeps=yes
-		echo
-		echo "*** Warning: This library needs some functionality provided by $a_deplib."
-		echo "*** I have the capability to make that library automatically link in when"
-		echo "*** you link to this library.  But I can only do this if you have a"
-		echo "*** shared version of the library, which you do not appear to have."
+cat 1>&2 <<_EOF_
+*** Warning: This library needs some functionality provided by $a_deplib.
+*** I can automatically link to that library when you link
+*** to this library, but I can only do this if you have a shared
+*** version of $a_deplib.  You do not appear to have one.
+_EOF_
 	      fi
 	    else
 	      # Add a -L argument.
@@ -4928,30 +4945,29 @@ relink_command=\"$relink_command\""
 
     # The first argument is the command name.
     cmd="$nonopt"
-    if test -z "$cmd"; then
-      $echo "$modename: you must specify a COMMAND" 1>&2
-      $echo "$help"
-      exit 1
-    fi
-
+    if (test -z "$cmd") > /dev/null 2>&1 ; then
+  $echo "$modename: you must specify a COMMAND" 1>&2
+  $echo "$help" 1>&2
+  exit 1
+fi
     # Handle -dlopen flags immediately.
     for file in $execute_dlfiles; do
-      if test ! -f "$file"; then
-	$echo "$modename: \`$file' is not a file" 1>&2
-	$echo "$help" 1>&2
-	exit 1
-      fi
+      if (test ! -f "$file") > /dev/null 2>&1 ; then
+  $echo "$modename: \`$file' is not a file" 1>&2
+  $echo "$help" 1>&2
+  exit 1
+fi
 
       dir=
       case $file in
       *.la)
 	# Check to see that this really is a libtool archive.
-	if (sed -e '2q' $file | egrep "^# Generated by .*$PACKAGE") >/dev/null 2>&1; then :
-	else
-	  $echo "$modename: \`$lib' is not a valid libtool archive" 1>&2
-	  $echo "$help" 1>&2
-	  exit 1
-	fi
+	if (sed -e '2q' $file | egrep "^# Generated by .*$PACKAGE") > /dev/null 2>&1 ; then  :
+else
+  $echo "$modename: \`$lib' is not a valid libtool archive" 1>&2
+  $echo "$help" 1>&2
+  exit 1
+fi
 
 	# Read the libtool library.
 	dlname=
@@ -4973,12 +4989,13 @@ relink_command=\"$relink_command\""
 	dir=`$echo "X$file" | $Xsed -e 's%/[^/]*$%%'`
 	test "X$dir" = "X$file" && dir=.
 
-	if test -f "$dir/$objdir/$dlname"; then
-	  dir="$dir/$objdir"
-	else
-	  $echo "$modename: cannot find \`$dlname' in \`$dir' or \`$dir/$objdir'" 1>&2
-	  exit 1
-	fi
+	if (test -f "$dir/$objdir/$dlname") > /dev/null 2>&1 ; then  :
+else
+  $echo "$modename: cannot find \`$dlname' in \`$dir' or \`$dir/$objdir'" 1>&2
+  $echo "$help" 1>&2
+  exit 1
+fi
+	dir="$dir/$objdir"
 	;;
 
       *.lo)
@@ -5220,7 +5237,6 @@ relink_command=\"$relink_command\""
 	$run rmdir $dir >/dev/null 2>&1
       fi
     done
-
     exit $exit_status
     ;;