diff options
| author | Alan Coopersmith <alan.coopersmith@sun.com> | 2009-10-08 23:29:51 -0700 |
|---|---|---|
| committer | Alan Coopersmith <alan.coopersmith@sun.com> | 2009-10-08 23:29:51 -0700 |
| commit | fbb3903875623c329c03772a7b3661f1362fcbfa (patch) | |
| tree | 002bbd3f469da8201c2b636a8b4c62f0853c98e5 | |
| parent | 71365724dd22b932bea4af3fb6bcc3ff53eb1910 (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 | 14 |
2 files changed, 7 insertions, 11 deletions
diff --git a/Makefile.am b/Makefile.am index 6f297ef..c9e3e6b 100644 --- a/Makefile.am +++ b/Makefile.am @@ -21,7 +21,7 @@ bin_PROGRAMS = xdbedizzy -xdbedizzy_CFLAGS = $(XDBEDIZZY_CFLAGS) $(EXTRA) +AM_CFLAGS = $(CWARNFLAGS) $(XDBEDIZZY_CFLAGS) $(EXTRA) xdbedizzy_LDADD = $(XDBEDIZZY_LIBS) -lm xdbedizzy_SOURCES = \ @@ -61,7 +61,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 64de6c2..2ae2c84 100644 --- a/configure.ac +++ b/configure.ac @@ -26,24 +26,20 @@ AC_INIT(xdbedizzy,[1.0.2], [https://bugs.freedesktop.org/enter_bug.cgi?product=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 AC_PROG_INSTALL -XORG_CWARNFLAGS +XORG_DEFAULT_OPTIONS PKG_CHECK_MODULES(XDBEDIZZY, xext x11) -XDBEDIZZY_CFLAGS="$CWARNFLAGS $XDBEDIZZY_CFLAGS" AC_SUBST(XDBEDIZZY_CFLAGS) AC_SUBST(XDBEDIZZY_LIBS) -XORG_MANPAGE_SECTIONS -XORG_RELEASE_VERSION -XORG_CHANGELOG - AC_OUTPUT([Makefile]) |