From: Richard M. Stallman <rms@gnu.org>
Date: Mon, 15 Aug 1994 09:19:22 +0000 (+0000)
Subject: Do compute unexec, LIBX, system_malloc, etc
X-Git-Tag: emacs-19.34~7305
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=12d733d066dcb7a8b67502a8d291e2bdf4663a3e;p=emacs.git

Do compute unexec, LIBX, system_malloc, etc
even if CPP env var was set by the user.
---

diff --git a/configure1.in b/configure1.in
index 6c9e3baf5da..fa23e8402b2 100755
--- a/configure1.in
+++ b/configure1.in
@@ -1431,10 +1431,10 @@ configure___ REAL_CFLAGS=C_DEBUG_SWITCH '${CFLAGS}'
 # The value of CPP is a quoted variable reference, so we need to do this
 # to get its actual value...
 CPP=`eval "echo $CPP"`
+eval `${CPP} -Isrc ${tempcname} \
+       | grep 'configure___' \
+       | sed -e 's/^configure___ \([^=]*=\)\(.*\)$/\1"\2"/'`
 if [ "x$CFLAGS" = x ]; then
-  eval `${CPP} -Isrc ${tempcname} \
-	 | grep 'configure___' \
-	 | sed -e 's/^configure___ \([^=]*=\)\(.*\)$/\1"\2"/'`
   eval `${CPP} -Isrc -DTHIS_IS_CONFIGURE ${tempcname} \
 	 | grep 'configure___' \
 	 | sed -e 's/^configure___ \([^=]*=\)\(.*\)$/\1"\2"/'`