summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--Makefile.am2
-rw-r--r--configure.ac13
2 files changed, 5 insertions, 10 deletions
diff --git a/Makefile.am b/Makefile.am
index 82ca466..0910437 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -21,7 +21,7 @@
bin_PROGRAMS = appres
-AM_CFLAGS = $(APPRES_CFLAGS)
+AM_CFLAGS = $(APPRES_CFLAGS) $(CWARNFLAGS)
appres_LDADD = $(APPRES_LIBS)
appres_SOURCES = \
diff --git a/configure.ac b/configure.ac
index d924bb6..0f312b0 100644
--- a/configure.ac
+++ b/configure.ac
@@ -28,23 +28,18 @@ AM_MAINTAINER_MODE
AM_CONFIG_HEADER(config.h)
-# Require xorg-macros: XORG_CWARNFLAGS, XORG_CHANGELOG
-m4_ifndef([XORG_MACROS_VERSION], [AC_FATAL([must install xorg-macros 1.2 or later before running autoconf/autogen])])
-XORG_MACROS_VERSION(1.2)
+# Require xorg-macros: XORG_DEFAULT_OPTIONS
+m4_ifndef([XORG_MACROS_VERSION], [AC_FATAL([must install xorg-macros 1.3 or later before running autoconf/autogen])])
+XORG_MACROS_VERSION(1.3)
AC_PROG_CC
AC_PROG_INSTALL
-XORG_CWARNFLAGS
+XORG_DEFAULT_OPTIONS
# Checks for pkg-config packages
PKG_CHECK_MODULES(APPRES, x11 xt)
-APPRES_CFLAGS="$CWARNFLAGS $APPRES_CFLAGS"
AC_SUBST(APPRES_CFLAGS)
AC_SUBST(APPRES_LIBS)
-XORG_MANPAGE_SECTIONS
-XORG_RELEASE_VERSION
-XORG_CHANGELOG
-
AC_OUTPUT([Makefile])