diff options
| author | Alan Coopersmith <alan.coopersmith@sun.com> | 2009-10-12 21:27:45 -0700 |
|---|---|---|
| committer | Alan Coopersmith <alan.coopersmith@sun.com> | 2009-10-12 21:27:45 -0700 |
| commit | 253b668caf6851db8855f5a1a0c0533a9353a058 (patch) | |
| tree | 392ce475a28d46c804f4dd7a0aa16dee0b4a36d2 | |
| parent | 82e8cbf94c3dee247ebf2e93378e5bb5a90b101d (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 85da618..20f34ce 100644 --- a/Makefile.am +++ b/Makefile.am @@ -21,7 +21,7 @@ bin_PROGRAMS = xsetpointer -xsetpointer_CFLAGS = $(XSETPOINTER_CFLAGS) +AM_CFLAGS = $(CWARNFLAGS) $(XSETPOINTER_CFLAGS) xsetpointer_LDADD = $(XSETPOINTER_LIBS) xsetpointer_SOURCES = \ @@ -66,4 +66,4 @@ MAN_SUBSTS = \ SUFFIXES = .$(APP_MAN_SUFFIX) .man .man.$(APP_MAN_SUFFIX): - sed $(MAN_SUBSTS) < $< > $@ + $(AM_V_GEN)$(SED) $(MAN_SUBSTS) < $< > $@ diff --git a/configure.ac b/configure.ac index 3e38ada..7c25b09 100644 --- a/configure.ac +++ b/configure.ac @@ -26,25 +26,21 @@ AC_INIT(xsetpointer,[1.0.1], [https://bugs.freedesktop.org/enter_bug.cgi?product 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 # Checks for pkg-config packages PKG_CHECK_MODULES(XSETPOINTER, xi x11 [inputproto >= 1.4]) -XSETPOINTER_CFLAGS="$CWARNFLAGS $XSETPOINTER_CFLAGS" AC_SUBST(XSETPOINTER_CFLAGS) AC_SUBST(XSETPOINTER_LIBS) -XORG_MANPAGE_SECTIONS -XORG_RELEASE_VERSION -XORG_CHANGELOG - AC_OUTPUT([Makefile]) |