CVS: winex configure.ac, 1.115, 1.116 Make.rules.in, 1.19, 1.20

Subject: winex configure.ac,1.115,1.116 Make.rules.in,1.19,1.20Update of /var/lib/cvsd/cvsroot/winex
In directory agravaine:/tmp/cvs-serv14313

Modified Files:
	configure.ac Make.rules.in 
Log Message:
Add -Wdeclaration-after-statement to the default gcc flags, and add the
ability to use $EXTRA_CFLAGS if defined in the Makefile.in for specific 
directories.


Index: configure.ac
===================================================================
RCS file: /var/lib/cvsd/cvsroot/winex/configure.ac,v
retrieving revision 1.115
retrieving revision 1.116
diff -u -d -r1.115 -r1.116
--- configure.ac	14 Dec 2007 20:07:26 -0000	1.115
+++ configure.ac	14 Dec 2007 20:12:27 -0000	1.116
@@ -1216,6 +1216,23 @@
     CEDEGACFLAGS="$CEDEGACFLAGS -Wa,--execstack"
   fi
 
+  dnl Check for -Wdeclaration-after-statement
+  AC_CACHE_CHECK([if gcc supports the -Wdeclaration-after-statement option],
+                 ac_cv_c_gcc_supports_w_declaration_after_statement,
+                 [ saved_cflags=$CFLAGS
+                   CFLAGS="$CFLAGS -Wdeclaration-after-statement"
+                   AC_TRY_COMPILE([],
+		                  [return 0],
+		                  ac_cv_c_gcc_supports_w_declaration_after_statement="yes",
+		                  ac_cv_c_gcc_supports_w_declaration_after_statement="no"
+ 	                         )
+                   CFLAGS=$saved_cflags
+                 ])
+  if test "$ac_cv_c_gcc_supports_w_declaration_after_statement" = "yes"
+  then
+    CEDEGACFLAGS="$CEDEGACFLAGS -Wdeclaration-after-statement"
+  fi
+
   dnl Check for -MMD
   AC_CACHE_CHECK([if gcc supports the -MMD option],
                  ac_cv_c_gcc_gen_depend_and_compile,

Index: Make.rules.in
===================================================================
RCS file: /var/lib/cvsd/cvsroot/winex/Make.rules.in,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -d -r1.19 -r1.20
--- Make.rules.in	30 Mar 2007 20:40:33 -0000	1.19
+++ Make.rules.in	14 Dec 2007 20:12:27 -0000	1.20
@@ -53,7 +53,7 @@
 RANLIB    = @RANLIB@
 LN_S      = @LN_S@
 DIVINCL   = $(EXTRAPREINCL) -I$(SRCDIR) -I. -I$(TOPSRCDIR)/include -I$(TOPOBJDIR)/include $(EXTRAINCL)
-ALLCFLAGS = $(DIVINCL) $(CFLAGS) $(DEFS) $(OPTIONS) $(X_CFLAGS)
+ALLCFLAGS = $(DIVINCL) $(CFLAGS) $(EXTRA_CFLAGS) $(DEFS) $(OPTIONS) $(X_CFLAGS)
 LDCOMBINE = @LDCOMBINE@
 LDFLAGS   = @LDFLAGS@
 STRIP_OPTION = @STRIP_OPTION@