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>

diff --git a/configure.ac b/configure.ac
index 0625a9f..5e3c565 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -4,10 +4,10 @@ AC_INIT(libXxf86vm, 1.1.0, [https://bugs.freedesktop.org/enter_bug.cgi?product=x
 AM_INIT_AUTOMAKE([foreign 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
 AM_CONFIG_HEADER(src/config.h)
 

diff --git a/man/Makefile.am b/man/Makefile.am
index 5ca33d1..e0c5cb7 100644 (file)
--- a/man/Makefile.am
+++ b/man/Makefile.am
@@ -36,24 +36,11 @@ CLEANFILES = $(libman_DATA) $(BUILT_SOURCES)
 libman_DATA = $(libman_PRE:man=@LIB_MAN_SUFFIX@) \
              $(XF86VM_shadows:=.@LIB_MAN_SUFFIX@)
 
-SED = sed
-
-# Strings to replace in man pages
-XORGRELSTRING = @PACKAGE_STRING@
-  XORGMANNAME = X Version 11
-
-MAN_SUBSTS = \
-       -e 's/__vendorversion__/"$(XORGRELSTRING)" "$(XORGMANNAME)"/' \
-       -e 's/__xservername__/Xorg/g' \
-       -e 's/__xconfigfile__/xorg.conf/g' \
-       -e 's/__appmansuffix__/$(APP_MAN_SUFFIX)/g' \
-       -e 's/__libmansuffix__/$(LIB_MAN_SUFFIX)/g' \
-       -e 's/__filemansuffix__/$(FILE_MAN_SUFFIX)/g'
-
+# String replacements in MAN_SUBSTS now come from xorg-macros.m4 via configure
 SUFFIXES = .$(LIB_MAN_SUFFIX) .man
 
 .man.$(LIB_MAN_SUFFIX):
-       sed $(MAN_SUBSTS) < $< > $@
+       $(AM_V_GEN)$(SED) $(MAN_SUBSTS) < $< > $@
 
 # Generate man page shadow files (Replaces InstallManPageAliases from Imake)