summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--Makefile.am2
-rw-r--r--configure.ac12
2 files changed, 5 insertions, 9 deletions
diff --git a/Makefile.am b/Makefile.am
index 7bbf2e6..b64a0af 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -112,7 +112,7 @@ MAN_SUBSTS = \
SUFFIXES = .$(APP_MAN_SUFFIX) .man
.man.$(APP_MAN_SUFFIX):
- sed $(MAN_SUBSTS) < $< > $@
+ $(AM_V_GEN)$(SED) $(MAN_SUBSTS) < $< > $@
if LINT
# Check source code with tools like lint & sparse
diff --git a/configure.ac b/configure.ac
index 9f1a922..9d1b513 100644
--- a/configure.ac
+++ b/configure.ac
@@ -37,12 +37,12 @@ AM_MAINTAINER_MODE
AM_CONFIG_HEADER(config.h)
-# Require xorg-macros: XORG_CWARNFLAGS, XORG_CHANGELOG, XORG_WITH_LINT
-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, XORG_WITH_LINT
+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
-XORG_CWARNFLAGS
+XORG_DEFAULT_OPTIONS
AC_PROG_INSTALL
dnl Issue an error if xtrans.m4 was not found and XTRANS_CONNECTION_FLAGS macro
@@ -63,10 +63,6 @@ XSCOPE_CFLAGS="$XSCOPE_CFLAGS -DUSE_XTRANS"
AC_SUBST(XSCOPE_CFLAGS)
AC_SUBST(XSCOPE_LIBS)
-XORG_MANPAGE_SECTIONS
-XORG_RELEASE_VERSION
-XORG_CHANGELOG
-
dnl Allow checking code with lint, sparse, etc.
XORG_WITH_LINT