diff options
| author | Alan Coopersmith <alan.coopersmith@sun.com> | 2009-11-10 23:34:48 -0800 |
|---|---|---|
| committer | Alan Coopersmith <alan.coopersmith@sun.com> | 2009-11-10 23:34:48 -0800 |
| commit | 4ecf1e50d97afde8c5e343d6c25e5a1eb940e02c (patch) | |
| tree | c8952e7ad4f303320f79a04f390e94bd85db3049 | |
| parent | bcf318755e452925e6cc06ea564f63e846cabf38 (diff) | |
Migrate to xorg macros 1.3 & XORG_DEFAULT_OPTIONS
Signed-off-by: Alan Coopersmith <alan.coopersmith@sun.com>
| -rw-r--r-- | Makefile.am | 4 | ||||
| -rw-r--r-- | configure.ac | 18 |
2 files changed, 8 insertions, 14 deletions
diff --git a/Makefile.am b/Makefile.am index 661b9c1..faa9e99 100644 --- a/Makefile.am +++ b/Makefile.am @@ -21,7 +21,7 @@ bin_PROGRAMS = xkbprint -AM_CFLAGS = $(XKBPRINT_CFLAGS) +AM_CFLAGS = $(CWARNFLAGS) $(XKBPRINT_CFLAGS) xkbprint_LDADD = $(XKBPRINT_LIBS) xkbprint_SOURCES = \ @@ -64,7 +64,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 f9e620d..9097fe8 100644 --- a/configure.ac +++ b/configure.ac @@ -25,26 +25,20 @@ AC_PREREQ([2.57]) AC_INIT(xkbprint,[1.0.1], [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],xkbprint) 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 - # Checks for pkg-config packages PKG_CHECK_MODULES(XKBPRINT, xkbfile x11) -XKBPRINT_CFLAGS="$CWARNFLAGS $XKBPRINT_CFLAGS" AC_SUBST(XKBPRINT_CFLAGS) AC_SUBST(XKBPRINT_LIBS) -XORG_MANPAGE_SECTIONS -XORG_RELEASE_VERSION -XORG_CHANGELOG - AC_OUTPUT([Makefile]) |