diff options
| author | Alan Coopersmith <alan.coopersmith@sun.com> | 2009-10-16 19:58:59 -0700 |
|---|---|---|
| committer | Alan Coopersmith <alan.coopersmith@sun.com> | 2009-10-16 19:58:59 -0700 |
| commit | 06525a61829053f5aed23efb61046b1a1efb5b79 (patch) | |
| tree | 3188639af17bf6b1fb60cc4c2b085a57d9ee5973 | |
| parent | ff06ff5f6eadfa1a6b4c25198b8965e38a260e63 (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 | 15 |
2 files changed, 7 insertions, 12 deletions
diff --git a/Makefile.am b/Makefile.am index a5ac242..36b1129 100644 --- a/Makefile.am +++ b/Makefile.am @@ -21,7 +21,7 @@ bin_PROGRAMS = xwd -xwd_CFLAGS = $(XWD_CFLAGS) +AM_CFLAGS = $(CWARNFLAGS) $(XWD_CFLAGS) xwd_LDADD = $(XWD_LIBS) xwd_SOURCES = \ @@ -69,7 +69,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 68a033e..746a077 100644 --- a/configure.ac +++ b/configure.ac @@ -26,26 +26,21 @@ AC_INIT(xwd,[1.0.2], [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],x 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) +# 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) AM_CONFIG_HEADER(config.h) AC_PROG_CC -AM_PROG_CC_C_O AC_PROG_INSTALL -XORG_CWARNFLAGS +XORG_DEFAULT_OPTIONS # Checks for pkg-config packages PKG_CHECK_MODULES(XWD, x11) -XWD_CFLAGS="$CWARNFLAGS $XWD_CFLAGS" AC_SUBST(XWD_CFLAGS) AC_SUBST(XWD_LIBS) -XORG_MANPAGE_SECTIONS -XORG_RELEASE_VERSION -XORG_CHANGELOG - AC_OUTPUT([Makefile]) |