* config/ltmain.m4sh: Revert most of my last commit, only eval

$show "$cmds", and only when building a library. I'm a wimp.
Thanks Gary for pointing out errors in previous commit.

diff --git a/ChangeLog b/ChangeLog
index 15db33bbe00f2f5033507be8dbbe9685d2431a6e..1fe5a3d1e3fb065791d9e2cf58f020a2d471c364 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2004-10-14  Peter O'Gorman  <peter@pogma.com>
+
+       * config/ltmain.m4sh: Revert most of my last commit, only eval
+       \$show \"$cmds\", and only when building a library. I'm a wimp.
+       Thanks Gary for pointing out errors in previous commit.
+
 2004-10-13  Gary V. Vaughan  <gary@gnu.org>
 
        * config/ltmain.m4sh (func_mode_finish): Mention crle(1) on

diff --git a/config/ltmain.m4sh b/config/ltmain.m4sh
index c85f8dcb978bfec7985cf711e0a16dc78243db5c..6623c154bcb44be4a549ec3e49a1ef672312117b 100644 (file)
--- a/config/ltmain.m4sh
+++ b/config/ltmain.m4sh
@@ -1276,7 +1276,7 @@ EOF
 
       $run $RM "$lobj" "$output_obj"
 
-      eval $show "$command"
+      $show "$command"
       if $run eval "$command"; then :
       else
        test -n "$output_obj" && $run $RM $removelist
@@ -1348,7 +1348,7 @@ EOF
       # Suppress compiler output if we already did a PIC compilation.
       command="$command$suppress_output"
       $run $RM "$obj" "$output_obj"
-      eval $show "$command"
+      $show "$command"
       if $run eval "$command"; then :
       else
        $run $RM $removelist
@@ -1563,7 +1563,7 @@ func_mode_finish ()
          for cmd in $cmds; do
            IFS="$save_ifs"
            eval cmd=\"$cmd\"
-           eval $show "$cmd"
+           $show "$cmd"
            $run eval "$cmd" || admincmds="$admincmds
        $cmd"
          done
@@ -1813,7 +1813,7 @@ func_mode_install ()
          fi
 
          func_warning "relinking \`$file'"
-         eval $show "$relink_command"
+         $show "$relink_command"
          $run eval "$relink_command" || \
            func_fatal_error "error: relink \`$file' with the above command before installing it"
        fi
@@ -1829,10 +1829,10 @@ func_mode_install ()
          test -n "$relink_command" && srcname="$realname"T
 
          # Install the shared library and build the symlinks.
-         eval $show "$install_prog $dir/$srcname $destdir/$realname"
+         $show "$install_prog $dir/$srcname $destdir/$realname"
          $run eval "$install_prog $dir/$srcname $destdir/$realname" || exit $?
          if test -n "$stripme" && test -n "$striplib"; then
-           eval $show "$striplib $destdir/$realname"
+           $show "$striplib $destdir/$realname"
            $run eval "$striplib $destdir/$realname" || exit $?
          fi
 
@@ -1841,7 +1841,7 @@ func_mode_install ()
            for linkname
            do
              if test "$linkname" != "$realname"; then
-               eval $show "(cd $destdir && $RM $linkname && $LN_S $realname $linkname)"
+               $show "(cd $destdir && $RM $linkname && $LN_S $realname $linkname)"
                $run eval "(cd $destdir && $RM $linkname && $LN_S $realname $linkname)"
              fi
            done
@@ -1854,7 +1854,7 @@ func_mode_install ()
          for cmd in $cmds; do
            IFS="$save_ifs"
            eval cmd=\"$cmd\"
-           eval $show "$cmd"
+           $show "$cmd"
            $run eval "$cmd" || exit $?
          done
          IFS="$save_ifs"
@@ -1863,7 +1863,7 @@ func_mode_install ()
        # Install the pseudo-library for information purposes.
        name=`$ECHO "X$file" | $Xsed -e 's%^.*/%%'`
        instname="$dir/$name"i
-       eval $show "$install_prog $instname $destdir/$name"
+       $show "$install_prog $instname $destdir/$name"
        $run eval "$install_prog $instname $destdir/$name" || exit $?
 
        # Maybe install the static library, too.
@@ -1897,7 +1897,7 @@ func_mode_install ()
 
        # Install the libtool object if requested.
        if test -n "$destfile"; then
-         eval $show "$install_prog $file $destfile"
+         $show "$install_prog $file $destfile"
          $run eval "$install_prog $file $destfile" || exit $?
        fi
 
@@ -1906,7 +1906,7 @@ func_mode_install ()
          # Deduce the name of the old-style object file.
          staticobj=`$ECHO "X$file" | $Xsed -e "$lo2o"`
 
-         eval $show "$install_prog $staticobj $staticdest"
+         $show "$install_prog $staticobj $staticdest"
          $run eval "$install_prog \$staticobj \$staticdest" || exit $?
        fi
        exit $EXIT_SUCCESS
@@ -2005,7 +2005,7 @@ func_mode_install ()
              # Replace the output file specification.
              relink_command=`$ECHO "X$relink_command" | $Xsed -e 's%@OUTPUT@%'"$outputname"'%g'`
 
-             eval $show "$relink_command"
+             $show "$relink_command"
              if $run eval "$relink_command"; then :
              else
                func_error "error: relink \`$file' with the above command before installing it"
@@ -2039,7 +2039,7 @@ func_mode_install ()
          esac
          ;;
        esac
-       eval $show "$install_prog$stripme $file $destfile"
+       $show "$install_prog$stripme $file $destfile"
        $run eval "$install_prog\$stripme \$file \$destfile" || exit $?
        test -n "$outputname" && ${RM}r "$tmpdir"
        ;;
@@ -2052,11 +2052,11 @@ func_mode_install ()
       # Set up the ranlib parameters.
       oldlib="$destdir/$name"
 
-      eval $show "$install_prog $file $oldlib"
+      $show "$install_prog $file $oldlib"
       $run eval "$install_prog \$file \$oldlib" || exit $?
 
       if test -n "$stripme" && test -n "$old_striplib"; then
-       eval $show "$old_striplib $oldlib"
+       $show "$old_striplib $oldlib"
        $run eval "$old_striplib $oldlib" || exit $?
       fi
 
@@ -2066,7 +2066,7 @@ func_mode_install ()
       for cmd in $cmds; do
        IFS="$save_ifs"
        eval cmd=\"$cmd\"
-       eval $show "$cmd"
+       $show "$cmd"
        $run eval "$cmd" || exit $?
       done
       IFS="$save_ifs"
@@ -3649,7 +3649,7 @@ func_mode_link ()
              for cmd in $cmds; do
                IFS="$save_ifs"
                eval cmd=\"$cmd\"
-               eval $show "$cmd"
+               $show "$cmd"
                $run eval "$cmd" || exit $?
              done
              IFS="$save_ifs"
@@ -3663,7 +3663,7 @@ func_mode_link ()
              for cmd in $cmds; do
                IFS="$save_ifs"
                eval cmd=\"$cmd\"
-               eval $show "$cmd"
+               $show "$cmd"
                $run eval "$cmd" || exit $?
              done
              IFS="$save_ifs"
@@ -4910,7 +4910,7 @@ EOF
              eval cmd=\"$cmd\"
              if len=`expr "X$cmd" : ".*"` &&
               test "$len" -le "$max_cmd_len" || test "$max_cmd_len" -le -1; then
-               eval $show "$cmd"
+               $show "$cmd"
                $run eval "$cmd" || exit $?
                skipped_export=false
              else
@@ -5086,7 +5086,7 @@ EOF
            save_ifs="$IFS"; IFS='~'
            for cmd in $concat_cmds; do
              IFS="$save_ifs"
-             eval $show "$cmd"
+             $show "$cmd"
              $run eval "$cmd" || {
                lt_exit=$?
 
@@ -5144,7 +5144,8 @@ EOF
        for cmd in $cmds; do
          IFS="$save_ifs"
          eval cmd=\"$cmd\"
-         eval $show "$cmd"
+         func_quote_for_eval "$cmd"
+         eval \$show \"$func_quote_for_eval_result\"
          $run eval "$cmd" || {
            lt_exit=$?
 
@@ -5256,7 +5257,7 @@ EOF
       for cmd in $cmds; do
        IFS="$save_ifs"
        eval cmd=\"$cmd\"
-       eval $show "$cmd"
+       $show "$cmd"
        $run eval "$cmd" || exit $?
       done
       IFS="$save_ifs"
@@ -5293,7 +5294,7 @@ EOF
        for cmd in $cmds; do
          IFS="$save_ifs"
          eval cmd=\"$cmd\"
-         eval $show "$cmd"
+         $show "$cmd"
          $run eval "$cmd" || exit $?
        done
        IFS="$save_ifs"
@@ -5477,7 +5478,7 @@ EOF
        link_command="$compile_command$compile_rpath"
 
        # We have no uninstalled library dependencies, so finalize right now.
-       eval $show "$link_command"
+       $show "$link_command"
        $run eval "$link_command"
        status=$?
 
@@ -5544,7 +5545,7 @@ EOF
        # Delete the old output file.
        $run $RM $output
        # Link the executable and exit
-       eval $show "$link_command"
+       $show "$link_command"
        $run eval "$link_command" || exit $?
        exit $EXIT_SUCCESS
       fi
@@ -5577,7 +5578,7 @@ EOF
       # Delete the old output files.
       $run $RM $output $output_objdir/$outputname $output_objdir/lt-$outputname
 
-      eval $show "$link_command"
+      $show "$link_command"
       $run eval "$link_command" || exit $?
 
       # Now create the wrapper script.
@@ -6257,7 +6258,7 @@ fi\
       for cmd in $cmds; do
        eval cmd=\"$cmd\"
        IFS="$save_ifs"
-       eval $show "$cmd"
+       $show "$cmd"
        $run eval "$cmd" || exit $?
       done
       IFS="$save_ifs"
@@ -6514,7 +6515,7 @@ func_mode_uninstall ()
              for cmd in $cmds; do
                IFS="$save_ifs"
                eval cmd=\"$cmd\"
-               eval $show "$cmd"
+               $show "$cmd"
                $run eval "$cmd"
                if test "$?" -ne 0 && test "$rmforce" != yes; then
                  exit_status=1
@@ -6530,7 +6531,7 @@ func_mode_uninstall ()
              for cmd in $cmds; do
                IFS="$save_ifs"
                eval cmd=\"$cmd\"
-               eval $show "$cmd"
+               $show "$cmd"
                $run eval "$cmd"
                if test "$?" -ne 0 && test "$rmforce" != yes; then
                  exit_status=1