From: Andreas Schwab <schwab@linux-m68k.org>
Date: Fri, 10 Dec 2010 22:42:17 +0000 (+0100)
Subject: Don't depend on POSIX compatible parsing of parameter expansion
X-Git-Tag: emacs-pretest-24.0.90~104^2~275^2~438^2~43^2~11
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=2b7f50d8775c7236b947c2f3e78786c1e2002722;p=emacs.git

Don't depend on POSIX compatible parsing of parameter expansion
---

diff --git a/configure b/configure
index d5ffec6ca7a..404b7ff3631 100755
--- a/configure
+++ b/configure
@@ -14910,12 +14910,17 @@ if test "${HAVE_GTK}" = "yes"; then
   USE_X_TOOLKIT=GTK
 fi
 
+and_machfile=
+if test -n "$machfile"; then
+  and_machfile=" and \`${machfile}'"
+fi
+
 echo "
 Configured for \`${canonical}'.
 
   Where should the build process find the source code?    ${srcdir}
   What operating system and machine description files should Emacs use?
-        \`${opsysfile}'${machfile:+ and \`${machfile}'}
+        \`${opsysfile}'${and_machfile}
   What compiler should emacs be built with?               ${CC} ${CFLAGS}
   Should Emacs use the GNU version of malloc?             ${GNU_MALLOC}${GNU_MALLOC_reason}
   Should Emacs use a relocating allocator for buffers?    ${REL_ALLOC}
diff --git a/configure.in b/configure.in
index ed071b83475..dbced95093e 100644
--- a/configure.in
+++ b/configure.in
@@ -3638,12 +3638,17 @@ if test "${HAVE_GTK}" = "yes"; then
   USE_X_TOOLKIT=GTK
 fi
 
+and_machfile=
+if test -n "$machfile"; then
+  and_machfile=" and \`${machfile}'"
+fi
+
 echo "
 Configured for \`${canonical}'.
 
   Where should the build process find the source code?    ${srcdir}
   What operating system and machine description files should Emacs use?
-        \`${opsysfile}'${machfile:+ and \`${machfile}'}
+        \`${opsysfile}'${and_machfile}
   What compiler should emacs be built with?               ${CC} ${CFLAGS}
   Should Emacs use the GNU version of malloc?             ${GNU_MALLOC}${GNU_MALLOC_reason}
   Should Emacs use a relocating allocator for buffers?    ${REL_ALLOC}