The server timeouts after a while instead of running for ever (useful for solaris...

[simgrid.git] / ltmain.sh

diff --git a/ltmain.sh b/ltmain.sh
index b5afd12..529c85f 100644 (file)
--- a/ltmain.sh
+++ b/ltmain.sh
@@ -1,7 +1,7 @@
 # ltmain.sh - Provide generalized library-building support services.
 # NOTE: Changing this file will not affect anything until you rerun configure.
 #
 # ltmain.sh - Provide generalized library-building support services.
 # NOTE: Changing this file will not affect anything until you rerun configure.
 #

-# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003
+# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004

 # Free Software Foundation, Inc.
 # Originally by Gordon Matzigkeit <gord@gnu.ai.mit.edu>, 1996
 #
 # Free Software Foundation, Inc.
 # Originally by Gordon Matzigkeit <gord@gnu.ai.mit.edu>, 1996
 #


@@ -24,6 +24,29 @@
 # configuration script generated by Autoconf, you may include it under
 # the same distribution terms that you use for the rest of that program.
 
 # configuration script generated by Autoconf, you may include it under
 # the same distribution terms that you use for the rest of that program.
 

+basename="s,^.*/,,g"
+
+# Work around backward compatibility issue on IRIX 6.5. On IRIX 6.4+, sh
+# is ksh but when the shell is invoked as "sh" and the current value of
+# the _XPG environment variable is not equal to 1 (one), the special
+# positional parameter $0, within a function call, is the name of the
+# function.
+progpath="$0"
+
+# The name of this program:
+progname=`echo "$progpath" | $SED $basename`
+modename="$progname"
+
+# Global variables:
+EXIT_SUCCESS=0
+EXIT_FAILURE=1
+
+PROGRAM=ltmain.sh
+PACKAGE=libtool
+VERSION=1.5.6
+TIMESTAMP=" (1.1220.2.95 2004/04/11 05:50:42) Debian$Rev: 203 $"
+
+

 # Check that we have a working $echo.
 if test "X$1" = X--no-reexec; then
   # Discard the --no-reexec flag, and continue.
 # Check that we have a working $echo.
 if test "X$1" = X--no-reexec; then
   # Discard the --no-reexec flag, and continue.


@@ -36,7 +59,7 @@ elif test "X`($echo '\t') 2>/dev/null`" = 'X\t'; then
   :
 else
   # Restart under the correct shell, and then maybe $echo will work.
   :
 else
   # Restart under the correct shell, and then maybe $echo will work.

-  exec $SHELL "$0" --no-reexec ${1+"$@"}
+  exec $SHELL "$progpath" --no-reexec ${1+"$@"}

 fi
 
 if test "X$1" = X--fallback-echo; then
 fi
 
 if test "X$1" = X--fallback-echo; then


@@ -45,19 +68,9 @@ if test "X$1" = X--fallback-echo; then
   cat <<EOF
 $*
 EOF
   cat <<EOF
 $*
 EOF

-  exit 0
+  exit $EXIT_SUCCESS

 fi
 
 fi
 

-# The name of this program.
-progname=`$echo "$0" | ${SED} 's%^.*/%%'`
-modename="$progname"
-
-# Constants.
-PROGRAM=ltmain.sh
-PACKAGE=libtool
-VERSION=1.5.0a
-TIMESTAMP=" (1.1220.2.35 2003/11/12 18:51:58) Debian$Rev: 159 $"
-

 default_mode=
 help="Try \`$progname --help' for more information."
 magic="%%%MAGIC variable%%%"
 default_mode=
 help="Try \`$progname --help' for more information."
 magic="%%%MAGIC variable%%%"


@@ -100,7 +113,7 @@ 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
 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

-  exit 1
+  exit $EXIT_FAILURE

 fi
 
 # Global variables.
 fi
 
 # Global variables.


@@ -119,10 +132,13 @@ o2lo="s/\\.${objext}\$/.lo/"
 # Shell function definitions:
 # This seems to be the best place for them
 
 # Shell function definitions:
 # This seems to be the best place for them
 

+# func_win32_libid arg
+# return the library type of file 'arg'
+#

 # Need a lot of goo to handle *both* DLLs and import libs
 # Has to be a shell function in order to 'eat' the argument
 # that is supplied when $file_magic_command is called.
 # Need a lot of goo to handle *both* DLLs and import libs
 # Has to be a shell function in order to 'eat' the argument
 # that is supplied when $file_magic_command is called.

-win32_libid () {
+func_win32_libid () {

   win32_libid_type="unknown"
   win32_fileres=`file -L $1 2>/dev/null`
   case $win32_fileres in
   win32_libid_type="unknown"
   win32_fileres=`file -L $1 2>/dev/null`
   case $win32_fileres in


@@ -131,7 +147,7 @@ win32_libid () {
     ;;
   *ar\ archive*) # could be an import, or static
     if eval $OBJDUMP -f $1 | $SED -e '10q' 2>/dev/null | \
     ;;
   *ar\ archive*) # could be an import, or static
     if eval $OBJDUMP -f $1 | $SED -e '10q' 2>/dev/null | \

-      grep -E 'file format pe-i386(.*architecture: i386)?' >/dev/null ; then
+      $EGREP -e 'file format pe-i386(.*architecture: i386)?' >/dev/null ; then

       win32_nmres=`eval $NM -f posix -A $1 | \
        sed -n -e '1,100{/ I /{x;/import/!{s/^/import/;h;p;};x;};}'`
       if test "X$win32_nmres" = "Ximport" ; then
       win32_nmres=`eval $NM -f posix -A $1 | \
        sed -n -e '1,100{/ I /{x;/import/!{s/^/import/;h;p;};x;};}'`
       if test "X$win32_nmres" = "Ximport" ; then


@@ -141,7 +157,7 @@ win32_libid () {
       fi
     fi
     ;;
       fi
     fi
     ;;

-  *DLL*) 
+  *DLL*)

     win32_libid_type="x86 DLL"
     ;;
   *executable*) # but shell scripts are "executable" too...
     win32_libid_type="x86 DLL"
     ;;
   *executable*) # but shell scripts are "executable" too...


@@ -155,9 +171,76 @@ win32_libid () {
   $echo $win32_libid_type
 }
 
   $echo $win32_libid_type
 }
 

+
+# func_infer_tag arg
+# Infer tagged configuration to use if any are available and
+# if one wasn't chosen via the "--tag" command line option.
+# Only attempt this if the compiler in the base compile
+# command doesn't match the default compiler.
+# arg is usually of the form 'gcc ...'
+func_infer_tag () {
+    if test -n "$available_tags" && test -z "$tagname"; then
+      CC_quoted=
+      for arg in $CC; do
+       case $arg in
+         *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \ ]*|*]*|"")
+         arg="\"$arg\""
+         ;;
+       esac
+       CC_quoted="$CC_quoted $arg"
+      done
+      case $@ in
+      # Blanks in the command may have been stripped by the calling shell,
+      # but not from the CC environment variable when configure was run.
+      " $CC "* | "$CC "* | " `$echo $CC` "* | "`$echo $CC` "* | " $CC_quoted"* | "$CC_quoted "* | " `$echo $CC_quoted` "* | "`$echo $CC_quoted` "*) ;;
+      # Blanks at the start of $base_compile will cause this to fail
+      # if we don't check for them as well.
+      *)
+       for z in $available_tags; do
+         if grep "^# ### BEGIN LIBTOOL TAG CONFIG: $z$" < "$progpath" > /dev/null; then
+           # Evaluate the configuration.
+           eval "`${SED} -n -e '/^# ### BEGIN LIBTOOL TAG CONFIG: '$z'$/,/^# ### END LIBTOOL TAG CONFIG: '$z'$/p' < $progpath`"
+           CC_quoted=
+           for arg in $CC; do
+           # Double-quote args containing other shell metacharacters.
+           case $arg in
+             *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \     ]*|*]*|"")
+             arg="\"$arg\""
+             ;;
+           esac
+           CC_quoted="$CC_quoted $arg"
+         done
+           case "$@ " in
+             " $CC "* | "$CC "* | " `$echo $CC` "* | "`$echo $CC` "* | " $CC_quoted"* | "$CC_quoted "* | " `$echo $CC_quoted` "* | "`$echo $CC_quoted` "*)
+             # The compiler in the base compile command matches
+             # the one in the tagged configuration.
+             # Assume this is the tagged configuration we want.
+             tagname=$z
+             break
+             ;;
+           esac
+         fi
+       done
+       # If $tagname still isn't set, then no tagged configuration
+       # was found and let the user know that the "--tag" command
+       # line option must be used.
+       if test -z "$tagname"; then
+         $echo "$modename: unable to infer tagged configuration"
+         $echo "$modename: specify a tag with \`--tag'" 1>&2
+         exit $EXIT_FAILURE
+#        else
+#          $echo "$modename: using $tagname tagged configuration"
+       fi
+       ;;
+      esac
+    fi
+}

 # End of Shell function definitions
 #####################################
 
 # End of Shell function definitions
 #####################################
 

+# Darwin sucks
+eval std_shrext=\"$shrext_cmds\"
+

 # Parse our command line options once, thoroughly.
 while test "$#" -gt 0
 do
 # Parse our command line options once, thoroughly.
 while test "$#" -gt 0
 do


@@ -183,7 +266,7 @@ do
       case $tagname in
       *[!-_A-Za-z0-9,/]*)
        $echo "$progname: invalid tag name: $tagname" 1>&2
       case $tagname in
       *[!-_A-Za-z0-9,/]*)
        $echo "$progname: invalid tag name: $tagname" 1>&2

-       exit 1
+       exit $EXIT_FAILURE

        ;;
       esac
 
        ;;
       esac
 


@@ -193,10 +276,10 @@ do
        # not specially marked.
        ;;
       *)
        # not specially marked.
        ;;
       *)

-       if grep "^# ### BEGIN LIBTOOL TAG CONFIG: $tagname$" < "$0" > /dev/null; then
+       if grep "^# ### BEGIN LIBTOOL TAG CONFIG: $tagname$" < "$progpath" > /dev/null; then

          taglist="$taglist $tagname"
          # Evaluate the configuration.
          taglist="$taglist $tagname"
          # Evaluate the configuration.

-         eval "`${SED} -n -e '/^# ### BEGIN LIBTOOL TAG CONFIG: '$tagname'$/,/^# ### END LIBTOOL TAG CONFIG: '$tagname'$/p' < $0`"
+         eval "`${SED} -n -e '/^# ### BEGIN LIBTOOL TAG CONFIG: '$tagname'$/,/^# ### END LIBTOOL TAG CONFIG: '$tagname'$/p' < $progpath`"

        else
          $echo "$progname: ignoring unknown tag $tagname" 1>&2
        fi
        else
          $echo "$progname: ignoring unknown tag $tagname" 1>&2
        fi


@@ -225,16 +308,16 @@ do
     $echo "Copyright (C) 2003  Free Software Foundation, Inc."
     $echo "This is free software; see the source for copying conditions.  There is NO"
     $echo "warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
     $echo "Copyright (C) 2003  Free Software Foundation, Inc."
     $echo "This is free software; see the source for copying conditions.  There is NO"
     $echo "warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."

-    exit 0
+    exit $EXIT_SUCCESS

     ;;
 
   --config)
     ;;
 
   --config)

-    ${SED} -e '1,/^# ### BEGIN LIBTOOL CONFIG/d' -e '/^# ### END LIBTOOL CONFIG/,$d' $0
+    ${SED} -e '1,/^# ### BEGIN LIBTOOL CONFIG/d' -e '/^# ### END LIBTOOL CONFIG/,$d' $progpath

     # Now print the configurations for the tags.
     for tagname in $taglist; do
     # Now print the configurations for the tags.
     for tagname in $taglist; do

-      ${SED} -n -e "/^# ### BEGIN LIBTOOL TAG CONFIG: $tagname$/,/^# ### END LIBTOOL TAG CONFIG: $tagname$/p" < "$0"
+      ${SED} -n -e "/^# ### BEGIN LIBTOOL TAG CONFIG: $tagname$/,/^# ### END LIBTOOL TAG CONFIG: $tagname$/p" < "$progpath"

     done
     done

-    exit 0
+    exit $EXIT_SUCCESS

     ;;
 
   --debug)
     ;;
 
   --debug)


@@ -259,7 +342,7 @@ do
     else
       $echo "disable static libraries"
     fi
     else
       $echo "disable static libraries"
     fi

-    exit 0
+    exit $EXIT_SUCCESS

     ;;
 
   --finish) mode="finish" ;;
     ;;
 
   --finish) mode="finish" ;;


@@ -290,7 +373,7 @@ do
   -*)
     $echo "$modename: unrecognized option \`$arg'" 1>&2
     $echo "$help" 1>&2
   -*)
     $echo "$modename: unrecognized option \`$arg'" 1>&2
     $echo "$help" 1>&2

-    exit 1
+    exit $EXIT_FAILURE

     ;;
 
   *)
     ;;
 
   *)


@@ -303,7 +386,7 @@ done
 if test -n "$prevopt"; then
   $echo "$modename: option \`$prevopt' requires an argument" 1>&2
   $echo "$help" 1>&2
 if test -n "$prevopt"; then
   $echo "$modename: option \`$prevopt' requires an argument" 1>&2
   $echo "$help" 1>&2

-  exit 1
+  exit $EXIT_FAILURE

 fi
 
 # If this variable is set in any of the actions, the command in it
 fi
 
 # If this variable is set in any of the actions, the command in it


@@ -359,7 +442,7 @@ if test -z "$show_help"; then
   if test -n "$execute_dlfiles" && test "$mode" != execute; then
     $echo "$modename: unrecognized option \`-dlopen'" 1>&2
     $echo "$help" 1>&2
   if test -n "$execute_dlfiles" && test "$mode" != execute; then
     $echo "$modename: unrecognized option \`-dlopen'" 1>&2
     $echo "$help" 1>&2

-    exit 1
+    exit $EXIT_FAILURE

   fi
 
   # Change the help message to a mode-specific one.
   fi
 
   # Change the help message to a mode-specific one.


@@ -401,7 +484,7 @@ if test -z "$show_help"; then
        -o)
          if test -n "$libobj" ; then
            $echo "$modename: you cannot specify \`-o' more than once" 1>&2
        -o)
          if test -n "$libobj" ; then
            $echo "$modename: you cannot specify \`-o' more than once" 1>&2

-           exit 1
+           exit $EXIT_FAILURE

          fi
          arg_mode=target
          continue
          fi
          arg_mode=target
          continue


@@ -426,7 +509,7 @@ if test -z "$show_help"; then
          args=`$echo "X$arg" | $Xsed -e "s/^-Wc,//"`
          lastarg=
          save_ifs="$IFS"; IFS=','
          args=`$echo "X$arg" | $Xsed -e "s/^-Wc,//"`
          lastarg=
          save_ifs="$IFS"; IFS=','

-         for arg in $args; do
+         for arg in $args; do

            IFS="$save_ifs"
 
            # Double-quote args containing other shell metacharacters.
            IFS="$save_ifs"
 
            # Double-quote args containing other shell metacharacters.


@@ -476,11 +559,11 @@ if test -z "$show_help"; then
     case $arg_mode in
     arg)
       $echo "$modename: you must specify an argument for -Xcompile"
     case $arg_mode in
     arg)
       $echo "$modename: you must specify an argument for -Xcompile"

-      exit 1
+      exit $EXIT_FAILURE

       ;;
     target)
       $echo "$modename: you must specify a target with \`-o'" 1>&2
       ;;
     target)
       $echo "$modename: you must specify a target with \`-o'" 1>&2

-      exit 1
+      exit $EXIT_FAILURE

       ;;
     *)
       # Get the name of the library object.
       ;;
     *)
       # Get the name of the library object.


@@ -513,50 +596,11 @@ if test -z "$show_help"; then
     *.lo) obj=`$echo "X$libobj" | $Xsed -e "$lo2o"` ;;
     *)
       $echo "$modename: cannot determine name of library object from \`$libobj'" 1>&2
     *.lo) obj=`$echo "X$libobj" | $Xsed -e "$lo2o"` ;;
     *)
       $echo "$modename: cannot determine name of library object from \`$libobj'" 1>&2

-      exit 1
+      exit $EXIT_FAILURE

       ;;
     esac
 
       ;;
     esac
 

-    # Infer tagged configuration to use if any are available and
-    # if one wasn't chosen via the "--tag" command line option.
-    # Only attempt this if the compiler in the base compile
-    # command doesn't match the default compiler.
-    if test -n "$available_tags" && test -z "$tagname"; then
-      case $base_compile in
-      # Blanks in the command may have been stripped by the calling shell,
-      # but not from the CC environment variable when configure was run.
-      " $CC "* | "$CC "* | " `$echo $CC` "* | "`$echo $CC` "*) ;;
-      # Blanks at the start of $base_compile will cause this to fail
-      # if we don't check for them as well.
-      *)
-       for z in $available_tags; do
-         if grep "^# ### BEGIN LIBTOOL TAG CONFIG: $z$" < "$0" > /dev/null; then
-           # Evaluate the configuration.
-           eval "`${SED} -n -e '/^# ### BEGIN LIBTOOL TAG CONFIG: '$z'$/,/^# ### END LIBTOOL TAG CONFIG: '$z'$/p' < $0`"
-           case "$base_compile " in
-           "$CC "* | " $CC "* | "`$echo $CC` "* | " `$echo $CC` "*)
-             # The compiler in the base compile command matches
-             # the one in the tagged configuration.
-             # Assume this is the tagged configuration we want.
-             tagname=$z
-             break
-             ;;
-           esac
-         fi
-       done
-       # If $tagname still isn't set, then no tagged configuration
-       # was found and let the user know that the "--tag" command
-       # line option must be used.
-       if test -z "$tagname"; then
-         $echo "$modename: unable to infer tagged configuration"
-         $echo "$modename: specify a tag with \`--tag'" 1>&2
-         exit 1
-#        else
-#          $echo "$modename: using $tagname tagged configuration"
-       fi
-       ;;
-      esac
-    fi
+    func_infer_tag $base_compile

 
     for arg in $later; do
       case $arg in
 
     for arg in $later; do
       case $arg in


@@ -589,7 +633,7 @@ if test -z "$show_help"; then
     if test -z "$base_compile"; then
       $echo "$modename: you must specify a compilation command" 1>&2
       $echo "$help" 1>&2
     if test -z "$base_compile"; then
       $echo "$modename: you must specify a compilation command" 1>&2
       $echo "$help" 1>&2

-      exit 1
+      exit $EXIT_FAILURE

     fi
 
     # Delete any leftover library objects.
     fi
 
     # Delete any leftover library objects.


@@ -600,7 +644,7 @@ if test -z "$show_help"; then
     fi
 
     $run $rm $removelist
     fi
 
     $run $rm $removelist

-    trap "$run $rm $removelist; exit 1" 1 2 15
+    trap "$run $rm $removelist; exit $EXIT_FAILURE" 1 2 15

 
     # On Cygwin there's no "real" PIC flag so we must build both object types
     case $host_os in
 
     # On Cygwin there's no "real" PIC flag so we must build both object types
     case $host_os in


@@ -619,7 +663,7 @@ if test -z "$show_help"; then
       output_obj=`$echo "X$srcfile" | $Xsed -e 's%^.*/%%' -e 's%\.[^.]*$%%'`.${objext}
       lockfile="$output_obj.lock"
       removelist="$removelist $output_obj $lockfile"
       output_obj=`$echo "X$srcfile" | $Xsed -e 's%^.*/%%' -e 's%\.[^.]*$%%'`.${objext}
       lockfile="$output_obj.lock"
       removelist="$removelist $output_obj $lockfile"

-      trap "$run $rm $removelist; exit 1" 1 2 15
+      trap "$run $rm $removelist; exit $EXIT_FAILURE" 1 2 15

     else
       output_obj=
       need_locks=no
     else
       output_obj=
       need_locks=no


@@ -629,7 +673,7 @@ if test -z "$show_help"; then
     # Lock this critical section if it is needed
     # We use this script file to make the link, it avoids creating a new file
     if test "$need_locks" = yes; then
     # Lock this critical section if it is needed
     # We use this script file to make the link, it avoids creating a new file
     if test "$need_locks" = yes; then

-      until $run ln "$0" "$lockfile" 2>/dev/null; do
+      until $run ln "$progpath" "$lockfile" 2>/dev/null; do

        $show "Waiting for $lockfile to be removed"
        sleep 2
       done
        $show "Waiting for $lockfile to be removed"
        sleep 2
       done


@@ -647,7 +691,7 @@ avoid parallel builds (make -j) in this platform, or get a better
 compiler."
 
        $run $rm $removelist
 compiler."
 
        $run $rm $removelist

-       exit 1
+       exit $EXIT_FAILURE

       fi
       $echo $srcfile > "$lockfile"
     fi
       fi
       $echo $srcfile > "$lockfile"
     fi


@@ -702,7 +746,7 @@ EOF
       if $run eval "$command"; then :
       else
        test -n "$output_obj" && $run $rm $removelist
       if $run eval "$command"; then :
       else
        test -n "$output_obj" && $run $rm $removelist

-       exit 1
+       exit $EXIT_FAILURE

       fi
 
       if test "$need_locks" = warn &&
       fi
 
       if test "$need_locks" = warn &&


@@ -722,7 +766,7 @@ avoid parallel builds (make -j) in this platform, or get a better
 compiler."
 
        $run $rm $removelist
 compiler."
 
        $run $rm $removelist

-       exit 1
+       exit $EXIT_FAILURE

       fi
 
       # Just move the object if needed, then go on to compile the next one
       fi
 
       # Just move the object if needed, then go on to compile the next one


@@ -774,7 +818,7 @@ EOF
       if $run eval "$command"; then :
       else
        $run $rm $removelist
       if $run eval "$command"; then :
       else
        $run $rm $removelist

-       exit 1
+       exit $EXIT_FAILURE

       fi
 
       if test "$need_locks" = warn &&
       fi
 
       if test "$need_locks" = warn &&


@@ -794,7 +838,7 @@ avoid parallel builds (make -j) in this platform, or get a better
 compiler."
 
        $run $rm $removelist
 compiler."
 
        $run $rm $removelist

-       exit 1
+       exit $EXIT_FAILURE

       fi
 
       # Just move the object if needed
       fi
 
       # Just move the object if needed


@@ -832,7 +876,7 @@ EOF
       $run $rm "$lockfile"
     fi
 
       $run $rm "$lockfile"
     fi
 

-    exit 0
+    exit $EXIT_SUCCESS

     ;;
 
   # libtool link mode
     ;;
 
   # libtool link mode


@@ -858,7 +902,7 @@ EOF
       ;;
     esac
     libtool_args="$nonopt"
       ;;
     esac
     libtool_args="$nonopt"

-    base_compile="$nonopt"
+    base_compile="$nonopt $@"

     compile_command="$nonopt"
     finalize_command="$nonopt"
 
     compile_command="$nonopt"
     finalize_command="$nonopt"
 


@@ -890,6 +934,7 @@ EOF
     no_install=no
     objs=
     non_pic_objects=
     no_install=no
     objs=
     non_pic_objects=

+    precious_files_regex=

     prefer_static_libs=no
     preload=no
     prev=
     prefer_static_libs=no
     preload=no
     prev=


@@ -903,46 +948,7 @@ EOF
     vinfo=
     vinfo_number=no
 
     vinfo=
     vinfo_number=no
 

-    # Infer tagged configuration to use if any are available and
-    # if one wasn't chosen via the "--tag" command line option.
-    # Only attempt this if the compiler in the base link
-    # command doesn't match the default compiler.
-    if test -n "$available_tags" && test -z "$tagname"; then
-      case "$base_compile " in
-      # Blanks in the command may have been stripped by the calling shell,
-      # but not from the CC environment variable when configure was run.
-      "$CC "* | " $CC "* | "`$echo $CC` "* | " `$echo $CC` "*) ;;
-      # Blanks at the start of $base_compile will cause this to fail
-      # if we don't check for them as well.
-      *)
-       for z in $available_tags; do
-         if grep "^# ### BEGIN LIBTOOL TAG CONFIG: $z$" < "$0" > /dev/null; then
-           # Evaluate the configuration.
-           eval "`${SED} -n -e '/^# ### BEGIN LIBTOOL TAG CONFIG: '$z'$/,/^# ### END LIBTOOL TAG CONFIG: '$z'$/p' < $0`"
-           case "$base_compile " in
-           "$CC "* | " $CC "* | "`$echo $CC` "* | " `$echo $CC` "*)
-             # The compiler in $compile_command matches
-             # the one in the tagged configuration.
-             # Assume this is the tagged configuration we want.
-             tagname=$z
-             break
-             ;;
-           esac
-         fi
-       done
-       # If $tagname still isn't set, then no tagged configuration
-       # was found and let the user know that the "--tag" command
-       # line option must be used.
-       if test -z "$tagname"; then
-         $echo "$modename: unable to infer tagged configuration"
-         $echo "$modename: specify a tag with \`--tag'" 1>&2
-         exit 1
-#       else
-#         $echo "$modename: using $tagname tagged configuration"
-       fi
-       ;;
-      esac
-    fi
+    func_infer_tag $base_compile

 
     # We need to know -static, to get the right output filenames.
     for arg
 
     # We need to know -static, to get the right output filenames.
     for arg


@@ -975,7 +981,6 @@ EOF
     # Go through the arguments, transforming them on the way.
     while test "$#" -gt 0; do
       arg="$1"
     # Go through the arguments, transforming them on the way.
     while test "$#" -gt 0; do
       arg="$1"

-      base_compile="$base_compile $arg"

       shift
       case $arg in
       *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \    ]*|*]*|"")
       shift
       case $arg in
       *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \    ]*|*]*|"")


@@ -1039,7 +1044,7 @@ EOF
          export_symbols="$arg"
          if test ! -f "$arg"; then
            $echo "$modename: symbol file \`$arg' does not exist"
          export_symbols="$arg"
          if test ! -f "$arg"; then
            $echo "$modename: symbol file \`$arg' does not exist"

-           exit 1
+           exit $EXIT_FAILURE

          fi
          prev=
          continue
          fi
          prev=
          continue


@@ -1054,6 +1059,11 @@ EOF
          prev=
          continue
          ;;
          prev=
          continue
          ;;

+       precious_regex)
+         precious_files_regex="$arg"
+         prev=
+         continue
+         ;;

        release)
          release="-$arg"
          prev=
        release)
          release="-$arg"
          prev=


@@ -1086,7 +1096,7 @@ EOF
                   test "$pic_object" = none && \
                   test "$non_pic_object" = none; then
                  $echo "$modename: cannot find name of object for \`$arg'" 1>&2
                   test "$pic_object" = none && \
                   test "$non_pic_object" = none; then
                  $echo "$modename: cannot find name of object for \`$arg'" 1>&2

-                 exit 1
+                 exit $EXIT_FAILURE

                fi
 
                # Extract subdirectory from the argument.
                fi
 
                # Extract subdirectory from the argument.


@@ -1139,7 +1149,7 @@ EOF
                # Only an error if not doing a dry-run.
                if test -z "$run"; then
                  $echo "$modename: \`$arg' is not a valid libtool object" 1>&2
                # Only an error if not doing a dry-run.
                if test -z "$run"; then
                  $echo "$modename: \`$arg' is not a valid libtool object" 1>&2

-                 exit 1
+                 exit $EXIT_FAILURE

                else
                  # Dry-run case.
 
                else
                  # Dry-run case.
 


@@ -1160,7 +1170,7 @@ EOF
            done
          else
            $echo "$modename: link input file \`$save_arg' does not exist"
            done
          else
            $echo "$modename: link input file \`$save_arg' does not exist"

-           exit 1
+           exit $EXIT_FAILURE

          fi
          arg=$save_arg
          prev=
          fi
          arg=$save_arg
          prev=


@@ -1172,7 +1182,7 @@ EOF
          [\\/]* | [A-Za-z]:[\\/]*) ;;
          *)
            $echo "$modename: only absolute run-paths are allowed" 1>&2
          [\\/]* | [A-Za-z]:[\\/]*) ;;
          *)
            $echo "$modename: only absolute run-paths are allowed" 1>&2

-           exit 1
+           exit $EXIT_FAILURE

            ;;
          esac
          if test "$prev" = rpath; then
            ;;
          esac
          if test "$prev" = rpath; then


@@ -1212,6 +1222,11 @@ EOF
          finalize_command="$finalize_command $qarg"
          continue
          ;;
          finalize_command="$finalize_command $qarg"
          continue
          ;;

+       shrext)
+         shrext_cmds="$arg"
+         prev=
+         continue
+         ;;

        *)
          eval "$prev=\"\$arg\""
          prev=
        *)
          eval "$prev=\"\$arg\""
          prev=


@@ -1260,7 +1275,7 @@ EOF
       -export-symbols | -export-symbols-regex)
        if test -n "$export_symbols" || test -n "$export_symbols_regex"; then
          $echo "$modename: more than one -exported-symbols argument is not allowed"
       -export-symbols | -export-symbols-regex)
        if test -n "$export_symbols" || test -n "$export_symbols_regex"; then
          $echo "$modename: more than one -exported-symbols argument is not allowed"

-         exit 1
+         exit $EXIT_FAILURE

        fi
        if test "X$arg" = "X-export-symbols"; then
          prev=expsyms
        fi
        if test "X$arg" = "X-export-symbols"; then
          prev=expsyms


@@ -1296,7 +1311,7 @@ EOF
          absdir=`cd "$dir" && pwd`
          if test -z "$absdir"; then
            $echo "$modename: cannot determine absolute directory name of \`$dir'" 1>&2
          absdir=`cd "$dir" && pwd`
          if test -z "$absdir"; then
            $echo "$modename: cannot determine absolute directory name of \`$dir'" 1>&2

-           exit 1
+           exit $EXIT_FAILURE

          fi
          dir="$absdir"
          ;;
          fi
          dir="$absdir"
          ;;


@@ -1420,6 +1435,11 @@ EOF
 
       -o) prev=output ;;
 
 
       -o) prev=output ;;
 

+      -precious-files-regex)
+       prev=precious_regex
+       continue
+       ;;
+

       -release)
        prev=release
        continue
       -release)
        prev=release
        continue


@@ -1442,7 +1462,7 @@ EOF
        [\\/]* | [A-Za-z]:[\\/]*) ;;
        *)
          $echo "$modename: only absolute run-paths are allowed" 1>&2
        [\\/]* | [A-Za-z]:[\\/]*) ;;
        *)
          $echo "$modename: only absolute run-paths are allowed" 1>&2

-         exit 1
+         exit $EXIT_FAILURE

          ;;
        esac
        case "$xrpath " in
          ;;
        esac
        case "$xrpath " in


@@ -1565,7 +1585,7 @@ EOF
             test "$pic_object" = none && \
             test "$non_pic_object" = none; then
            $echo "$modename: cannot find name of object for \`$arg'" 1>&2
             test "$pic_object" = none && \
             test "$non_pic_object" = none; then
            $echo "$modename: cannot find name of object for \`$arg'" 1>&2

-           exit 1
+           exit $EXIT_FAILURE

          fi
 
          # Extract subdirectory from the argument.
          fi
 
          # Extract subdirectory from the argument.


@@ -1618,7 +1638,7 @@ EOF
          # Only an error if not doing a dry-run.
          if test -z "$run"; then
            $echo "$modename: \`$arg' is not a valid libtool object" 1>&2
          # Only an error if not doing a dry-run.
          if test -z "$run"; then
            $echo "$modename: \`$arg' is not a valid libtool object" 1>&2

-           exit 1
+           exit $EXIT_FAILURE

          else
            # Dry-run case.
 
          else
            # Dry-run case.
 


@@ -1685,7 +1705,7 @@ EOF
     if test -n "$prev"; then
       $echo "$modename: the \`$prevarg' option requires an argument" 1>&2
       $echo "$help" 1>&2
     if test -n "$prev"; then
       $echo "$modename: the \`$prevarg' option requires an argument" 1>&2
       $echo "$help" 1>&2

-      exit 1
+      exit $EXIT_FAILURE

     fi
 
     if test "$export_dynamic" = yes && test -n "$export_dynamic_flag_spec"; then
     fi
 
     if test "$export_dynamic" = yes && test -n "$export_dynamic_flag_spec"; then


@@ -1729,7 +1749,7 @@ EOF
     "")
       $echo "$modename: you must specify an output file" 1>&2
       $echo "$help" 1>&2
     "")
       $echo "$modename: you must specify an output file" 1>&2
       $echo "$help" 1>&2

-      exit 1
+      exit $EXIT_FAILURE

       ;;
     *.$libext) linkmode=oldlib ;;
     *.lo | *.$objext) linkmode=obj ;;
       ;;
     *.$libext) linkmode=oldlib ;;
     *.lo | *.$objext) linkmode=obj ;;


@@ -1739,7 +1759,7 @@ EOF
 
     case $host in
     *cygwin* | *mingw* | *pw32*)
 
     case $host in
     *cygwin* | *mingw* | *pw32*)

-      # don't eliminate duplcations in $postdeps and $predeps
+      # don't eliminate duplications in $postdeps and $predeps

       duplicate_compiler_generated_deps=yes
       ;;
     *)
       duplicate_compiler_generated_deps=yes
       ;;
     *)


@@ -1792,7 +1812,7 @@ EOF
          *.la) ;;
          *)
            $echo "$modename: libraries can \`-dlopen' only libtool libraries: $file" 1>&2
          *.la) ;;
          *)
            $echo "$modename: libraries can \`-dlopen' only libtool libraries: $file" 1>&2

-           exit 1
+           exit $EXIT_FAILURE

            ;;
          esac
        done
            ;;
          esac
        done


@@ -1818,7 +1838,10 @@ EOF
        case $pass in
        dlopen) libs="$dlfiles" ;;
        dlpreopen) libs="$dlprefiles" ;;
        case $pass in
        dlopen) libs="$dlfiles" ;;
        dlpreopen) libs="$dlprefiles" ;;

-       link) libs="$deplibs %DEPLIBS% $dependency_libs" ;;
+       link)
+         libs="$deplibs %DEPLIBS%"
+         test "X$link_all_deplibs" != Xno && libs="$libs $dependency_libs"
+         ;;

        esac
       fi
       if test "$pass" = dlopen; then
        esac
       fi
       if test "$pass" = dlopen; then


@@ -1850,7 +1873,7 @@ EOF
          fi
          name=`$echo "X$deplib" | $Xsed -e 's/^-l//'`
          for searchdir in $newlib_search_path $lib_search_path $sys_lib_search_path $shlib_search_path; do
          fi
          name=`$echo "X$deplib" | $Xsed -e 's/^-l//'`
          for searchdir in $newlib_search_path $lib_search_path $sys_lib_search_path $shlib_search_path; do

-           for search_ext in .la $shrext .so .a; do
+           for search_ext in .la $std_shrext .so .a; do

              # Search the libtool library
              lib="$searchdir/lib${name}${search_ext}"
              if test -f "$lib"; then
              # Search the libtool library
              lib="$searchdir/lib${name}${search_ext}"
              if test -f "$lib"; then


@@ -1926,11 +1949,11 @@ EOF
            fi
            if test "$pass" = scan; then
              deplibs="$deplib $deplibs"
            fi
            if test "$pass" = scan; then
              deplibs="$deplib $deplibs"

-             newlib_search_path="$newlib_search_path "`$echo "X$deplib" | $Xsed -e 's/^-L//'`

            else
              compile_deplibs="$deplib $compile_deplibs"
              finalize_deplibs="$deplib $finalize_deplibs"
            fi
            else
              compile_deplibs="$deplib $compile_deplibs"
              finalize_deplibs="$deplib $finalize_deplibs"
            fi

+           newlib_search_path="$newlib_search_path "`$echo "X$deplib" | $Xsed -e 's/^-L//'`

            ;;
          *)
            $echo "$modename: warning: \`-L' is ignored for archives/objects" 1>&2
            ;;
          *)
            $echo "$modename: warning: \`-L' is ignored for archives/objects" 1>&2


@@ -2009,14 +2032,14 @@ EOF
        if test "$found" = yes || test -f "$lib"; then :
        else
          $echo "$modename: cannot find the library \`$lib'" 1>&2
        if test "$found" = yes || test -f "$lib"; then :
        else
          $echo "$modename: cannot find the library \`$lib'" 1>&2

-         exit 1
+         exit $EXIT_FAILURE

        fi
 
        # Check to see that this really is a libtool archive.
        if (${SED} -e '2q' $lib | grep "^# Generated by .*$PACKAGE") >/dev/null 2>&1; then :
        else
          $echo "$modename: \`$lib' is not a valid libtool archive" 1>&2
        fi
 
        # Check to see that this really is a libtool archive.
        if (${SED} -e '2q' $lib | grep "^# Generated by .*$PACKAGE") >/dev/null 2>&1; then :
        else
          $echo "$modename: \`$lib' is not a valid libtool archive" 1>&2

-         exit 1
+         exit $EXIT_FAILURE

        fi
 
        ladir=`$echo "X$lib" | $Xsed -e 's%/[^/]*$%%'`
        fi
 
        ladir=`$echo "X$lib" | $Xsed -e 's%/[^/]*$%%'`


@@ -2052,7 +2075,7 @@ EOF
          if test -z "$libdir"; then
            if test -z "$old_library"; then
              $echo "$modename: cannot find name of link library for \`$lib'" 1>&2
          if test -z "$libdir"; then
            if test -z "$old_library"; then
              $echo "$modename: cannot find name of link library for \`$lib'" 1>&2

-             exit 1
+             exit $EXIT_FAILURE

            fi
            # It is a libtool convenience library, so add in its objects.
            convenience="$convenience $ladir/$objdir/$old_library"
            fi
            # It is a libtool convenience library, so add in its objects.
            convenience="$convenience $ladir/$objdir/$old_library"


@@ -2069,12 +2092,12 @@ EOF
            done
          elif test "$linkmode" != prog && test "$linkmode" != lib; then
            $echo "$modename: \`$lib' is not a convenience library" 1>&2
            done
          elif test "$linkmode" != prog && test "$linkmode" != lib; then
            $echo "$modename: \`$lib' is not a convenience library" 1>&2

-           exit 1
+           exit $EXIT_FAILURE

          fi
          continue
        fi # $pass = conv
 
          fi
          continue
        fi # $pass = conv
 

-    
+

        # Get the name of the library we link against.
        linklib=
        for l in $old_library $library_names; do
        # Get the name of the library we link against.
        linklib=
        for l in $old_library $library_names; do


@@ -2082,16 +2105,18 @@ EOF
        done
        if test -z "$linklib"; then
          $echo "$modename: cannot find name of link library for \`$lib'" 1>&2
        done
        if test -z "$linklib"; then
          $echo "$modename: cannot find name of link library for \`$lib'" 1>&2

-         exit 1
+         exit $EXIT_FAILURE

        fi
 
        # This library was specified with -dlopen.
        if test "$pass" = dlopen; then
          if test -z "$libdir"; then
            $echo "$modename: cannot -dlopen a convenience library: \`$lib'" 1>&2
        fi
 
        # This library was specified with -dlopen.
        if test "$pass" = dlopen; then
          if test -z "$libdir"; then
            $echo "$modename: cannot -dlopen a convenience library: \`$lib'" 1>&2

-           exit 1
+           exit $EXIT_FAILURE

          fi
          fi

-         if test -z "$dlname" || test "$dlopen_support" != yes || test "$build_libtool_libs" = no; then
+         if test -z "$dlname" ||
+            test "$dlopen_support" != yes ||
+            test "$build_libtool_libs" = no; then

            # If there is no dlname, no dlopen support or we're linking
            # statically, we need to preload.  We also need to preload any
            # dependent libraries so libltdl's deplib preloader doesn't
            # If there is no dlname, no dlopen support or we're linking
            # statically, we need to preload.  We also need to preload any
            # dependent libraries so libltdl's deplib preloader doesn't


@@ -2140,7 +2165,7 @@ EOF
        if test "$pass" = dlpreopen; then
          if test -z "$libdir"; then
            $echo "$modename: cannot -dlpreopen a convenience library: \`$lib'" 1>&2
        if test "$pass" = dlpreopen; then
          if test -z "$libdir"; then
            $echo "$modename: cannot -dlpreopen a convenience library: \`$lib'" 1>&2

-           exit 1
+           exit $EXIT_FAILURE

          fi
          # Prefer using a static library (so that no silly _DYNAMIC symbols
          # are required to link).
          fi
          # Prefer using a static library (so that no silly _DYNAMIC symbols
          # are required to link).


@@ -2167,7 +2192,7 @@ EOF
          continue
        fi
 
          continue
        fi
 

-    
+

        if test "$linkmode" = prog && test "$pass" != link; then
          newlib_search_path="$newlib_search_path $ladir"
          deplibs="$lib $deplibs"
        if test "$linkmode" = prog && test "$pass" != link; then
          newlib_search_path="$newlib_search_path $ladir"
          deplibs="$lib $deplibs"


@@ -2254,17 +2279,18 @@ EOF
            need_relink=yes
          fi
          # This is a shared library
            need_relink=yes
          fi
          # This is a shared library

-       
-      # Warn about portability, can't link against -module's on some systems (darwin)
-      if test "$shouldnotlink" = yes && test "$pass" = link ; then
+
+         # Warn about portability, can't link against -module's on
+         # some systems (darwin)
+         if test "$shouldnotlink" = yes && test "$pass" = link ; then

            $echo
            if test "$linkmode" = prog; then
              $echo "*** Warning: Linking the executable $output against the loadable module"
            else
              $echo "*** Warning: Linking the shared library $output against the loadable module"
            fi
            $echo
            if test "$linkmode" = prog; then
              $echo "*** Warning: Linking the executable $output against the loadable module"
            else
              $echo "*** Warning: Linking the shared library $output against the loadable module"
            fi

-           $echo "*** $linklib is not portable!"    
-      fi         
+           $echo "*** $linklib is not portable!"
+         fi

          if test "$linkmode" = lib &&
             test "$hardcode_into_libs" = yes; then
            # Hardcode the library path.
          if test "$linkmode" = lib &&
             test "$hardcode_into_libs" = yes; then
            # Hardcode the library path.


@@ -2322,9 +2348,10 @@ EOF
            else
              $show "extracting exported symbol list from \`$soname'"
              save_ifs="$IFS"; IFS='~'
            else
              $show "extracting exported symbol list from \`$soname'"
              save_ifs="$IFS"; IFS='~'

-             eval cmds=\"$extract_expsyms_cmds\"
+             cmds=$extract_expsyms_cmds

              for cmd in $cmds; do
                IFS="$save_ifs"
              for cmd in $cmds; do
                IFS="$save_ifs"

+               eval cmd=\"$cmd\"

                $show "$cmd"
                $run eval "$cmd" || exit $?
              done
                $show "$cmd"
                $run eval "$cmd" || exit $?
              done


@@ -2335,9 +2362,10 @@ EOF
            if test -f "$output_objdir/$newlib"; then :; else
              $show "generating import library for \`$soname'"
              save_ifs="$IFS"; IFS='~'
            if test -f "$output_objdir/$newlib"; then :; else
              $show "generating import library for \`$soname'"
              save_ifs="$IFS"; IFS='~'

-             eval cmds=\"$old_archive_from_expsyms_cmds\"
+             cmds=$old_archive_from_expsyms_cmds

              for cmd in $cmds; do
                IFS="$save_ifs"
              for cmd in $cmds; do
                IFS="$save_ifs"

+               eval cmd=\"$cmd\"

                $show "$cmd"
                $run eval "$cmd" || exit $?
              done
                $show "$cmd"
                $run eval "$cmd" || exit $?
              done


@@ -2360,9 +2388,9 @@ EOF
                case $host in
                  *-*-sco3.2v5* ) add_dir="-L$dir" ;;
                  *-*-darwin* )
                case $host in
                  *-*-sco3.2v5* ) add_dir="-L$dir" ;;
                  *-*-darwin* )

-                   # if the lib is a module then we can not link against it, someone
-                   # is ignoring the new warnings I added
-                   if /usr/bin/file -L $add 2> /dev/null | grep "bundle" >/dev/null ; then
+                   # if the lib is a module then we can not link against
+                   # it, someone is ignoring the new warnings I added
+                   if /usr/bin/file -L $add 2> /dev/null | $EGREP "bundle" >/dev/null ; then

                      $echo "** Warning, lib $linklib is a module, not a shared library"
                      if test -z "$old_library" ; then
                        $echo
                      $echo "** Warning, lib $linklib is a module, not a shared library"
                      if test -z "$old_library" ; then
                        $echo


@@ -2370,7 +2398,7 @@ EOF
                        $echo "** The link will probably fail, sorry"
                      else
                        add="$dir/$old_library"
                        $echo "** The link will probably fail, sorry"
                      else
                        add="$dir/$old_library"

-                     fi 
+                     fi

                    fi
                esac
              elif test "$hardcode_minus_L" = no; then
                    fi
                esac
              elif test "$hardcode_minus_L" = no; then


@@ -2412,7 +2440,7 @@ EOF
 
            if test "$lib_linked" != yes; then
              $echo "$modename: configuration error: unsupported hardcode properties"
 
            if test "$lib_linked" != yes; then
              $echo "$modename: configuration error: unsupported hardcode properties"

-             exit 1
+             exit $EXIT_FAILURE

            fi
 
            if test -n "$add_shlibpath"; then
            fi
 
            if test -n "$add_shlibpath"; then


@@ -2455,7 +2483,8 @@ EOF
              esac
              add="-l$name"
            elif test "$hardcode_automatic" = yes; then
              esac
              add="-l$name"
            elif test "$hardcode_automatic" = yes; then

-             if test -n "$inst_prefix_dir" && test -f "$inst_prefix_dir$libdir/$linklib" ; then
+             if test -n "$inst_prefix_dir" &&
+                test -f "$inst_prefix_dir$libdir/$linklib" ; then

                add="$inst_prefix_dir$libdir/$linklib"
              else
                add="$libdir/$linklib"
                add="$inst_prefix_dir$libdir/$linklib"
              else
                add="$libdir/$linklib"


@@ -2535,7 +2564,8 @@ EOF
 
        if test "$linkmode" = lib; then
          if test -n "$dependency_libs" &&
 
        if test "$linkmode" = lib; then
          if test -n "$dependency_libs" &&

-            { test "$hardcode_into_libs" != yes || test "$build_old_libs" = yes ||
+            { test "$hardcode_into_libs" != yes ||
+              test "$build_old_libs" = yes ||

               test "$link_static" = yes; }; then
            # Extract -R from dependency_libs
            temp_deplibs=
               test "$link_static" = yes; }; then
            # Extract -R from dependency_libs
            temp_deplibs=


@@ -2592,7 +2622,7 @@ EOF
                  eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $deplib`
                  if test -z "$libdir"; then
                    $echo "$modename: \`$deplib' is not a valid libtool archive" 1>&2
                  eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $deplib`
                  if test -z "$libdir"; then
                    $echo "$modename: \`$deplib' is not a valid libtool archive" 1>&2

-                   exit 1
+                   exit $EXIT_FAILURE

                  fi
                  if test "$absdir" != "$libdir"; then
                    $echo "$modename: warning: \`$deplib' seems to be moved" 1>&2
                  fi
                  if test "$absdir" != "$libdir"; then
                    $echo "$modename: warning: \`$deplib' seems to be moved" 1>&2


@@ -2602,7 +2632,8 @@ EOF
                depdepl=
                case $host in
                *-*-darwin*)
                depdepl=
                case $host in
                *-*-darwin*)

-                 # we do not want to link against static libs, but need to link against shared
+                 # we do not want to link against static libs,
+                 # but need to link against shared

                  eval deplibrary_names=`${SED} -n -e 's/^library_names=\(.*\)$/\1/p' $deplib`
                  if test -n "$deplibrary_names" ; then
                    for tmp in $deplibrary_names ; do
                  eval deplibrary_names=`${SED} -n -e 's/^library_names=\(.*\)$/\1/p' $deplib`
                  if test -n "$deplibrary_names" ; then
                    for tmp in $deplibrary_names ; do


@@ -2610,43 +2641,42 @@ EOF
                    done
                    if test -f "$path/$depdepl" ; then
                      depdepl="$path/$depdepl"
                    done
                    if test -f "$path/$depdepl" ; then
                      depdepl="$path/$depdepl"

-                  fi
+                   fi

                    # do not add paths which are already there
                    case " $newlib_search_path " in
                    *" $path "*) ;;
                    *) newlib_search_path="$newlib_search_path $path";;
                    esac
                    # do not add paths which are already there
                    case " $newlib_search_path " in
                    *" $path "*) ;;
                    *) newlib_search_path="$newlib_search_path $path";;
                    esac

-                   path=""

                  fi
                  fi

+                 path=""

                  ;;
                *)
                  ;;
                *)

-               path="-L$path"
-               ;;
-               esac 
-               
+                 path="-L$path"
+                 ;;
+               esac

                ;;
                ;;

-                 -l*)
+             -l*)

                case $host in
                *-*-darwin*)
                case $host in
                *-*-darwin*)

-                # Again, we only want to link against shared libraries
-                eval tmp_libs=`$echo "X$deplib" | $Xsed -e "s,^\-l,,"`
-                for tmp in $newlib_search_path ; do
-                    if test -f "$tmp/lib$tmp_libs.dylib" ; then
-                      eval depdepl="$tmp/lib$tmp_libs.dylib"
-                      break
-                    fi  
-         done
-         path=""
+                 # Again, we only want to link against shared libraries
+                 eval tmp_libs=`$echo "X$deplib" | $Xsed -e "s,^\-l,,"`
+                 for tmp in $newlib_search_path ; do
+                   if test -f "$tmp/lib$tmp_libs.dylib" ; then
+                     eval depdepl="$tmp/lib$tmp_libs.dylib"
+                     break
+                   fi
+                 done
+                 path=""

                  ;;
                *) continue ;;
                  ;;
                *) continue ;;

-               esac              
+               esac

                ;;
              *) continue ;;
              esac
              case " $deplibs " in
              *" $depdepl "*) ;;
                ;;
              *) continue ;;
              esac
              case " $deplibs " in
              *" $depdepl "*) ;;

-             *) deplibs="$deplibs $depdepl" ;;
-             esac            
+             *) deplibs="$depdepl $deplibs" ;;
+             esac

              case " $deplibs " in
              *" $path "*) ;;
              *) deplibs="$deplibs $path" ;;
              case " $deplibs " in
              *" $path "*) ;;
              *) deplibs="$deplibs $path" ;;


@@ -2736,7 +2766,8 @@ EOF
          eval $var=\"$tmp_libs\"
        done # for var
       fi
          eval $var=\"$tmp_libs\"
        done # for var
       fi

-      # Last step: remove runtime libs from dependency_libs (they stay in deplibs)
+      # Last step: remove runtime libs from dependency_libs
+      # (they stay in deplibs)

       tmp_libs=
       for i in $dependency_libs ; do
        case " $predeps $postdeps $compiler_lib_search_path " in
       tmp_libs=
       for i in $dependency_libs ; do
        case " $predeps $postdeps $compiler_lib_search_path " in


@@ -2796,19 +2827,19 @@ EOF
       case $outputname in
       lib*)
        name=`$echo "X$outputname" | $Xsed -e 's/\.la$//' -e 's/^lib//'`
       case $outputname in
       lib*)
        name=`$echo "X$outputname" | $Xsed -e 's/\.la$//' -e 's/^lib//'`

-       eval shared_ext=\"$shrext\"
+       eval shared_ext=\"$shrext_cmds\"

        eval libname=\"$libname_spec\"
        ;;
       *)
        if test "$module" = no; then
          $echo "$modename: libtool library \`$output' must begin with \`lib'" 1>&2
          $echo "$help" 1>&2
        eval libname=\"$libname_spec\"
        ;;
       *)
        if test "$module" = no; then
          $echo "$modename: libtool library \`$output' must begin with \`lib'" 1>&2
          $echo "$help" 1>&2

-         exit 1
+         exit $EXIT_FAILURE

        fi
        if test "$need_lib_prefix" != no; then
          # Add the "lib" prefix for modules if required
          name=`$echo "X$outputname" | $Xsed -e 's/\.la$//'`
        fi
        if test "$need_lib_prefix" != no; then
          # Add the "lib" prefix for modules if required
          name=`$echo "X$outputname" | $Xsed -e 's/\.la$//'`

-         eval shared_ext=\"$shrext\"
+         eval shared_ext=\"$shrext_cmds\"

          eval libname=\"$libname_spec\"
        else
          libname=`$echo "X$outputname" | $Xsed -e 's/\.la$//'`
          eval libname=\"$libname_spec\"
        else
          libname=`$echo "X$outputname" | $Xsed -e 's/\.la$//'`


@@ -2819,7 +2850,7 @@ EOF
       if test -n "$objs"; then
        if test "$deplibs_check_method" != pass_all; then
          $echo "$modename: cannot build libtool library \`$output' from non-libtool objects on this host:$objs" 2>&1
       if test -n "$objs"; then
        if test "$deplibs_check_method" != pass_all; then
          $echo "$modename: cannot build libtool library \`$output' from non-libtool objects on this host:$objs" 2>&1

-         exit 1
+         exit $EXIT_FAILURE

        else
          $echo
          $echo "*** Warning: Linking the shared library $output against the non-libtool"
        else
          $echo
          $echo "*** Warning: Linking the shared library $output against the non-libtool"


@@ -2867,13 +2898,13 @@ EOF
        if test -n "$8"; then
          $echo "$modename: too many parameters to \`-version-info'" 1>&2
          $echo "$help" 1>&2
        if test -n "$8"; then
          $echo "$modename: too many parameters to \`-version-info'" 1>&2
          $echo "$help" 1>&2

-         exit 1
+         exit $EXIT_FAILURE

        fi
 
        # convert absolute version numbers to libtool ages
        # this retains compatibility with .la files and attempts
        # to make the code below a bit more comprehensible
        fi
 
        # convert absolute version numbers to libtool ages
        # this retains compatibility with .la files and attempts
        # to make the code below a bit more comprehensible

-       
+

        case $vinfo_number in
        yes)
          number_major="$2"
        case $vinfo_number in
        yes)
          number_major="$2"


@@ -2917,7 +2948,7 @@ EOF
        *)
          $echo "$modename: CURRENT \`$current' is not a nonnegative integer" 1>&2
          $echo "$modename: \`$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
+         exit $EXIT_FAILURE

          ;;
        esac
 
          ;;
        esac
 


@@ -2926,7 +2957,7 @@ EOF
        *)
          $echo "$modename: REVISION \`$revision' is not a nonnegative integer" 1>&2
          $echo "$modename: \`$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
+         exit $EXIT_FAILURE

          ;;
        esac
 
          ;;
        esac
 


@@ -2935,14 +2966,14 @@ EOF
        *)
          $echo "$modename: AGE \`$age' is not a nonnegative integer" 1>&2
          $echo "$modename: \`$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
+         exit $EXIT_FAILURE

          ;;
        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
          ;;
        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

-         exit 1
+         exit $EXIT_FAILURE

        fi
 
        # Calculate the version variables.
        fi
 
        # Calculate the version variables.


@@ -3031,7 +3062,7 @@ EOF
        *)
          $echo "$modename: unknown library version type \`$version_type'" 1>&2
          $echo "Fatal configuration error.  See the $PACKAGE docs for more information." 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
+         exit $EXIT_FAILURE

          ;;
        esac
 
          ;;
        esac
 


@@ -3085,6 +3116,12 @@ EOF
            *.$objext)
               ;;
            $output_objdir/$outputname | $output_objdir/$libname.* | $output_objdir/${libname}${release}.*)
            *.$objext)
               ;;
            $output_objdir/$outputname | $output_objdir/$libname.* | $output_objdir/${libname}${release}.*)

+              if test "X$precious_files_regex" != "X"; then
+                if echo $p | $EGREP -e "$precious_files_regex" >/dev/null 2>&1
+                then
+                  continue
+                fi
+              fi

               removelist="$removelist $p"
               ;;
            *) ;;
               removelist="$removelist $p"
               ;;
            *) ;;


@@ -3564,7 +3601,7 @@ EOF
        fi
 
        # Get the real and link names of the library.
        fi
 
        # Get the real and link names of the library.

-       eval shared_ext=\"$shrext\"
+       eval shared_ext=\"$shrext_cmds\"

        eval library_names=\"$library_names_spec\"
        set dummy $library_names
        realname="$2"
        eval library_names=\"$library_names_spec\"
        set dummy $library_names
        realname="$2"


@@ -3594,10 +3631,11 @@ EOF
            $show "generating symbol list for \`$libname.la'"
            export_symbols="$output_objdir/$libname.exp"
            $run $rm $export_symbols
            $show "generating symbol list for \`$libname.la'"
            export_symbols="$output_objdir/$libname.exp"
            $run $rm $export_symbols

-           eval cmds=\"$export_symbols_cmds\"
+           cmds=$export_symbols_cmds

            save_ifs="$IFS"; IFS='~'
            for cmd in $cmds; do
              IFS="$save_ifs"
            save_ifs="$IFS"; IFS='~'
            for cmd in $cmds; do
              IFS="$save_ifs"

+             eval cmd=\"$cmd\"

              if len=`expr "X$cmd" : ".*"` &&
               test "$len" -le "$max_cmd_len" || test "$max_cmd_len" -le -1; then
                $show "$cmd"
              if len=`expr "X$cmd" : ".*"` &&
               test "$len" -le "$max_cmd_len" || test "$max_cmd_len" -le -1; then
                $show "$cmd"


@@ -3627,12 +3665,12 @@ EOF
        for test_deplib in $deplibs; do
                case " $convenience " in
                *" $test_deplib "*) ;;
        for test_deplib in $deplibs; do
                case " $convenience " in
                *" $test_deplib "*) ;;

-               *) 
+               *)

                        tmp_deplibs="$tmp_deplibs $test_deplib"
                        ;;
                esac
        done
                        tmp_deplibs="$tmp_deplibs $test_deplib"
                        ;;
                esac
        done

-       deplibs="$tmp_deplibs" 
+       deplibs="$tmp_deplibs"

 
        if test -n "$convenience"; then
          if test -n "$whole_archive_flag_spec"; then
 
        if test -n "$convenience"; then
          if test -n "$whole_archive_flag_spec"; then


@@ -3714,19 +3752,23 @@ EOF
        # Do each of the archive commands.
        if test "$module" = yes && test -n "$module_cmds" ; then
          if test -n "$export_symbols" && test -n "$module_expsym_cmds"; then
        # Do each of the archive commands.
        if test "$module" = yes && test -n "$module_cmds" ; then
          if test -n "$export_symbols" && test -n "$module_expsym_cmds"; then

-           eval cmds=\"$module_expsym_cmds\"
+           eval test_cmds=\"$module_expsym_cmds\"
+           cmds=$module_expsym_cmds

          else
          else

-           eval cmds=\"$module_cmds\"
+           eval test_cmds=\"$module_cmds\"
+           cmds=$module_cmds

          fi
        else
        if test -n "$export_symbols" && test -n "$archive_expsym_cmds"; then
          fi
        else
        if test -n "$export_symbols" && test -n "$archive_expsym_cmds"; then

-         eval cmds=\"$archive_expsym_cmds\"
+         eval test_cmds=\"$archive_expsym_cmds\"
+         cmds=$archive_expsym_cmds

        else
        else

-         eval cmds=\"$archive_cmds\"
+         eval test_cmds=\"$archive_cmds\"
+         cmds=$archive_cmds

          fi
        fi
 
          fi
        fi
 

-       if test "X$skipped_export" != "X:" && len=`expr "X$cmds" : ".*"` &&
+       if test "X$skipped_export" != "X:" && len=`expr "X$test_cmds" : ".*"` &&

           test "$len" -le "$max_cmd_len" || test "$max_cmd_len" -le -1; then
          :
        else
           test "$len" -le "$max_cmd_len" || test "$max_cmd_len" -le -1; then
          :
        else


@@ -3827,19 +3869,28 @@ EOF
          # value of $libobjs for piecewise linking.
 
          # Do each of the archive commands.
          # value of $libobjs for piecewise linking.
 
          # Do each of the archive commands.

+         if test "$module" = yes && test -n "$module_cmds" ; then
+           if test -n "$export_symbols" && test -n "$module_expsym_cmds"; then
+             cmds=$module_expsym_cmds
+           else
+             cmds=$module_cmds
+           fi
+         else

          if test -n "$export_symbols" && test -n "$archive_expsym_cmds"; then
          if test -n "$export_symbols" && test -n "$archive_expsym_cmds"; then

-           eval cmds=\"$archive_expsym_cmds\"
+           cmds=$archive_expsym_cmds

          else
          else

-           eval cmds=\"$archive_cmds\"
+           cmds=$archive_cmds
+           fi

          fi
 
          # Append the command to remove the reloadable object files
          # to the just-reset $cmds.
          fi
 
          # Append the command to remove the reloadable object files
          # to the just-reset $cmds.

-         eval cmds=\"\$cmds~$rm $delfiles\"
+         eval cmds=\"\$cmds~\$rm $delfiles\"

        fi
        save_ifs="$IFS"; IFS='~'
        for cmd in $cmds; do
          IFS="$save_ifs"
        fi
        save_ifs="$IFS"; IFS='~'
        for cmd in $cmds; do
          IFS="$save_ifs"

+         eval cmd=\"$cmd\"

          $show "$cmd"
          $run eval "$cmd" || exit $?
        done
          $show "$cmd"
          $run eval "$cmd" || exit $?
        done


@@ -3848,7 +3899,7 @@ EOF
        # Restore the uninstalled library and exit
        if test "$mode" = relink; then
          $run eval '(cd $output_objdir && $rm ${realname}T && $mv $realname ${realname}T && $mv "$realname"U $realname)' || exit $?
        # Restore the uninstalled library and exit
        if test "$mode" = relink; then
          $run eval '(cd $output_objdir && $rm ${realname}T && $mv $realname ${realname}T && $mv "$realname"U $realname)' || exit $?

-         exit 0
+         exit $EXIT_SUCCESS

        fi
 
        # Create links to the real library.
        fi
 
        # Create links to the real library.


@@ -3896,7 +3947,7 @@ EOF
       *.lo)
        if test -n "$objs$old_deplibs"; then
          $echo "$modename: cannot build library object \`$output' from non-libtool objects" 1>&2
       *.lo)
        if test -n "$objs$old_deplibs"; then
          $echo "$modename: cannot build library object \`$output' from non-libtool objects" 1>&2

-         exit 1
+         exit $EXIT_FAILURE

        fi
        libobj="$output"
        obj=`$echo "X$output" | $Xsed -e "$lo2o"`
        fi
        libobj="$output"
        obj=`$echo "X$output" | $Xsed -e "$lo2o"`


@@ -3990,10 +4041,11 @@ EOF
       reload_objs="$objs$old_deplibs "`$echo "X$libobjs" | $SP2NL | $Xsed -e '/\.'${libext}$'/d' -e '/\.lib$/d' -e "$lo2o" | $NL2SP`" $reload_conv_objs" ### testsuite: skip nested quoting test
 
       output="$obj"
       reload_objs="$objs$old_deplibs "`$echo "X$libobjs" | $SP2NL | $Xsed -e '/\.'${libext}$'/d' -e '/\.lib$/d' -e "$lo2o" | $NL2SP`" $reload_conv_objs" ### testsuite: skip nested quoting test
 
       output="$obj"

-      eval cmds=\"$reload_cmds\"
+      cmds=$reload_cmds

       save_ifs="$IFS"; IFS='~'
       for cmd in $cmds; do
        IFS="$save_ifs"
       save_ifs="$IFS"; IFS='~'
       for cmd in $cmds; do
        IFS="$save_ifs"

+       eval cmd=\"$cmd\"

        $show "$cmd"
        $run eval "$cmd" || exit $?
       done
        $show "$cmd"
        $run eval "$cmd" || exit $?
       done


@@ -4006,7 +4058,7 @@ EOF
          $run ${rm}r $gentop
        fi
 
          $run ${rm}r $gentop
        fi
 

-       exit 0
+       exit $EXIT_SUCCESS

       fi
 
       if test "$build_libtool_libs" != yes; then
       fi
 
       if test "$build_libtool_libs" != yes; then


@@ -4019,17 +4071,18 @@ EOF
        # accidentally link it into a program.
        # $show "echo timestamp > $libobj"
        # $run eval "echo timestamp > $libobj" || exit $?
        # accidentally link it into a program.
        # $show "echo timestamp > $libobj"
        # $run eval "echo timestamp > $libobj" || exit $?

-       exit 0
+       exit $EXIT_SUCCESS

       fi
 
       if test -n "$pic_flag" || test "$pic_mode" != default; then
        # Only do commands if we really have different PIC objects.
        reload_objs="$libobjs $reload_conv_objs"
        output="$libobj"
       fi
 
       if test -n "$pic_flag" || test "$pic_mode" != default; then
        # Only do commands if we really have different PIC objects.
        reload_objs="$libobjs $reload_conv_objs"
        output="$libobj"

-       eval cmds=\"$reload_cmds\"
+       cmds=$reload_cmds

        save_ifs="$IFS"; IFS='~'
        for cmd in $cmds; do
          IFS="$save_ifs"
        save_ifs="$IFS"; IFS='~'
        for cmd in $cmds; do
          IFS="$save_ifs"

+         eval cmd=\"$cmd\"

          $show "$cmd"
          $run eval "$cmd" || exit $?
        done
          $show "$cmd"
          $run eval "$cmd" || exit $?
        done


@@ -4041,7 +4094,7 @@ EOF
        $run ${rm}r $gentop
       fi
 
        $run ${rm}r $gentop
       fi
 

-      exit 0
+      exit $EXIT_SUCCESS

       ;;
 
     prog)
       ;;
 
     prog)


@@ -4359,7 +4412,7 @@ static const void *lt_preloaded_setup() {
          ;;
        *)
          $echo "$modename: unknown suffix for \`$dlsyms'" 1>&2
          ;;
        *)
          $echo "$modename: unknown suffix for \`$dlsyms'" 1>&2

-         exit 1
+         exit $EXIT_FAILURE

          ;;
        esac
       else
          ;;
        esac
       else


@@ -4447,7 +4500,7 @@ static const void *lt_preloaded_setup() {
        # Link the executable and exit
        $show "$link_command"
        $run eval "$link_command" || exit $?
        # Link the executable and exit
        $show "$link_command"
        $run eval "$link_command" || exit $?

-       exit 0
+       exit $EXIT_SUCCESS

       fi
 
       if test "$hardcode_action" = relink; then
       fi
 
       if test "$hardcode_action" = relink; then


@@ -4502,10 +4555,10 @@ static const void *lt_preloaded_setup() {
       fi
 
       # Quote $echo for shipping.
       fi
 
       # Quote $echo for shipping.

-      if test "X$echo" = "X$SHELL $0 --fallback-echo"; then
-       case $0 in
-       [\\/]* | [A-Za-z]:[\\/]*) qecho="$SHELL $0 --fallback-echo";;
-       *) qecho="$SHELL `pwd`/$0 --fallback-echo";;
+      if test "X$echo" = "X$SHELL $progpath --fallback-echo"; then
+       case $progpath in
+       [\\/]* | [A-Za-z]:[\\/]*) qecho="$SHELL $progpath --fallback-echo";;
+       *) qecho="$SHELL `pwd`/$progpath --fallback-echo";;

        esac
        qecho=`$echo "X$qecho" | $Xsed -e "$sed_quote_subst"`
       else
        esac
        qecho=`$echo "X$qecho" | $Xsed -e "$sed_quote_subst"`
       else


@@ -4531,7 +4584,7 @@ static const void *lt_preloaded_setup() {
            cwrappersource=`$echo ${objdir}/lt-${output}.c`
            cwrapper=`$echo ${output}.exe`
            $rm $cwrappersource $cwrapper
            cwrappersource=`$echo ${objdir}/lt-${output}.c`
            cwrapper=`$echo ${output}.exe`
            $rm $cwrappersource $cwrapper

-           trap "$rm $cwrappersource $cwrapper; exit 1" 1 2 15
+           trap "$rm $cwrappersource $cwrapper; exit $EXIT_FAILURE" 1 2 15

 
            cat > $cwrappersource <<EOF
 
 
            cat > $cwrappersource <<EOF
 


@@ -4540,7 +4593,7 @@ static const void *lt_preloaded_setup() {
 
    The $output program cannot be directly executed until all the libtool
    libraries that it depends on are installed.
 
    The $output program cannot be directly executed until all the libtool
    libraries that it depends on are installed.

-   
+

    This wrapper executable should never be moved out of the build directory.
    If it is, it will not operate correctly.
 
    This wrapper executable should never be moved out of the build directory.
    If it is, it will not operate correctly.
 


@@ -4572,7 +4625,7 @@ EOF
 #if defined (_WIN32) || defined (__MSDOS__) || defined (__DJGPP__) || \
   defined (__OS2__)
 #define HAVE_DOS_BASED_FILE_SYSTEM
 #if defined (_WIN32) || defined (__MSDOS__) || defined (__DJGPP__) || \
   defined (__OS2__)
 #define HAVE_DOS_BASED_FILE_SYSTEM

-#ifndef DIR_SEPARATOR_2 
+#ifndef DIR_SEPARATOR_2

 #define DIR_SEPARATOR_2 '\\'
 #endif
 #endif
 #define DIR_SEPARATOR_2 '\\'
 #endif
 #endif


@@ -4603,7 +4656,7 @@ main (int argc, char *argv[])
 {
   char **newargz;
   int i;
 {
   char **newargz;
   int i;

-  
+

   program_name = (char *) xstrdup ((char *) basename (argv[0]));
   newargz = XMALLOC(char *, argc+2);
 EOF
   program_name = (char *) xstrdup ((char *) basename (argv[0]));
   newargz = XMALLOC(char *, argc+2);
 EOF


@@ -4616,7 +4669,7 @@ EOF
   newargz[1] = fnqualify(argv[0]);
   /* we know the script has the same name, without the .exe */
   /* so make sure newargz[1] doesn't end in .exe */
   newargz[1] = fnqualify(argv[0]);
   /* we know the script has the same name, without the .exe */
   /* so make sure newargz[1] doesn't end in .exe */

-  strendzap(newargz[1],".exe"); 
+  strendzap(newargz[1],".exe");

   for (i = 1; i < argc; i++)
     newargz[i+1] = xstrdup(argv[i]);
   newargz[argc+1] = NULL;
   for (i = 1; i < argc; i++)
     newargz[i+1] = xstrdup(argv[i]);
   newargz[argc+1] = NULL;


@@ -4639,7 +4692,7 @@ xmalloc (size_t num)
   return p;
 }
 
   return p;
 }
 

-char * 
+char *

 xstrdup (const char *string)
 {
   return string ? strcpy ((char *) xmalloc (strlen (string) + 1), string) : NULL
 xstrdup (const char *string)
 {
   return string ? strcpy ((char *) xmalloc (strlen (string) + 1), string) : NULL


@@ -4653,7 +4706,7 @@ basename (const char *name)
 
 #if defined (HAVE_DOS_BASED_FILE_SYSTEM)
   /* Skip over the disk name in MSDOS pathnames. */
 
 #if defined (HAVE_DOS_BASED_FILE_SYSTEM)
   /* Skip over the disk name in MSDOS pathnames. */

-  if (isalpha (name[0]) && name[1] == ':') 
+  if (isalpha (name[0]) && name[1] == ':')

     name += 2;
 #endif
 
     name += 2;
 #endif
 


@@ -4663,7 +4716,7 @@ basename (const char *name)
   return (char *) base;
 }
 
   return (char *) base;
 }
 

-char * 
+char *

 fnqualify(const char *path)
 {
   size_t size;
 fnqualify(const char *path)
 {
   size_t size;


@@ -4691,7 +4744,7 @@ fnqualify(const char *path)
 }
 
 char *
 }
 
 char *

-strendzap(char *str, const char *pat) 
+strendzap(char *str, const char *pat)

 {
   size_t len, patlen;
 
 {
   size_t len, patlen;
 


@@ -4711,7 +4764,7 @@ strendzap(char *str, const char *pat)
 }
 
 static void
 }
 
 static void

-lt_error_core (int exit_status, const char * mode, 
+lt_error_core (int exit_status, const char * mode,

           const char * message, va_list ap)
 {
   fprintf (stderr, "%s: %s: ", program_name, mode);
           const char * message, va_list ap)
 {
   fprintf (stderr, "%s: %s: ", program_name, mode);


@@ -4740,7 +4793,7 @@ EOF
          ;;
        esac
        $rm $output
          ;;
        esac
        $rm $output

-       trap "$rm $output; exit 1" 1 2 15
+       trap "$rm $output; exit $EXIT_FAILURE" 1 2 15

 
        $echo > $output "\
 #! $SHELL
 
        $echo > $output "\
 #! $SHELL


@@ -4840,7 +4893,7 @@ else
       else
        $echo \"\$relink_command_output\" >&2
        $rm \"\$progdir/\$file\"
       else
        $echo \"\$relink_command_output\" >&2
        $rm \"\$progdir/\$file\"

-       exit 1
+       exit $EXIT_FAILURE

       fi
     fi
 
       fi
     fi
 


@@ -4902,20 +4955,20 @@ else
        esac
        $echo >> $output "\
       \$echo \"\$0: cannot exec \$program \${1+\"\$@\"}\"
        esac
        $echo >> $output "\
       \$echo \"\$0: cannot exec \$program \${1+\"\$@\"}\"

-      exit 1
+      exit $EXIT_FAILURE

     fi
   else
     # 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
     fi
   else
     # 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

-    exit 1
+    exit $EXIT_FAILURE

   fi
 fi\
 "
        chmod +x $output
       fi
   fi
 fi\
 "
        chmod +x $output
       fi

-      exit 0
+      exit $EXIT_SUCCESS

       ;;
     esac
 
       ;;
     esac
 


@@ -5001,13 +5054,13 @@ fi\
 
       # Do each command in the archive commands.
       if test -n "$old_archive_from_new_cmds" && test "$build_libtool_libs" = yes; then
 
       # Do each command in the archive commands.
       if test -n "$old_archive_from_new_cmds" && test "$build_libtool_libs" = yes; then

-       eval cmds=\"$old_archive_from_new_cmds\"
+       cmds=$old_archive_from_new_cmds

       else
        eval cmds=\"$old_archive_cmds\"
 
        if len=`expr "X$cmds" : ".*"` &&
             test "$len" -le "$max_cmd_len" || test "$max_cmd_len" -le -1; then
       else
        eval cmds=\"$old_archive_cmds\"
 
        if len=`expr "X$cmds" : ".*"` &&
             test "$len" -le "$max_cmd_len" || test "$max_cmd_len" -le -1; then

-         :
+         cmds=$old_archive_cmds

        else
          # the command line is too long to link in one step, link in parts
          $echo "using piecewise archive linking..."
        else
          # the command line is too long to link in one step, link in parts
          $echo "using piecewise archive linking..."


@@ -5034,7 +5087,7 @@ fi\
          for obj in $save_oldobjs
          do
            last_oldobj=$obj
          for obj in $save_oldobjs
          do
            last_oldobj=$obj

-         done  
+         done

          for obj in $save_oldobjs
          do
            oldobjs="$objlist $obj"
          for obj in $save_oldobjs
          do
            oldobjs="$objlist $obj"


@@ -5048,7 +5101,7 @@ fi\
              oldobjs=$objlist
              if test "$obj" = "$last_oldobj" ; then
                RANLIB=$save_RANLIB
              oldobjs=$objlist
              if test "$obj" = "$last_oldobj" ; then
                RANLIB=$save_RANLIB

-             fi  
+             fi

              test -z "$concat_cmds" || concat_cmds=$concat_cmds~
              eval concat_cmds=\"\${concat_cmds}$old_archive_cmds\"
              objlist=
              test -z "$concat_cmds" || concat_cmds=$concat_cmds~
              eval concat_cmds=\"\${concat_cmds}$old_archive_cmds\"
              objlist=


@@ -5059,12 +5112,13 @@ fi\
          if test "X$oldobjs" = "X" ; then
            eval cmds=\"\$concat_cmds\"
          else
          if test "X$oldobjs" = "X" ; then
            eval cmds=\"\$concat_cmds\"
          else

-           eval cmds=\"\$concat_cmds~$old_archive_cmds\"
+           eval cmds=\"\$concat_cmds~\$old_archive_cmds\"

          fi
        fi
       fi
       save_ifs="$IFS"; IFS='~'
       for cmd in $cmds; do
          fi
        fi
       fi
       save_ifs="$IFS"; IFS='~'
       for cmd in $cmds; do

+        eval cmd=\"$cmd\"

        IFS="$save_ifs"
        $show "$cmd"
        $run eval "$cmd" || exit $?
        IFS="$save_ifs"
        $show "$cmd"
        $run eval "$cmd" || exit $?


@@ -5096,11 +5150,13 @@ fi\
        fi
       done
       # Quote the link command for shipping.
        fi
       done
       # Quote the link command for shipping.

-      relink_command="(cd `pwd`; $SHELL $0 $preserve_args --mode=relink $libtool_args @inst_prefix_dir@)"
+      relink_command="(cd `pwd`; $SHELL $progpath $preserve_args --mode=relink $libtool_args @inst_prefix_dir@)"

       relink_command=`$echo "X$relink_command" | $Xsed -e "$sed_quote_subst"`
       if test "$hardcode_automatic" = yes ; then
       relink_command=`$echo "X$relink_command" | $Xsed -e "$sed_quote_subst"`
       if test "$hardcode_automatic" = yes ; then

-        relink_command=
-      fi  
+       relink_command=
+      fi
+
+

       # Only create the output if not a dry run.
       if test -z "$run"; then
        for installed in no yes; do
       # Only create the output if not a dry run.
       if test -z "$run"; then
        for installed in no yes; do


@@ -5118,7 +5174,7 @@ fi\
                eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $deplib`
                if test -z "$libdir"; then
                  $echo "$modename: \`$deplib' is not a valid libtool archive" 1>&2
                eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $deplib`
                if test -z "$libdir"; then
                  $echo "$modename: \`$deplib' is not a valid libtool archive" 1>&2

-                 exit 1
+                 exit $EXIT_FAILURE

                fi
                newdependency_libs="$newdependency_libs $libdir/$name"
                ;;
                fi
                newdependency_libs="$newdependency_libs $libdir/$name"
                ;;


@@ -5132,7 +5188,7 @@ fi\
              eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $lib`
              if test -z "$libdir"; then
                $echo "$modename: \`$lib' is not a valid libtool archive" 1>&2
              eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $lib`
              if test -z "$libdir"; then
                $echo "$modename: \`$lib' is not a valid libtool archive" 1>&2

-               exit 1
+               exit $EXIT_FAILURE

              fi
              newdlfiles="$newdlfiles $libdir/$name"
            done
              fi
              newdlfiles="$newdlfiles $libdir/$name"
            done


@@ -5143,7 +5199,7 @@ fi\
              eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $lib`
              if test -z "$libdir"; then
                $echo "$modename: \`$lib' is not a valid libtool archive" 1>&2
              eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $lib`
              if test -z "$libdir"; then
                $echo "$modename: \`$lib' is not a valid libtool archive" 1>&2

-               exit 1
+               exit $EXIT_FAILURE

              fi
              newdlprefiles="$newdlprefiles $libdir/$name"
            done
              fi
              newdlprefiles="$newdlprefiles $libdir/$name"
            done


@@ -5151,7 +5207,7 @@ fi\
          else
            newdlfiles=
            for lib in $dlfiles; do
          else
            newdlfiles=
            for lib in $dlfiles; do

-             case $lib in 
+             case $lib in

                [\\/]* | [A-Za-z]:[\\/]*) abs="$lib" ;;
                *) abs=`pwd`"/$lib" ;;
              esac
                [\\/]* | [A-Za-z]:[\\/]*) abs="$lib" ;;
                *) abs=`pwd`"/$lib" ;;
              esac


@@ -5160,7 +5216,7 @@ fi\
            dlfiles="$newdlfiles"
            newdlprefiles=
            for lib in $dlprefiles; do
            dlfiles="$newdlfiles"
            newdlprefiles=
            for lib in $dlprefiles; do

-             case $lib in 
+             case $lib in

                [\\/]* | [A-Za-z]:[\\/]*) abs="$lib" ;;
                *) abs=`pwd`"/$lib" ;;
              esac
                [\\/]* | [A-Za-z]:[\\/]*) abs="$lib" ;;
                *) abs=`pwd`"/$lib" ;;
              esac


@@ -5223,7 +5279,7 @@ relink_command=\"$relink_command\""
       $run eval '(cd $output_objdir && $rm $outputname && $LN_S ../$outputname $outputname)' || exit $?
       ;;
     esac
       $run eval '(cd $output_objdir && $rm $outputname && $LN_S ../$outputname $outputname)' || exit $?
       ;;
     esac

-    exit 0
+    exit $EXIT_SUCCESS

     ;;
 
   # libtool install mode
     ;;
 
   # libtool install mode


@@ -5312,13 +5368,13 @@ relink_command=\"$relink_command\""
     if test -z "$install_prog"; then
       $echo "$modename: you must specify an install program" 1>&2
       $echo "$help" 1>&2
     if test -z "$install_prog"; then
       $echo "$modename: you must specify an install program" 1>&2
       $echo "$help" 1>&2

-      exit 1
+      exit $EXIT_FAILURE

     fi
 
     if test -n "$prev"; then
       $echo "$modename: the \`$prev' option requires an argument" 1>&2
       $echo "$help" 1>&2
     fi
 
     if test -n "$prev"; then
       $echo "$modename: the \`$prev' option requires an argument" 1>&2
       $echo "$help" 1>&2

-      exit 1
+      exit $EXIT_FAILURE

     fi
 
     if test -z "$files"; then
     fi
 
     if test -z "$files"; then


@@ -5328,7 +5384,7 @@ relink_command=\"$relink_command\""
        $echo "$modename: you must specify a destination" 1>&2
       fi
       $echo "$help" 1>&2
        $echo "$modename: you must specify a destination" 1>&2
       fi
       $echo "$help" 1>&2

-      exit 1
+      exit $EXIT_FAILURE

     fi
 
     # Strip any trailing slash from the destination.
     fi
 
     # Strip any trailing slash from the destination.


@@ -5349,7 +5405,7 @@ relink_command=\"$relink_command\""
       if test "$#" -gt 2; then
        $echo "$modename: \`$dest' is not a directory" 1>&2
        $echo "$help" 1>&2
       if test "$#" -gt 2; then
        $echo "$modename: \`$dest' is not a directory" 1>&2
        $echo "$help" 1>&2

-       exit 1
+       exit $EXIT_FAILURE

       fi
     fi
     case $destdir in
       fi
     fi
     case $destdir in


@@ -5361,7 +5417,7 @@ relink_command=\"$relink_command\""
        *)
          $echo "$modename: \`$destdir' must be an absolute directory name" 1>&2
          $echo "$help" 1>&2
        *)
          $echo "$modename: \`$destdir' must be an absolute directory name" 1>&2
          $echo "$help" 1>&2

-         exit 1
+         exit $EXIT_FAILURE

          ;;
        esac
       done
          ;;
        esac
       done


@@ -5390,7 +5446,7 @@ relink_command=\"$relink_command\""
        else
          $echo "$modename: \`$file' is not a valid libtool archive" 1>&2
          $echo "$help" 1>&2
        else
          $echo "$modename: \`$file' is not a valid libtool archive" 1>&2
          $echo "$help" 1>&2

-         exit 1
+         exit $EXIT_FAILURE

        fi
 
        library_names=
        fi
 
        library_names=


@@ -5432,7 +5488,7 @@ relink_command=\"$relink_command\""
          # but it's something to keep an eye on.
          if test "$inst_prefix_dir" = "$destdir"; then
            $echo "$modename: error: cannot install \`$file' to a directory not ending in $libdir" 1>&2
          # but it's something to keep an eye on.
          if test "$inst_prefix_dir" = "$destdir"; then
            $echo "$modename: error: cannot install \`$file' to a directory not ending in $libdir" 1>&2

-           exit 1
+           exit $EXIT_FAILURE

          fi
 
          if test -n "$inst_prefix_dir"; then
          fi
 
          if test -n "$inst_prefix_dir"; then


@@ -5447,7 +5503,7 @@ relink_command=\"$relink_command\""
          if $run eval "$relink_command"; then :
          else
            $echo "$modename: error: relink \`$file' with the above command before installing it" 1>&2
          if $run eval "$relink_command"; then :
          else
            $echo "$modename: error: relink \`$file' with the above command before installing it" 1>&2

-           exit 1
+           exit $EXIT_FAILURE

          fi
        fi
 
          fi
        fi
 


@@ -5482,10 +5538,11 @@ relink_command=\"$relink_command\""
 
          # Do each command in the postinstall commands.
          lib="$destdir/$realname"
 
          # Do each command in the postinstall commands.
          lib="$destdir/$realname"

-         eval cmds=\"$postinstall_cmds\"
+         cmds=$postinstall_cmds

          save_ifs="$IFS"; IFS='~'
          for cmd in $cmds; do
            IFS="$save_ifs"
          save_ifs="$IFS"; IFS='~'
          for cmd in $cmds; do
            IFS="$save_ifs"

+           eval cmd=\"$cmd\"

            $show "$cmd"
            $run eval "$cmd" || exit $?
          done
            $show "$cmd"
            $run eval "$cmd" || exit $?
          done


@@ -5525,7 +5582,7 @@ relink_command=\"$relink_command\""
        *)
          $echo "$modename: cannot copy a libtool object to \`$destfile'" 1>&2
          $echo "$help" 1>&2
        *)
          $echo "$modename: cannot copy a libtool object to \`$destfile'" 1>&2
          $echo "$help" 1>&2

-         exit 1
+         exit $EXIT_FAILURE

          ;;
        esac
 
          ;;
        esac
 


@@ -5543,7 +5600,7 @@ relink_command=\"$relink_command\""
          $show "$install_prog $staticobj $staticdest"
          $run eval "$install_prog \$staticobj \$staticdest" || exit $?
        fi
          $show "$install_prog $staticobj $staticdest"
          $run eval "$install_prog \$staticobj \$staticdest" || exit $?
        fi

-       exit 0
+       exit $EXIT_SUCCESS

        ;;
 
       *)
        ;;
 
       *)


@@ -5597,7 +5654,7 @@ relink_command=\"$relink_command\""
          # Check the variables that should have been set.
          if test -z "$notinst_deplibs"; then
            $echo "$modename: invalid libtool wrapper script \`$wrapper'" 1>&2
          # Check the variables that should have been set.
          if test -z "$notinst_deplibs"; then
            $echo "$modename: invalid libtool wrapper script \`$wrapper'" 1>&2

-           exit 1
+           exit $EXIT_FAILURE

          fi
 
          finalize=yes
          fi
 
          finalize=yes


@@ -5638,8 +5695,12 @@ relink_command=\"$relink_command\""
              tmpdir="/tmp"
              test -n "$TMPDIR" && tmpdir="$TMPDIR"
              tmpdir="$tmpdir/libtool-$$"
              tmpdir="/tmp"
              test -n "$TMPDIR" && tmpdir="$TMPDIR"
              tmpdir="$tmpdir/libtool-$$"

-             if $mkdir -p "$tmpdir" && chmod 700 "$tmpdir"; then :
+             save_umask=`umask`
+             umask 0077
+             if $mkdir "$tmpdir"; then
+               umask $save_umask

              else
              else

+               umask $save_umask

                $echo "$modename: error: cannot create temporary directory \`$tmpdir'" 1>&2
                continue
              fi
                $echo "$modename: error: cannot create temporary directory \`$tmpdir'" 1>&2
                continue
              fi


@@ -5698,16 +5759,17 @@ relink_command=\"$relink_command\""
       $show "$install_prog $file $oldlib"
       $run eval "$install_prog \$file \$oldlib" || exit $?
 
       $show "$install_prog $file $oldlib"
       $run eval "$install_prog \$file \$oldlib" || exit $?
 

-      if test -n "$stripme" && test -n "$striplib"; then
+      if test -n "$stripme" && test -n "$old_striplib"; then

        $show "$old_striplib $oldlib"
        $run eval "$old_striplib $oldlib" || exit $?
       fi
 
       # Do each command in the postinstall commands.
        $show "$old_striplib $oldlib"
        $run eval "$old_striplib $oldlib" || exit $?
       fi
 
       # Do each command in the postinstall commands.

-      eval cmds=\"$old_postinstall_cmds\"
+      cmds=$old_postinstall_cmds

       save_ifs="$IFS"; IFS='~'
       for cmd in $cmds; do
        IFS="$save_ifs"
       save_ifs="$IFS"; IFS='~'
       for cmd in $cmds; do
        IFS="$save_ifs"

+       eval cmd=\"$cmd\"

        $show "$cmd"
        $run eval "$cmd" || exit $?
       done
        $show "$cmd"
        $run eval "$cmd" || exit $?
       done


@@ -5721,9 +5783,9 @@ relink_command=\"$relink_command\""
     if test -n "$current_libdirs"; then
       # Maybe just do a dry run.
       test -n "$run" && current_libdirs=" -n$current_libdirs"
     if test -n "$current_libdirs"; then
       # Maybe just do a dry run.
       test -n "$run" && current_libdirs=" -n$current_libdirs"

-      exec_cmd='$SHELL $0 $preserve_args --finish$current_libdirs'
+      exec_cmd='$SHELL $progpath $preserve_args --finish$current_libdirs'

     else
     else

-      exit 0
+      exit $EXIT_SUCCESS

     fi
     ;;
 
     fi
     ;;
 


@@ -5742,10 +5804,11 @@ relink_command=\"$relink_command\""
       for libdir in $libdirs; do
        if test -n "$finish_cmds"; then
          # Do each command in the finish commands.
       for libdir in $libdirs; do
        if test -n "$finish_cmds"; then
          # Do each command in the finish commands.

-         eval cmds=\"$finish_cmds\"
+         cmds=$finish_cmds

          save_ifs="$IFS"; IFS='~'
          for cmd in $cmds; do
            IFS="$save_ifs"
          save_ifs="$IFS"; IFS='~'
          for cmd in $cmds; do
            IFS="$save_ifs"

+           eval cmd=\"$cmd\"

            $show "$cmd"
            $run eval "$cmd" || admincmds="$admincmds
        $cmd"
            $show "$cmd"
            $run eval "$cmd" || admincmds="$admincmds
        $cmd"


@@ -5762,7 +5825,7 @@ relink_command=\"$relink_command\""
     fi
 
     # Exit here if they wanted silent mode.
     fi
 
     # Exit here if they wanted silent mode.

-    test "$show" = : && exit 0
+    test "$show" = : && exit $EXIT_SUCCESS

 
     $echo "----------------------------------------------------------------------"
     $echo "Libraries have been installed in:"
 
     $echo "----------------------------------------------------------------------"
     $echo "Libraries have been installed in:"


@@ -5798,7 +5861,7 @@ relink_command=\"$relink_command\""
     $echo "See any operating system documentation about shared libraries for"
     $echo "more information, such as the ld(1) and ld.so(8) manual pages."
     $echo "----------------------------------------------------------------------"
     $echo "See any operating system documentation about shared libraries for"
     $echo "more information, such as the ld(1) and ld.so(8) manual pages."
     $echo "----------------------------------------------------------------------"

-    exit 0
+    exit $EXIT_SUCCESS

     ;;
 
   # libtool execute mode
     ;;
 
   # libtool execute mode


@@ -5810,7 +5873,7 @@ relink_command=\"$relink_command\""
     if test -z "$cmd"; then
       $echo "$modename: you must specify a COMMAND" 1>&2
       $echo "$help"
     if test -z "$cmd"; then
       $echo "$modename: you must specify a COMMAND" 1>&2
       $echo "$help"

-      exit 1
+      exit $EXIT_FAILURE

     fi
 
     # Handle -dlopen flags immediately.
     fi
 
     # Handle -dlopen flags immediately.


@@ -5818,7 +5881,7 @@ relink_command=\"$relink_command\""
       if test ! -f "$file"; then
        $echo "$modename: \`$file' is not a file" 1>&2
        $echo "$help" 1>&2
       if test ! -f "$file"; then
        $echo "$modename: \`$file' is not a file" 1>&2
        $echo "$help" 1>&2

-       exit 1
+       exit $EXIT_FAILURE

       fi
 
       dir=
       fi
 
       dir=


@@ -5829,7 +5892,7 @@ relink_command=\"$relink_command\""
        else
          $echo "$modename: \`$lib' is not a valid libtool archive" 1>&2
          $echo "$help" 1>&2
        else
          $echo "$modename: \`$lib' is not a valid libtool archive" 1>&2
          $echo "$help" 1>&2

-         exit 1
+         exit $EXIT_FAILURE

        fi
 
        # Read the libtool library.
        fi
 
        # Read the libtool library.


@@ -5856,7 +5919,7 @@ relink_command=\"$relink_command\""
          dir="$dir/$objdir"
        else
          $echo "$modename: cannot find \`$dlname' in \`$dir' or \`$dir/$objdir'" 1>&2
          dir="$dir/$objdir"
        else
          $echo "$modename: cannot find \`$dlname' in \`$dir' or \`$dir/$objdir'" 1>&2

-         exit 1
+         exit $EXIT_FAILURE

        fi
        ;;
 
        fi
        ;;
 


@@ -5936,7 +5999,7 @@ relink_command=\"$relink_command\""
        $echo "export $shlibpath_var"
       fi
       $echo "$cmd$args"
        $echo "export $shlibpath_var"
       fi
       $echo "$cmd$args"

-      exit 0
+      exit $EXIT_SUCCESS

     fi
     ;;
 
     fi
     ;;
 


@@ -5964,7 +6027,7 @@ relink_command=\"$relink_command\""
     if test -z "$rm"; then
       $echo "$modename: you must specify an RM program" 1>&2
       $echo "$help" 1>&2
     if test -z "$rm"; then
       $echo "$modename: you must specify an RM program" 1>&2
       $echo "$help" 1>&2

-      exit 1
+      exit $EXIT_FAILURE

     fi
 
     rmdirs=
     fi
 
     rmdirs=


@@ -6019,10 +6082,11 @@ relink_command=\"$relink_command\""
          if test "$mode" = uninstall; then
            if test -n "$library_names"; then
              # Do each command in the postuninstall commands.
          if test "$mode" = uninstall; then
            if test -n "$library_names"; then
              # Do each command in the postuninstall commands.

-             eval cmds=\"$postuninstall_cmds\"
+             cmds=$postuninstall_cmds

              save_ifs="$IFS"; IFS='~'
              for cmd in $cmds; do
                IFS="$save_ifs"
              save_ifs="$IFS"; IFS='~'
              for cmd in $cmds; do
                IFS="$save_ifs"

+               eval cmd=\"$cmd\"

                $show "$cmd"
                $run eval "$cmd"
                if test "$?" -ne 0 && test "$rmforce" != yes; then
                $show "$cmd"
                $run eval "$cmd"
                if test "$?" -ne 0 && test "$rmforce" != yes; then


@@ -6034,10 +6098,11 @@ relink_command=\"$relink_command\""
 
            if test -n "$old_library"; then
              # Do each command in the old_postuninstall commands.
 
            if test -n "$old_library"; then
              # Do each command in the old_postuninstall commands.

-             eval cmds=\"$old_postuninstall_cmds\"
+             cmds=$old_postuninstall_cmds

              save_ifs="$IFS"; IFS='~'
              for cmd in $cmds; do
                IFS="$save_ifs"
              save_ifs="$IFS"; IFS='~'
              for cmd in $cmds; do
                IFS="$save_ifs"

+               eval cmd=\"$cmd\"

                $show "$cmd"
                $run eval "$cmd"
                if test "$?" -ne 0 && test "$rmforce" != yes; then
                $show "$cmd"
                $run eval "$cmd"
                if test "$?" -ne 0 && test "$rmforce" != yes; then


@@ -6076,7 +6141,7 @@ relink_command=\"$relink_command\""
        if test "$mode" = clean ; then
          noexename=$name
          case $file in
        if test "$mode" = clean ; then
          noexename=$name
          case $file in

-         *.exe) 
+         *.exe)

            file=`$echo $file|${SED} 's,.exe$,,'`
            noexename=`$echo $name|${SED} 's,.exe$,,'`
            # $file with .exe has already been added to rmfiles,
            file=`$echo $file|${SED} 's,.exe$,,'`
            noexename=`$echo $name|${SED} 's,.exe$,,'`
            # $file with .exe has already been added to rmfiles,


@@ -6121,20 +6186,20 @@ relink_command=\"$relink_command\""
   "")
     $echo "$modename: you must specify a MODE" 1>&2
     $echo "$generic_help" 1>&2
   "")
     $echo "$modename: you must specify a MODE" 1>&2
     $echo "$generic_help" 1>&2

-    exit 1
+    exit $EXIT_FAILURE

     ;;
   esac
 
   if test -z "$exec_cmd"; then
     $echo "$modename: invalid operation mode \`$mode'" 1>&2
     $echo "$generic_help" 1>&2
     ;;
   esac
 
   if test -z "$exec_cmd"; then
     $echo "$modename: invalid operation mode \`$mode'" 1>&2
     $echo "$generic_help" 1>&2

-    exit 1
+    exit $EXIT_FAILURE

   fi
 fi # test -z "$show_help"
 
 if test -n "$exec_cmd"; then
   eval exec $exec_cmd
   fi
 fi # test -z "$show_help"
 
 if test -n "$exec_cmd"; then
   eval exec $exec_cmd

-  exit 1
+  exit $EXIT_FAILURE

 fi
 
 # We need to display help for each of the modes.
 fi
 
 # We need to display help for each of the modes.


@@ -6170,7 +6235,7 @@ MODE-ARGS vary depending on the MODE.  Try \`$modename --help --mode=MODE' for
 a more detailed description of MODE.
 
 Report bugs to <bug-libtool@gnu.org>."
 a more detailed description of MODE.
 
 Report bugs to <bug-libtool@gnu.org>."

-  exit 0
+  exit $EXIT_SUCCESS

   ;;
 
 clean)
   ;;
 
 clean)


@@ -6282,6 +6347,8 @@ The following components of LINK-COMMAND are treated specially:
   -no-undefined     declare that a library does not refer to external symbols
   -o OUTPUT-FILE    create OUTPUT-FILE from the specified objects
   -objectlist FILE  Use a list of object files found in FILE to specify objects
   -no-undefined     declare that a library does not refer to external symbols
   -o OUTPUT-FILE    create OUTPUT-FILE from the specified objects
   -objectlist FILE  Use a list of object files found in FILE to specify objects

+  -precious-files-regex REGEX
+                    don't remove output files matching REGEX

   -release RELEASE  specify package release information
   -rpath LIBDIR     the created library will eventually be installed in LIBDIR
   -R[ ]LIBDIR       add LIBDIR to the runtime path of programs and libraries
   -release RELEASE  specify package release information
   -rpath LIBDIR     the created library will eventually be installed in LIBDIR
   -R[ ]LIBDIR       add LIBDIR to the runtime path of programs and libraries


@@ -6323,14 +6390,14 @@ Otherwise, only FILE itself is deleted using RM."
 *)
   $echo "$modename: invalid operation mode \`$mode'" 1>&2
   $echo "$help" 1>&2
 *)
   $echo "$modename: invalid operation mode \`$mode'" 1>&2
   $echo "$help" 1>&2

-  exit 1
+  exit $EXIT_FAILURE

   ;;
 esac
 
 $echo
 $echo "Try \`$modename --help' for more information about other modes."
 
   ;;
 esac
 
 $echo
 $echo "Try \`$modename --help' for more information about other modes."
 

-exit 0
+exit $EXIT_SUCCESS

 
 # The TAGs below are defined such that we never get into a situation
 # in which we disable both kinds of libraries.  Given conflicting
 
 # The TAGs below are defined such that we never get into a situation
 # in which we disable both kinds of libraries.  Given conflicting