diff options
| author | Alan Coopersmith <alan.coopersmith@sun.com> | 2009-10-15 16:53:48 -0700 |
|---|---|---|
| committer | Alan Coopersmith <alan.coopersmith@sun.com> | 2009-10-15 16:56:29 -0700 |
| commit | cef8c50586903e7ac543d1a8e3f84d4a78f731a4 (patch) | |
| tree | 0d748cf6815a949c7bb03a669263a87ceb3230c7 | |
| parent | 33a3c2fc886bc9ce5a0692c6c0c78903aa122ee1 (diff) | |
Migrate to xorg macros 1.3 & XORG_DEFAULT_OPTIONS
Signed-off-by: Alan Coopersmith <alan.coopersmith@sun.com>
| -rw-r--r-- | Makefile.am | 6 | ||||
| -rw-r--r-- | configure.ac | 9 |
2 files changed, 10 insertions, 5 deletions
diff --git a/Makefile.am b/Makefile.am index 0956030..babca5f 100644 --- a/Makefile.am +++ b/Makefile.am @@ -20,7 +20,7 @@ # PERFORMANCE OF THIS SOFTWARE. bin_PROGRAMS = lndir -lndir_CFLAGS = $(XPROTO_CFLAGS) +AM_CFLAGS = $(CWARNFLAGS) $(XPROTO_CFLAGS) lndir_SOURCES = lndir.c # Man page @@ -36,13 +36,15 @@ CLEANFILES = $(appman_DATA) XORGRELSTRING = @PACKAGE_STRING@ XORGMANNAME = X Version 11 +SED = sed + MAN_SUBSTS = \ -e 's|__xorgversion__|"$(XORGRELSTRING)" "$(XORGMANNAME)"|' SUFFIXES = .$(APP_MAN_SUFFIX) .man .man.$(APP_MAN_SUFFIX): - sed $(MAN_SUBSTS) < $< > $@ + $(AM_V_GEN)$(SED) $(MAN_SUBSTS) < $< > $@ EXTRA_DIST = $(appman_PRE) diff --git a/configure.ac b/configure.ac index c610e7e..db3eeb2 100644 --- a/configure.ac +++ b/configure.ac @@ -31,11 +31,14 @@ AM_CONFIG_HEADER(config.h) AC_PROG_INSTALL AC_PROG_CC +# 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) +XORG_DEFAULT_OPTIONS + # Checks for pkg-config packages PKG_CHECK_MODULES(XPROTO, xproto) AC_SUBST(XPROTO_CFLAGS) -XORG_MANPAGE_SECTIONS -XORG_RELEASE_VERSION - AC_OUTPUT([Makefile]) |