diff options
| author | Alan Coopersmith <alan.coopersmith@oracle.com> | 2010-10-30 13:21:14 -0700 |
|---|---|---|
| committer | Alan Coopersmith <alan.coopersmith@oracle.com> | 2010-10-30 13:21:14 -0700 |
| commit | de168a959e2b06eea53d14b536d9e53c4758b79a (patch) | |
| tree | 420692ad69686cda7a6c092c7fd9fe79226fe012 | |
| parent | 23565e2abdf835262fce10129af6bb9e40139d0b (diff) | |
config: upgrade to util-macros 1.8 for additional man page support
Use MAN_SUBST now supplied in XORG_MANPAGE_SECTIONS
The value of MAN_SUBST is the same for all X.Org packages.
Use AC_PROG_SED now supplied by XORG_DEFAULT_OPTIONS
The existing statement can now be removed from the configuration file.
Use automake provided $(AM_V_GEN) and XORG_DEFAULT_OPTIONS provided $(SED)
Enables silent rule and use platform appropriate version of sed.
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
| -rw-r--r-- | Makefile.am | 22 | ||||
| -rw-r--r-- | configure.ac | 11 |
2 files changed, 5 insertions, 28 deletions
diff --git a/Makefile.am b/Makefile.am index 4d5ec45..839a8b3 100644 --- a/Makefile.am +++ b/Makefile.am @@ -58,29 +58,11 @@ appman_DATA = $(appman_PRE:man=@APP_MAN_SUFFIX@) EXTRA_DIST += $(appman_PRE) CLEANFILES += $(appman_DATA) -SED = sed - -# Strings to replace in man pages -XORGRELSTRING = @PACKAGE_STRING@ - XORGMANNAME = X Version 11 - -MAN_SUBSTS = \ - -e 's|__vendorversion__|"$(XORGRELSTRING)" "$(XORGMANNAME)"|' \ - -e 's|__xorgversion__|"$(XORGRELSTRING)" "$(XORGMANNAME)"|' \ - -e 's|__xservername__|Xorg|g' \ - -e 's|__xconfigfile__|xorg.conf|g' \ - -e 's|__projectroot__|$(prefix)|g' \ - -e 's|__apploaddir__|$(appdefaultdir)|' \ - -e 's|__appmansuffix__|$(APP_MAN_SUFFIX)|g' \ - -e 's|__libmansuffix__|$(LIB_MAN_SUFFIX)|g' \ - -e 's|__adminmansuffix__|$(ADMIN_MAN_SUFFIX)|g' \ - -e 's|__miscmansuffix__|$(MISC_MAN_SUFFIX)|g' \ - -e 's|__filemansuffix__|$(FILE_MAN_SUFFIX)|g' - SUFFIXES = .$(APP_MAN_SUFFIX) .man +# String replacements in MAN_SUBSTS now come from xorg-macros.m4 via configure .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 ff902ea..cf257a5 100644 --- a/configure.ac +++ b/configure.ac @@ -26,10 +26,10 @@ AC_INIT(proxymngr,[1.0.1], [https://bugs.freedesktop.org/enter_bug.cgi?product=x AM_INIT_AUTOMAKE([dist-bzip2]) AM_MAINTAINER_MODE -# Require xorg-macros: XORG_DEFAULT_OPTIONS +# Require X.Org macros 1.8 or later for MAN_SUBSTS set by XORG_MANPAGE_SECTIONS m4_ifndef([XORG_MACROS_VERSION], - [m4_fatal([must install xorg-macros 1.3 or later before running autoconf/autogen])]) -XORG_MACROS_VERSION(1.3) + [m4_fatal([must install xorg-macros 1.8 or later before running autoconf/autogen])]) +XORG_MACROS_VERSION(1.8) XORG_DEFAULT_OPTIONS # The program itself has a header called config.h so @@ -43,11 +43,6 @@ if [[ -z $LBXPROXY ]] ; then AC_MSG_ERROR([lbxproxy is needed]) fi -AC_PATH_PROG(SED, sed) -if [[ -z $SED ]] ; then - AC_MSG_ERROR([sed is needed]) -fi - # Checks for pkg-config packages PKG_CHECK_MODULES(PROXYMNGR, ice xt x11 xproxymngproto) PROXYMNGR_CFLAGS="$CWARNFLAGS $PROXYMNGR_CFLAGS" |