PATCH: EXTRACFLAGS removal from configure

[Marcus Meissner]

Hi,

EXTRACFLAGS and CFLAGS complement it each other in the configure.ac script,
I see no need to have it "EXTRA".

This frees it up for later use in per-module definitions (like with Mikes
-fno-builtin patch or with one idea I have).

Ciao, Marcus

Changelog:
	Merge EXTRACFLAGS into CFLAGS handling.

Index: configure.ac
===================================================================
RCS file: /home/wine/wine/configure.ac,v
retrieving revision 1.371
diff -u -r1.371 configure.ac
--- configure.ac	1 Jul 2005 19:15:26 -0000	1.371
+++ configure.ac	6 Jul 2005 06:07:17 -0000
@@ -765,10 +765,9 @@
 
 dnl **** Check for gcc specific options ****
 
-AC_SUBST(EXTRACFLAGS,"")
 if test "x${GCC}" = "xyes"
 then
-  EXTRACFLAGS="-Wall -pipe"
+  CFLAGS="$CFLAGS -Wall -pipe"
 
   dnl Check for strength-reduce bug
   AC_CACHE_CHECK( [for gcc strength-reduce bug], ac_cv_c_gcc_strength_bug,
@@ -789,7 +788,7 @@
     ac_cv_c_gcc_strength_bug="yes") )
   if test "$ac_cv_c_gcc_strength_bug" = "yes"
   then
-    EXTRACFLAGS="$EXTRACFLAGS -fno-strength-reduce"
+    CFLAGS="$CFLAGS -fno-strength-reduce"
   fi
 
   dnl Check for -fshort-wchar
@@ -807,7 +806,7 @@
                       ac_cv_c_gcc_stack_boundary="yes",ac_cv_c_gcc_stack_boundary="no")])
   if test "$ac_cv_c_gcc_stack_boundary" = "yes"
   then
-    EXTRACFLAGS="$EXTRACFLAGS -mpreferred-stack-boundary=2"
+    CFLAGS="$CFLAGS -mpreferred-stack-boundary=2"
   fi
 
   dnl Check for -fno-strict-aliasing
@@ -816,7 +815,7 @@
                       ac_cv_c_gcc_no_strict_aliasing="yes",ac_cv_c_gcc_no_strict_aliasing="no")])
   if test "$ac_cv_c_gcc_no_strict_aliasing" = "yes"
   then
-    EXTRACFLAGS="$EXTRACFLAGS -fno-strict-aliasing"
+    CFLAGS="$CFLAGS -fno-strict-aliasing"
   fi
 
   dnl Check for -gstabs+ option
@@ -824,7 +823,7 @@
       [WINE_TRY_CFLAGS([-gstabs+],ac_cv_c_gcc_gstabs="yes", ac_cv_c_gcc_gstabs="no")])
   if test "$ac_cv_c_gcc_gstabs" = "yes"
   then
-    EXTRACFLAGS="$EXTRACFLAGS -gstabs+"
+    CFLAGS="$CFLAGS -gstabs+"
   fi
 
   dnl Check for noisy string.h
@@ -836,7 +835,7 @@
   CFLAGS="$saved_CFLAGS"
   if test "$ac_cv_c_string_h_warnings" = "no"
   then
-    EXTRACFLAGS="$EXTRACFLAGS -Wpointer-arith"
+    CFLAGS="$CFLAGS -Wpointer-arith"
   fi
 fi
 
Index: Make.rules.in
===================================================================
RCS file: /home/wine/wine/Make.rules.in,v
retrieving revision 1.186
diff -u -r1.186 Make.rules.in
--- Make.rules.in	7 May 2005 12:39:58 -0000	1.186
+++ Make.rules.in	6 Jul 2005 06:08:38 -0000
@@ -53,7 +53,6 @@
 LINTFLAGS = @LINTFLAGS@
 FONTFORGE = @FONTFORGE@
 INCLUDES     = -I$(SRCDIR) -I. -I$(TOPSRCDIR)/include -I$(TOPOBJDIR)/include $(EXTRAINCL)
-EXTRACFLAGS  = @EXTRACFLAGS@
 ALLCFLAGS    = $(INCLUDES) $(DEFS) $(DLLFLAGS) $(EXTRACFLAGS) $(CPPFLAGS) $(CFLAGS)
 ALLLINTFLAGS = $(INCLUDES) $(DEFS) $(LINTFLAGS)
 IDLFLAGS     = $(INCLUDES) $(DEFS) $(EXTRAIDLFLAGS)