diff options
| author | Alan Coopersmith <alan.coopersmith@sun.com> | 2009-10-05 20:38:40 -0700 |
|---|---|---|
| committer | Alan Coopersmith <alan.coopersmith@sun.com> | 2009-10-05 20:38:40 -0700 |
| commit | 20a3ff72337c689ca46f140e594933df75d2bce4 (patch) | |
| tree | 6c3ed50a21e4c9453d216a35717c34e6500e4f9c | |
| parent | 4da097462b0b899e1790fd5a5f5e8ec811623c3d (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, 6 insertions, 11 deletions
diff --git a/Makefile.am b/Makefile.am index 6d07e32..fd2a103 100644 --- a/Makefile.am +++ b/Makefile.am @@ -21,7 +21,7 @@ bin_PROGRAMS = xmodmap -AM_CFLAGS = $(XMODMAP_CFLAGS) +AM_CFLAGS = $(CWARNFLAGS) $(XMODMAP_CFLAGS) xmodmap_LDADD = $(XMODMAP_LIBS) xmodmap_SOURCES = \ @@ -72,7 +72,7 @@ MAN_SUBSTS = \ SUFFIXES = .$(APP_MAN_SUFFIX) .man .man.$(APP_MAN_SUFFIX): - sed $(MAN_SUBSTS) < $< > $@ + $(AM_V_GEN)$(SED) $(MAN_SUBSTS) < $< > $@ MAINTAINERCLEANFILES = ChangeLog diff --git a/configure.ac b/configure.ac index 6f8dca5..7bb552c 100644 --- a/configure.ac +++ b/configure.ac @@ -26,30 +26,25 @@ AC_INIT(xmodmap,[1.0.3], [https://bugs.freedesktop.org/enter_bug.cgi?product=xor 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: XORG_DEFAULT_OPTIONS +m4_ifndef([XORG_MACROS_VERSION], [AC_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 AC_CHECK_FUNCS([strncasecmp]) # Checks for pkg-config packages PKG_CHECK_MODULES(XMODMAP, x11) -XMODMAP_CFLAGS="$CWARNFLAGS $XMODMAP_CFLAGS" AC_SUBST(XMODMAP_CFLAGS) AC_SUBST(XMODMAP_LIBS) dnl Allow checking code with lint, sparse, etc. XORG_WITH_LINT -XORG_MANPAGE_SECTIONS -XORG_RELEASE_VERSION -XORG_CHANGELOG - AC_OUTPUT([Makefile]) |