aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRichard M. Stallman1995-08-12 23:27:18 +0000
committerRichard M. Stallman1995-08-12 23:27:18 +0000
commit4e90a7d5fbda827e04a5361d05bc7222c1f7e574 (patch)
treeae79cde1198704c9db8792c644da610a62ca500c
parent7e63ac6aec82f15ccaafd8f51d53e5a15f178063 (diff)
downloademacs-4e90a7d5fbda827e04a5361d05bc7222c1f7e574.tar.gz
emacs-4e90a7d5fbda827e04a5361d05bc7222c1f7e574.zip
(CFLAGS): When computing CFLAGS and REAL_CFLAGS
from config.h, use SPECIFIED_CFLAGS to get what the user specified. (alpha-*-linux*): New configuration.
-rw-r--r--configure.in13
1 files changed, 9 insertions, 4 deletions
diff --git a/configure.in b/configure.in
index efb3940d3b0..6073ad8101f 100644
--- a/configure.in
+++ b/configure.in
@@ -164,10 +164,15 @@ case "${canonical}" in
164 machine=alliant-2800 opsys=bsd4-3 164 machine=alliant-2800 opsys=bsd4-3
165 ;; 165 ;;
166 166
167 ;; Alpha (DEC) machines.
167 alpha-dec-osf* ) 168 alpha-dec-osf* )
168 machine=alpha opsys=osf1 169 machine=alpha opsys=osf1
169 ;; 170 ;;
170 171
172 alpha-*-linux* )
173 machine=alpha opsys=linux
174 ;;
175
171 ## Altos 3068 176 ## Altos 3068
172 m68*-altos-sysv* ) 177 m68*-altos-sysv* )
173 machine=altos opsys=usg5-2 178 machine=altos opsys=usg5-2
@@ -1095,18 +1100,18 @@ configure___ system_malloc=no
1095 1100
1096/* Get the CFLAGS for tests in configure. */ 1101/* Get the CFLAGS for tests in configure. */
1097#ifdef __GNUC__ 1102#ifdef __GNUC__
1098configure___ CFLAGS=C_DEBUG_SWITCH C_OPTIMIZE_SWITCH '${CFLAGS}' 1103configure___ CFLAGS=C_DEBUG_SWITCH C_OPTIMIZE_SWITCH '${SPECIFIED_CFLAGS}'
1099#else 1104#else
1100configure___ CFLAGS=C_DEBUG_SWITCH '${CFLAGS}' 1105configure___ CFLAGS=C_DEBUG_SWITCH '${SPECIFIED_CFLAGS}'
1101#endif 1106#endif
1102 1107
1103#else /* not THIS_IS_CONFIGURE */ 1108#else /* not THIS_IS_CONFIGURE */
1104 1109
1105/* Get the CFLAGS for real compilation. */ 1110/* Get the CFLAGS for real compilation. */
1106#ifdef __GNUC__ 1111#ifdef __GNUC__
1107configure___ REAL_CFLAGS=C_DEBUG_SWITCH C_OPTIMIZE_SWITCH '${CFLAGS}' 1112configure___ REAL_CFLAGS=C_DEBUG_SWITCH C_OPTIMIZE_SWITCH '${SPECIFIED_CFLAGS}'
1108#else 1113#else
1109configure___ REAL_CFLAGS=C_DEBUG_SWITCH '${CFLAGS}' 1114configure___ REAL_CFLAGS=C_DEBUG_SWITCH '${SPECIFIED_CFLAGS}'
1110#endif 1115#endif
1111 1116
1112#endif /* not THIS_IS_CONFIGURE */ 1117#endif /* not THIS_IS_CONFIGURE */