# HG changeset patch
# User stephent
# Date 1077350041 0
# Node ID 569139be45f6cb3f965d2b6455582ab3e057d9da
# Parent  dd8c3a4ab510bfae9e10d9acf3352e5309e1f62e
[xemacs-hg @ 2004-02-21 07:53:59 by stephent]
reorder XE_CFLAGS computation <87r7wona1o.fsf@tleepslib.sk.tsukuba.ac.jp>

diff -r dd8c3a4ab510 -r 569139be45f6 ChangeLog
--- a/ChangeLog	Fri Feb 20 22:51:02 2004 +0000
+++ b/ChangeLog	Sat Feb 21 07:54:01 2004 +0000
@@ -1,6 +1,13 @@
+2004-02-21  Stephen J. Turnbull  <stephen@xemacs.org>
+
+	* configure.in (CFLAGS): Do XE_CFLAGS before adding warning flags to
+	CFLAGS.  Thanks to Jerry James for reporting the bug.
+
 2004-02-18  Stephen J. Turnbull  <stephen@xemacs.org>
 
 	* configure.in (AC_INIT_PARSE_ARGS): Use Solaris-compatible `for'.
+	Thanks to Vin Shelton for noticing the bug, and Hrvoje Niksic for
+	the more elegant fix.
 
 2004-01-28  Stephen J. Turnbull  <stephen@xemacs.org>
 
diff -r dd8c3a4ab510 -r 569139be45f6 configure
--- a/configure	Fri Feb 20 22:51:02 2004 +0000
+++ b/configure	Sat Feb 21 07:54:01 2004 +0000
@@ -2904,9 +2904,9 @@
             fi
 fi
 
-CFLAGS="$cflags_warning $CFLAGS"
 test -z "xe_cflags_warning" && xe_cflags_warning=cflags_warning
 XE_CFLAGS="$xe_cflags_warning $CFLAGS"
+CFLAGS="$cflags_warning $CFLAGS"
 
 if test "$GCC" = "yes"; then
 echo $ac_n "checking for buggy gcc versions""... $ac_c" 1>&6
diff -r dd8c3a4ab510 -r 569139be45f6 configure.in
--- a/configure.in	Fri Feb 20 22:51:02 2004 +0000
+++ b/configure.in	Sat Feb 21 07:54:01 2004 +0000
@@ -2061,11 +2061,12 @@
 
 dnl Now combine all C flags.  Put the warning flags first so that
 dnl user-specified flags will override.
-dnl Flags for CC:
-CFLAGS="$cflags_warning $CFLAGS"
+dnl Do XE_CFLAGS before adding warning flags to CFLAGS.
 dnl Flags for XEMACS_CC:
 test -z "xe_cflags_warning" && xe_cflags_warning=cflags_warning
 XE_CFLAGS="$xe_cflags_warning $CFLAGS"
+dnl Flags for CC:
+CFLAGS="$cflags_warning $CFLAGS"
 
 dnl Search for GCC specific build problems we know about
 if test "$GCC" = "yes"; then