diff options
| author | Alan Coopersmith <alan.coopersmith@sun.com> | 2009-10-10 22:07:44 -0700 |
|---|---|---|
| committer | Alan Coopersmith <alan.coopersmith@sun.com> | 2009-10-10 22:07:44 -0700 |
| commit | c2abfbb9ea21bec53706295064c328e5d2721abd (patch) | |
| tree | ad2f84d830212730668ba2aefc3f6a6d06c753c2 | |
| parent | f3bbd454d8220a0c30c1a788965a7f16501350ab (diff) | |
Migrate to xorg macros 1.3 & XORG_DEFAULT_OPTIONS
Signed-off-by: Alan Coopersmith <alan.coopersmith@sun.com>
| -rw-r--r-- | Makefile.am | 2 | ||||
| -rw-r--r-- | configure.ac | 13 |
2 files changed, 6 insertions, 9 deletions
diff --git a/Makefile.am b/Makefile.am index 42747fc..91893c4 100644 --- a/Makefile.am +++ b/Makefile.am @@ -49,7 +49,7 @@ MAN_SUBSTS = \ SUFFIXES = .$(APP_MAN_SUFFIX) .man .man.$(APP_MAN_SUFFIX): - sed $(MAN_SUBSTS) < $< > $@ + $(AM_V_GEN)$(SED) $(MAN_SUBSTS) < $< > $@ EXTRA_DIST += ChangeLog MAINTAINERCLEANFILES = ChangeLog diff --git a/configure.ac b/configure.ac index 6a82b03..de8ba85 100644 --- a/configure.ac +++ b/configure.ac @@ -3,13 +3,14 @@ AC_INIT([makedepend], [1.0.1], [https://bugs.freedesktop.org/enter_bug.cgi?produ AM_INIT_AUTOMAKE([foreign dist-bzip2]) AM_CONFIG_HEADER([makedepend-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 1.3 or later: XORG_DEFAULT_OPTIONS, XORG_WITH_LINT +m4_ifndef([XORG_MACROS_VERSION], + [m4_fatal([must install xorg-macros 1.3 or later before running autoconf/autogen])]) +XORG_MACROS_VERSION(1.3) dnl Checks for programs. AC_PROG_CC -XORG_CWARNFLAGS +XORG_DEFAULT_OPTIONS XORG_WITH_LINT dnl Replacement for Imake SIGNAL_DEFINES @@ -25,8 +26,4 @@ dnl Check for pkg-config packages PKG_CHECK_MODULES(X, [xproto]) AC_SUBST(X_CFLAGS) -XORG_MANPAGE_SECTIONS -XORG_RELEASE_VERSION -XORG_CHANGELOG - AC_OUTPUT([Makefile]) |