From 45641b8620d6ad2b48a7032fb4796caa70832ef4 Mon Sep 17 00:00:00 2001
From: Alexandre Oliva <oliva@dcc.unicamp.br>
Date: Thu, 8 Apr 1999 00:47:59 +0000
Subject: [PATCH] * 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>

---
 ChangeLog   |  6 ++++++
 ltconfig.in | 17 +++++++++++------
 ltmain.in   | 17 +++++++++++------
 3 files changed, 28 insertions(+), 12 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index e24393813..bf0760305 100644
--- 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 fd7031d9a..45a5c07e5 100755
--- 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 dc46bb907..9f5f7e55c 100644
--- 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"
-- 
2.47.3