diff options
| author | Alan Coopersmith <alan.coopersmith@sun.com> | 2009-10-06 14:19:57 -0700 |
|---|---|---|
| committer | Alan Coopersmith <alan.coopersmith@sun.com> | 2009-10-06 14:21:33 -0700 |
| commit | 59557a6f4a28f38edcb6251ac04c9cb0e582bb3e (patch) | |
| tree | d2db959b6748dbd90f5cf51e878b9b8294dc7cb8 | |
| parent | 032e3cb6c41c720412ab3403dad2ab800f45a817 (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 fe23e34..6fd9a43 100644 --- a/Makefile.am +++ b/Makefile.am @@ -76,7 +76,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 90d0e6f..962bcaf 100644 --- a/configure.ac +++ b/configure.ac @@ -26,11 +26,12 @@ AC_INIT(font-util, [1.0.2], [https://bugs.freedesktop.org/enter_bug.cgi?product= AM_INIT_AUTOMAKE([foreign 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], [AC_FATAL([must install xorg-macros 1.3 or later before running autoconf/autogen])]) +XORG_MACROS_VERSION(1.3) AM_CONFIG_HEADER(config.h) -XORG_CWARNFLAGS + +XORG_DEFAULT_OPTIONS AC_PROG_CC AC_PROG_INSTALL @@ -41,8 +42,4 @@ AC_ARG_WITH(mapdir, AC_HELP_STRING([--with-mapdir=<pathname>], MAPDIR="$mapdir" AC_SUBST(MAPDIR) -XORG_MANPAGE_SECTIONS -XORG_RELEASE_VERSION -XORG_CHANGELOG - AC_OUTPUT([Makefile fontutil.pc]) |