* ltconfig.in (--fallback-echo): Do not put an inline document and

an exec in the same if construct; otherwise the inline document
may not be removed.
* ltmain.in (--fallback-echo): Likewise.
Reported by John David Anglin <dave.anglin@nrc.ca>

diff --git a/ChangeLog b/ChangeLog
index 232e36339d58fd7db5922386d2d30fede85684b5..f6140f20674d7e801370bf1f6af59b799c2636e7 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,11 @@
 1999-04-07  Alexandre Oliva  <oliva@dcc.unicamp.br>
 
+       * ltconfig.in (--fallback-echo): Do not put an inline document and
+       an exec in the same if construct; otherwise the inline document
+       may not be removed.
+       * ltmain.in (--fallback-echo): Likewise.
+       Reported by John David Anglin <dave.anglin@nrc.ca>
+
        * dryrun.test: It would still fail at random times, because `cp'
        and `mv' are not guaranteed to preserve the timestamps of the
        installed files.  Instead of preserving them, just remove them

diff --git a/ltconfig.in b/ltconfig.in
index 7f13f223df7995b8671eb726f79b23d6ba1c007b..e7995360085dbf9a7d2800bcac47fde08023d744 100755 (executable)
--- a/ltconfig.in
+++ b/ltconfig.in
@@ -32,12 +32,8 @@ if test "X$1" = X--no-reexec; then
   # Discard the --no-reexec flag, and continue.
   shift
 elif test "X$1" = X--fallback-echo; then
-  # used as fallback echo
-  shift
-  cat <<EOF
-$*
-EOF
-  exit 0
+  # Avoid inline document here, it may be left over
+  :
 elif test "X`($echo '\t') 2>/dev/null`" = 'X\t'; then
   # Yippee, $echo works!
   :
@@ -46,6 +42,15 @@ else
   exec "$SHELL" "$0" --no-reexec ${1+"$@"}
 fi
 
+if test "X$1" = X--fallback-echo; then
+  # used as fallback echo
+  shift
+  cat <<EOF
+$*
+EOF
+  exit 0
+fi
+
 # Find the correct PATH separator.  Usually this is `:', but
 # DJGPP uses `;' like DOS.
 if test "X${PATH_SEPARATOR+set}" != "Xset"; then

diff --git a/ltmain.in b/ltmain.in
index 522f091f1423390efb9845a12d99ebffe0585756..c258081e9fce0528e31cf7d3ea1c3cc214d5b839 100644 (file)
--- a/ltmain.in
+++ b/ltmain.in
@@ -28,12 +28,8 @@ if test "X$1" = X--no-reexec; then
   # Discard the --no-reexec flag, and continue.
   shift
 elif test "X$1" = X--fallback-echo; then
-  # used as fallback echo
-  shift
-  cat <<EOF
-$*
-EOF
-  exit 0
+  # Avoid inline document here, it may be left over
+  :
 elif test "X`($echo '\t') 2>/dev/null`" = 'X\t'; then
   # Yippee, $echo works!
   :
@@ -42,6 +38,15 @@ else
   exec $SHELL "$0" --no-reexec ${1+"$@"}
 fi
 
+if test "X$1" = X--fallback-echo; then
+  # used as fallback echo
+  shift
+  cat <<EOF
+$*
+EOF
+  exit 0
+fi
+
 # The name of this program.
 progname=`$echo "$0" | sed 's%^.*/%%'`
 modename="$progname"