From 00774831bb34b64926262fe9e57ae17d8d3c2f35 Mon Sep 17 00:00:00 2001 From: Pauli Nieminen Date: Sat, 25 Jul 2009 16:18:55 +0300 Subject: [PATCH] libdrm: Add support for XORG_STRICT_OPTION --- configure.ac | 4 ++++ libdrm/Makefile.am | 5 ++++- libdrm/intel/Makefile.am | 1 + libdrm/nouveau/Makefile.am | 1 + libdrm/radeon/Makefile.am | 1 + tests/Makefile.am | 2 ++ tests/modeprint/Makefile.am | 2 ++ tests/modetest/Makefile.am | 2 ++ 8 files changed, 17 insertions(+), 1 deletions(-) diff --git a/configure.ac b/configure.ac index 0794a2c..b59b16d 100644 --- a/configure.ac +++ b/configure.ac @@ -33,6 +33,10 @@ AC_PROG_CC AC_HEADER_STDC AC_SYS_LARGEFILE +XORG_MACROS_VERSION(1.3) + +XORG_STRICT_OPTION + PKG_CHECK_MODULES(PTHREADSTUBS, pthread-stubs) AC_SUBST(PTHREADSTUBS_CFLAGS) AC_SUBST(PTHREADSTUBS_LIBS) diff --git a/libdrm/Makefile.am b/libdrm/Makefile.am index 0c07220..68267b9 100644 --- a/libdrm/Makefile.am +++ b/libdrm/Makefile.am @@ -33,7 +33,10 @@ libdrm_ladir = $(libdir) libdrm_la_LDFLAGS = -version-number 2:4:0 -no-undefined libdrm_la_LIBADD = @CLOCK_LIB@ -AM_CFLAGS = -I$(top_srcdir)/shared-core +AM_CFLAGS = \ + $(WARN_CFLAGS) \ + $(CWARNFLAGS) \ + -I$(top_srcdir)/shared-core libdrm_la_SOURCES = xf86drm.c xf86drmHash.c xf86drmRandom.c xf86drmSL.c \ xf86drmMode.c libdrm_lists.h diff --git a/libdrm/intel/Makefile.am b/libdrm/intel/Makefile.am index c7526f6..ee99cd8 100644 --- a/libdrm/intel/Makefile.am +++ b/libdrm/intel/Makefile.am @@ -24,6 +24,7 @@ AM_CFLAGS = \ $(WARN_CFLAGS) \ + $(CWARNFLAGS) \ -I$(top_srcdir)/libdrm \ -I$(top_srcdir)/libdrm/intel \ $(PTHREADSTUBS_CFLAGS) \ diff --git a/libdrm/nouveau/Makefile.am b/libdrm/nouveau/Makefile.am index 688eeca..7f19a3f 100644 --- a/libdrm/nouveau/Makefile.am +++ b/libdrm/nouveau/Makefile.am @@ -1,5 +1,6 @@ AM_CFLAGS = \ $(WARN_CFLAGS) \ + $(CWARNFLAGS) \ -I$(top_srcdir)/libdrm \ -I$(top_srcdir)/libdrm/nouveau \ $(PTHREADSTUBS_CFLAGS) \ diff --git a/libdrm/radeon/Makefile.am b/libdrm/radeon/Makefile.am index bec1beb..2892267 100644 --- a/libdrm/radeon/Makefile.am +++ b/libdrm/radeon/Makefile.am @@ -24,6 +24,7 @@ AM_CFLAGS = \ $(WARN_CFLAGS) \ + $(CWARNFLAGS) \ -I$(top_srcdir)/libdrm \ -I$(top_srcdir)/libdrm/radeon \ $(PTHREADSTUBS_CFLAGS) \ diff --git a/tests/Makefile.am b/tests/Makefile.am index 98c106b..f83a442 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -1,4 +1,6 @@ AM_CPPFLAGS = \ + $(WARN_CFLAGS) \ + $(CWARNFLAGS) \ -I $(top_srcdir)/shared-core \ -I $(top_srcdir)/libdrm diff --git a/tests/modeprint/Makefile.am b/tests/modeprint/Makefile.am index 77f8ec7..561fdb0 100644 --- a/tests/modeprint/Makefile.am +++ b/tests/modeprint/Makefile.am @@ -1,4 +1,6 @@ AM_CFLAGS = \ + $(WARN_CFLAGS) \ + $(CWARNFLAGS) \ -I$(top_srcdir)/shared-core \ -I$(top_srcdir)/libdrm/intel/ \ -I$(top_srcdir)/libdrm diff --git a/tests/modetest/Makefile.am b/tests/modetest/Makefile.am index 860fe06..8b01433 100644 --- a/tests/modetest/Makefile.am +++ b/tests/modetest/Makefile.am @@ -1,4 +1,6 @@ AM_CFLAGS = \ + $(WARN_CFLAGS) \ + $(CWARNFLAGS) \ -I$(top_srcdir)/shared-core \ -I$(top_srcdir)/libdrm/intel/ \ -I$(top_srcdir)/libdrm \ -- 1.6.3.3