diff options
author | Alan Coopersmith <alan.coopersmith@sun.com> | 2009-10-16 19:32:06 -0700 |
---|---|---|
committer | Alan Coopersmith <alan.coopersmith@sun.com> | 2009-10-16 19:32:06 -0700 |
commit | d8ec58af0f62076805bd6b691e284bcd2176724b (patch) | |
tree | 9d94b057b2eade90f0fffcc864e2c48999755afc | |
parent | cc4216ff1f17c97fb5aa1a9a5f58e2574ca8af0b (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 | 13 |
2 files changed, 7 insertions, 10 deletions
diff --git a/Makefile.am b/Makefile.am index 9863fb9..f0e23bb 100644 --- a/Makefile.am +++ b/Makefile.am @@ -21,7 +21,7 @@ bin_PROGRAMS = xsetroot -AM_CFLAGS = $(XSETROOT_CFLAGS) +AM_CFLAGS = $(CWARNFLAGS) $(XSETROOT_CFLAGS) xsetroot_LDADD = $(XSETROOT_LIBS) xsetroot_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) < $< > $@ if LINT ALL_LINT_FLAGS=$(LINT_FLAGS) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ diff --git a/configure.ac b/configure.ac index 2ca2ddd..b33e47c 100644 --- a/configure.ac +++ b/configure.ac @@ -26,26 +26,23 @@ AC_INIT(xsetroot,[1.0.2], [https://bugs.freedesktop.org/enter_bug.cgi?product=xo AM_INIT_AUTOMAKE([dist-bzip2]) AM_MAINTAINER_MODE -# Require xorg-macros: XORG_WITH_LINT, 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 # Checks for pkg-config packages PKG_CHECK_MODULES(XSETROOT, xmuu x11 xbitmaps) -XSETROOT_CFLAGS="$CWARNFLAGS $XSETROOT_CFLAGS" AC_SUBST(XSETROOT_CFLAGS) AC_SUBST(XSETROOT_LIBS) XORG_WITH_LINT -XORG_MANPAGE_SECTIONS -XORG_RELEASE_VERSION -XORG_CHANGELOG AC_OUTPUT([Makefile]) |