summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--Makefile.am4
-rw-r--r--configure.ac15
2 files changed, 7 insertions, 12 deletions
diff --git a/Makefile.am b/Makefile.am
index 0fee910..1923272 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -20,7 +20,7 @@
bin_PROGRAMS = xdriinfo
-AM_CFLAGS = $(XDRIINFO_CFLAGS)
+AM_CFLAGS = $(CWARNFLAGS) $(XDRIINFO_CFLAGS)
# mesa should really use pkg-config ...
xdriinfo_LDADD = $(XDRIINFO_LIBS)
@@ -67,4 +67,4 @@ MAN_SUBSTS = \
SUFFIXES = .$(APP_MAN_SUFFIX) .man
.man.$(APP_MAN_SUFFIX):
- sed $(MAN_SUBSTS) < $< > $@
+ $(AM_V_GEN)$(SED) $(MAN_SUBSTS) < $< > $@
diff --git a/configure.ac b/configure.ac
index 5b64c31..6b189a0 100644
--- a/configure.ac
+++ b/configure.ac
@@ -25,9 +25,10 @@ AC_INIT(xdriinfo, [1.0.2], [https://bugs.freedesktop.org/enter_bug.cgi?product=x
AM_INIT_AUTOMAKE([dist-bzip2])
AM_MAINTAINER_MODE
-# 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 1.3 or later: XORG_DEFAULT_OPTIONS
+m4_ifndef([XORG_MACROS_VERSION],
+ [m4_fatal([must install xorg-macros 1.3 or later before running autoconf/autogen])])
+XORG_MACROS_VERSION(1.3)
AM_CONFIG_HEADER(config.h)
@@ -36,11 +37,10 @@ AC_PROG_INSTALL
AC_TYPE_SIGNAL
-XORG_CWARNFLAGS
+XORG_DEFAULT_OPTIONS
# Checks for pkg-config packages
PKG_CHECK_MODULES(XDRIINFO, x11 glproto)
-XDRIINFO_CFLAGS="$CWARNFLAGS $XDRIINFO_CFLAGS"
AC_SUBST(XDRIINFO_CFLAGS)
AC_SUBST(XDRIINFO_LIBS)
@@ -49,9 +49,4 @@ AC_SEARCH_LIBS([glXGetProcAddressARB], [GL], [],
AC_MSG_FAILURE([cannot find GL library - make sure Mesa or other OpenGL package is installed]),
[$XDRIINFO_LIBS])
-
-XORG_MANPAGE_SECTIONS
-XORG_RELEASE_VERSION
-XORG_CHANGELOG
-
AC_OUTPUT([Makefile])