diff options
| author | Alan Coopersmith <alan.coopersmith@sun.com> | 2009-10-12 18:34:18 -0700 |
|---|---|---|
| committer | Alan Coopersmith <alan.coopersmith@sun.com> | 2009-10-12 18:34:18 -0700 |
| commit | 111206b3ad0b0536bdc8c39425f79f50665c3000 (patch) | |
| tree | c0c6fb97f7de572910c79fc994f86765f9eb10f9 | |
| parent | 492785cb489963cff20e7d20b87d33ffa5508247 (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 | 18 |
2 files changed, 8 insertions, 14 deletions
diff --git a/Makefile.am b/Makefile.am index 1038037..f39d3f9 100644 --- a/Makefile.am +++ b/Makefile.am @@ -21,7 +21,7 @@ bin_PROGRAMS = xbiff -xbiff_CFLAGS = $(XBIFF_CFLAGS) -D_BSD_SOURCE +AM_CFLAGS = $(CWARNFLAGS) $(XBIFF_CFLAGS) -D_BSD_SOURCE xbiff_LDADD = $(XBIFF_LIBS) xbiff_SOURCES = \ @@ -64,7 +64,7 @@ MAN_SUBSTS = \ SUFFIXES = .$(APP_MAN_SUFFIX) .man .man.$(APP_MAN_SUFFIX): - sed $(MAN_SUBSTS) < $< > $@ + $(AM_V_GEN)$(SED) $(MAN_SUBSTS) < $< > $@ EXTRA_DIST += ChangeLog MAINTAINERCLEANFILES = ChangeLog diff --git a/configure.ac b/configure.ac index 6954f9d..47d22bd 100644 --- a/configure.ac +++ b/configure.ac @@ -26,27 +26,21 @@ AC_INIT(xbiff,[1.0.1], [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 -PKG_CHECK_MODULES(XAW, xaw7) -PKG_CHECK_MODULES(XBIFF, xbitmaps xext) +XORG_DEFAULT_OPTIONS -XBIFF_CFLAGS="$CWARNFLAGS $XBIFF_CFLAGS $XAW_CFLAGS" -XBIFF_LIBS="$XBIFF_LIBS $XAW_LIBS" +PKG_CHECK_MODULES(XBIFF, xaw7 xbitmaps xext) AC_SUBST(XBIFF_CFLAGS) AC_SUBST(XBIFF_LIBS) -XORG_MANPAGE_SECTIONS -XORG_RELEASE_VERSION -XORG_CHANGELOG - AC_OUTPUT([Makefile]) |