Mercurial > hg > xemacs-beta
comparison configure.ac @ 4512:66411359ce4e
Merge in ac-fix-2008-10-25. Fix up ChangeLogs.
author | Stephen J. Turnbull <stephen@xemacs.org> |
---|---|
date | Sat, 25 Oct 2008 21:40:46 +0900 |
parents | f863b2ee146f bd1fbed783dd |
children | 0ed907d0f1e9 |
comparison
equal
deleted
inserted
replaced
4509:dd12adb12b8f | 4512:66411359ce4e |
---|---|
2237 test "$need_kalloca" = "yes" && XE_APPEND(-Kalloca,c_switch_system) | 2237 test "$need_kalloca" = "yes" && XE_APPEND(-Kalloca,c_switch_system) |
2238 fi | 2238 fi |
2239 | 2239 |
2240 dnl If we're specifying XEMACS_CC, it'd better be in the same family | 2240 dnl If we're specifying XEMACS_CC, it'd better be in the same family |
2241 dnl as CC or the following flag calculations are bogus. | 2241 dnl as CC or the following flag calculations are bogus. |
2242 dnl #### We may want to actually error and abort here, but I am not sure. | 2242 dnl No error/abort; detection is too fragile. |
2243 | |
2244 xemacs_cc_cc_mismatch=no | |
2243 if test "$CC" != "$XEMACS_CC"; then | 2245 if test "$CC" != "$XEMACS_CC"; then |
2244 if test "$XEMACS_CC" = "g++" -a "$GCC" != "yes"; then | 2246 case "$XEMACS_CC" in |
2245 AC_MSG_WARN([CC and g++ are mismatched; XE_CFLAGS may be wrong]) | 2247 *g++* ) |
2246 xemacs_cc_cc_mismatch=yes | 2248 if test "$GCC" != "yes"; then |
2247 elif test -n "$GCC" -a "$XEMACS_CC" != "g++"; then | 2249 AC_MSG_WARN([CC and g++ are mismatched; XE_CFLAGS may be wrong]) |
2248 AC_MSG_WARN([gcc and XEMACS_CC are mismatched; XE_CFLAGS may be wrong]) | 2250 xemacs_cc_cc_mismatch=yes ;; |
2249 xemacs_cc_cc_mismatch=yes | 2251 esac |
2252 if test -n "$GCC"; then | |
2253 case $XEMACS_CC in | |
2254 *g++* ) | |
2255 ;; | |
2256 * ) | |
2257 AC_MSG_WARN([gcc and XEMACS_CC are mismatched; XE_CFLAGS may be wrong]) | |
2258 xemacs_cc_cc_mismatch=yes ;; | |
2259 esac | |
2250 dnl #### Add other detectable mismatches here. | 2260 dnl #### Add other detectable mismatches here. |
2251 else | |
2252 xemacs_cc_cc_mismatch=no | |
2253 fi | |
2254 fi | 2261 fi |
2255 | 2262 |
2256 dnl Calculate optimization flags. These will be off by default in beta | 2263 dnl Calculate optimization flags. These will be off by default in beta |
2257 dnl versions and on in release versions. | 2264 dnl versions and on in release versions. |
2258 | 2265 |