From 3c0a43b24cc7540cc139beca0ec2e4c202ff5593 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?R=C3=A9mi=20Cardona?= <remi@gentoo.org>
Date: Wed, 28 Oct 2009 13:01:32 +0100
Subject: [PATCH] configure: use CWARNFLAGS from xorg-macros.m4
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Rémi Cardona <remi@gentoo.org>
Acked-by: Chris Wilson <chris@chris-wilson.co.uk>
---
 configure.ac                | 11 -----------
 src/Makefile.am             |  2 +-
 src/bios_reader/Makefile.am |  2 +-
 src/reg_dumper/Makefile.am  |  2 +-
 src/xvmc/Makefile.am        |  2 +-
 uxa/Makefile.am             |  2 +-
 6 files changed, 5 insertions(+), 16 deletions(-)

diff --git a/configure.ac b/configure.ac
index 4b97abbb..6da3ee10 100644
--- a/configure.ac
+++ b/configure.ac
@@ -111,16 +111,6 @@ AM_CONDITIONAL(DRI, test x$DRI = xyes)
 AC_MSG_CHECKING([whether to include DRI support])
 AC_MSG_RESULT([$DRI])
 
-dnl Use lots of warning flags with GCC
-
-WARN_CFLAGS=""
-
-if test "x$GCC" = "xyes"; then
-	WARN_CFLAGS="-Wall -Wpointer-arith -Wstrict-prototypes \
-	-Wmissing-prototypes -Wmissing-declarations \
-	-Wnested-externs -fno-strict-aliasing"
-fi
-
 AM_CONDITIONAL(VIDEO_DEBUG, test x$VIDEO_DEBUG = xyes)
 if test "$VIDEO_DEBUG" = yes; then
 	AC_DEFINE(VIDEO_DEBUG,1,[Enable debug support])
@@ -145,7 +135,6 @@ if test "$KMS_ONLY" = yes; then
 fi
 
 AC_SUBST([XORG_CFLAGS])
-AC_SUBST([WARN_CFLAGS])
 AC_SUBST([moduledir])
 
 DRIVER_NAME=intel
diff --git a/src/Makefile.am b/src/Makefile.am
index 5ffb5220..d8e02ffb 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -26,7 +26,7 @@ SUBDIRS = xvmc bios_reader reg_dumper render_program
 # _ladir passes a dummy rpath to libtool so the thing will actually link
 # TODO: -nostdlib/-Bstatic/-lgcc platform magic, not installing the .a, etc.
 
-AM_CFLAGS = @WARN_CFLAGS@ @XORG_CFLAGS@ @DRM_CFLAGS@ \
+AM_CFLAGS = @CWARNFLAGS@ @XORG_CFLAGS@ @DRM_CFLAGS@ \
 	@PCIACCESS_CFLAGS@ -I$(top_srcdir)/uxa -I$(top_srcdir)/src/render_program
 
 intel_drv_la_LTLIBRARIES = intel_drv.la
diff --git a/src/bios_reader/Makefile.am b/src/bios_reader/Makefile.am
index cff9e1a6..f2f9dc01 100644
--- a/src/bios_reader/Makefile.am
+++ b/src/bios_reader/Makefile.am
@@ -1,4 +1,4 @@
-AM_CFLAGS = @WARN_CFLAGS@ @XORG_CFLAGS@ @PCIACCESS_CFLAGS@ \
+AM_CFLAGS = @CWARNFLAGS@ @XORG_CFLAGS@ @PCIACCESS_CFLAGS@ \
 	-DREG_DUMPER
 
 noinst_PROGRAMS = bios_reader  $(BIOS_DUMPER) $(SWF_DUMPER)
diff --git a/src/reg_dumper/Makefile.am b/src/reg_dumper/Makefile.am
index e6adce4f..8f00abe0 100644
--- a/src/reg_dumper/Makefile.am
+++ b/src/reg_dumper/Makefile.am
@@ -36,6 +36,6 @@ intel_statuspage_LDADD = $(PCIACCESS_LIBS)
 intel_lid_LDADD = $(PCIACCESS_LIBS)
 intel_audio_LDADD = $(PCIACCESS_LIBS)
 
-AM_CFLAGS = $(PCIACCESS_CFLAGS) $(WARN_CFLAGS) \
+AM_CFLAGS = $(PCIACCESS_CFLAGS) $(CWARNFLAGS) \
 	-I$(srcdir)/.. -DREG_DUMPER
 
diff --git a/src/xvmc/Makefile.am b/src/xvmc/Makefile.am
index 59212441..be8824b8 100644
--- a/src/xvmc/Makefile.am
+++ b/src/xvmc/Makefile.am
@@ -7,7 +7,7 @@ SUBDIRS = shader
 libI810XvMC_la_SOURCES = I810XvMC.c \
 			 I810XvMC.h
 
-libI810XvMC_la_CFLAGS = @WARN_CFLAGS@ @XORG_CFLAGS@ @DRM_CFLAGS@ @DRI_CFLAGS@ \
+libI810XvMC_la_CFLAGS = @CWARNFLAGS@ @XORG_CFLAGS@ @DRM_CFLAGS@ @DRI_CFLAGS@ \
 	-I$(top_srcdir)/src -DTRUE=1 -DFALSE=0
 libI810XvMC_la_LDFLAGS = -version-number 1:0:0
 libI810XvMC_la_LIBADD = @DRI_LIBS@ @DRM_LIBS@ @XVMCLIB_LIBS@
diff --git a/uxa/Makefile.am b/uxa/Makefile.am
index 641b4146..0dfad485 100644
--- a/uxa/Makefile.am
+++ b/uxa/Makefile.am
@@ -7,7 +7,7 @@ SOLARIS_ASM_CFLAGS=""
 INCLUDES = \
 	$(XORG_INCS)
 
-AM_CFLAGS = $(WARN_CFLAGS) $(XORG_CFLAGS) $(DIX_CFLAGS)
+AM_CFLAGS = $(CWARNFLAGS) $(XORG_CFLAGS) $(DIX_CFLAGS)
 
 libuxa_la_SOURCES = \
 	uxa.c \