diff options
| author | Alan Coopersmith <alan.coopersmith@sun.com> | 2009-10-01 18:01:27 -0700 |
|---|---|---|
| committer | Alan Coopersmith <alan.coopersmith@sun.com> | 2009-10-01 18:02:11 -0700 |
| commit | 61bb775852796628207a5062d8fdd8bcd6ec77bd (patch) | |
| tree | 197d02e294430f05445985c0bb3ccf55a4b28842 | |
| parent | 8f9d685e4bb91640fb01392c6d73e7d9e365b41b (diff) | |
Migrate to xorg macros 1.3 & XORG_DEFAULT_OPTIONS
Signed-off-by: Alan Coopersmith <alan.coopersmith@sun.com>
| -rw-r--r-- | Makefile.am | 5 | ||||
| -rw-r--r-- | configure.ac | 14 |
2 files changed, 8 insertions, 11 deletions
diff --git a/Makefile.am b/Makefile.am index 01b86a8..6dc2a07 100644 --- a/Makefile.am +++ b/Makefile.am @@ -23,7 +23,8 @@ bin_PROGRAMS = luit LOCALEALIASFILE = @LOCALEALIASFILE@ -AM_CFLAGS = $(LUIT_CFLAGS) -DLOCALE_ALIAS_FILE=\"$(LOCALEALIASFILE)\" +AM_CFLAGS = $(CWARNFLAGS) $(LUIT_CFLAGS) \ + -DLOCALE_ALIAS_FILE=\"$(LOCALEALIASFILE)\" luit_LDADD = $(LUIT_LIBS) luit_SOURCES = \ @@ -84,4 +85,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 a05c0f0..b9ca6fc 100644 --- a/configure.ac +++ b/configure.ac @@ -26,9 +26,9 @@ AC_INIT(luit,[1.0.3], [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], 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) @@ -36,7 +36,7 @@ AC_PROG_CC AC_PROG_INSTALL AC_CANONICAL_HOST -XORG_CWARNFLAGS +XORG_DEFAULT_OPTIONS AC_CHECK_HEADERS([poll.h pty.h stropts.h sys/param.h sys/select.h]) AC_CHECK_FUNCS([poll select grantpt]) @@ -62,12 +62,8 @@ case $host_os in ;; esac -LUIT_CFLAGS="$CWARNFLAGS $LUIT_CFLAGS $OS_CFLAGS" +LUIT_CFLAGS="$LUIT_CFLAGS $OS_CFLAGS" AC_SUBST(LUIT_CFLAGS) AC_SUBST(LUIT_LIBS) -XORG_MANPAGE_SECTIONS -XORG_RELEASE_VERSION -XORG_CHANGELOG - AC_OUTPUT([Makefile]) |