diff options
| author | Alan Coopersmith <alan.coopersmith@sun.com> | 2009-10-12 16:06:55 -0700 |
|---|---|---|
| committer | Alan Coopersmith <alan.coopersmith@sun.com> | 2009-10-12 16:06:55 -0700 |
| commit | 28b34ed17506540a793a85e03c01a7b4d9aa3588 (patch) | |
| tree | 724ee328a4f95fe2ff674d1bf97495b300abaa5f | |
| parent | b6837aadf7a2c30fb8c2c811d45c48047e0769e8 (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 a7fe6dd..d412813 100644 --- a/Makefile.am +++ b/Makefile.am @@ -21,7 +21,7 @@ bin_PROGRAMS = xwininfo -AM_CFLAGS = $(XWININFO_CFLAGS) +AM_CFLAGS = $(CWARNFLAGS) $(XWININFO_CFLAGS) xwininfo_LDADD = $(XWININFO_LIBS) xwininfo_SOURCES = \ @@ -72,4 +72,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 a524275..c1a593b 100644 --- a/configure.ac +++ b/configure.ac @@ -26,27 +26,23 @@ AC_INIT(xwininfo,[1.0.4], [https://bugs.freedesktop.org/enter_bug.cgi?product=xo 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 AC_CHECK_FUNCS([strlcat]) # Checks for pkg-config packages PKG_CHECK_MODULES(XWININFO, xext x11) -XWININFO_CFLAGS="$CWARNFLAGS $XWININFO_CFLAGS" AC_SUBST(XWININFO_CFLAGS) AC_SUBST(XWININFO_LIBS) -XORG_MANPAGE_SECTIONS -XORG_RELEASE_VERSION -XORG_CHANGELOG - AC_OUTPUT([Makefile]) |