diff options
| author | Alan Coopersmith <alan.coopersmith@sun.com> | 2009-10-16 19:42:32 -0700 |
|---|---|---|
| committer | Alan Coopersmith <alan.coopersmith@sun.com> | 2009-10-16 19:42:32 -0700 |
| commit | 232bd12671f129df0fbcd84e750cbd7a397612bd (patch) | |
| tree | b77d895b2a73e5d15cfe510883f2f1acb845300d | |
| parent | 82012961e5cee55a2dde8254325642f46b6449e2 (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 | 16 |
2 files changed, 9 insertions, 11 deletions
diff --git a/Makefile.am b/Makefile.am index fc53df7..8402b28 100644 --- a/Makefile.am +++ b/Makefile.am @@ -21,7 +21,7 @@ bin_PROGRAMS = xvinfo -AM_CFLAGS = $(XVINFO_CFLAGS) +AM_CFLAGS = $(CWARNFLAGS) $(XVINFO_CFLAGS) xvinfo_LDADD = $(XVINFO_LIBS) xvinfo_SOURCES = \ @@ -68,4 +68,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 c00fa39..ecfb4e3 100644 --- a/configure.ac +++ b/configure.ac @@ -26,23 +26,21 @@ AC_INIT(xvinfo,[1.0.2], [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 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(XVINFO, xv x11) -XVINFO_CFLAGS="$CWARNFLAGS $XVINFO_CFLAGS" AC_SUBST(XVINFO_CFLAGS) AC_SUBST(XVINFO_LIBS) -XORG_MANPAGE_SECTIONS -XORG_RELEASE_VERSION -XORG_CHANGELOG - AC_OUTPUT([Makefile]) |