diff options
| author | Alan Coopersmith <alan.coopersmith@sun.com> | 2009-11-20 22:45:52 -0800 |
|---|---|---|
| committer | Alan Coopersmith <alan.coopersmith@sun.com> | 2009-11-20 22:45:52 -0800 |
| commit | f9419e37d1f1bb35c1a84d797b4bd61e5e7fea65 (patch) | |
| tree | 25c6c40f92d23c2660a2d6f9d2ad04eccd412f8f | |
| parent | c83234dbf6d6a9744f9dc8a13533c0dfd3700bf3 (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 | 17 |
2 files changed, 7 insertions, 12 deletions
diff --git a/Makefile.am b/Makefile.am index 58a6a8d..d57c356 100644 --- a/Makefile.am +++ b/Makefile.am @@ -84,7 +84,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 998f196..fa7582e 100644 --- a/configure.ac +++ b/configure.ac @@ -25,18 +25,17 @@ AC_PREREQ([2.57]) AC_INIT(rgb,[1.0.3],[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],rgb) 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) - AM_CONFIG_HEADER(config.h) +# 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) +XORG_DEFAULT_OPTIONS + AC_PROG_CC AC_PROG_INSTALL -XORG_CWARNFLAGS - PKG_CHECK_MODULES(RGB, xproto) AC_MSG_CHECKING([for rgb database location]) @@ -98,8 +97,4 @@ AM_CONDITIONAL(RGB_DB, [test x$db_type != xtext]) RGB_CFLAGS="$CWARNFLAGS $RGB_CFLAGS" AC_SUBST(RGB_CFLAGS) -XORG_MANPAGE_SECTIONS -XORG_RELEASE_VERSION -XORG_CHANGELOG - AC_OUTPUT([Makefile]) |