[PATCH xcursorgen 2/2] Use AC_PROG_SED and MAN_SUBSTS in macros-1.8

[Yaakov (Cygwin/X)]

From: Yaakov Selkowitz <yselkowitz at users.sourceforge.net>

Signed-off-by: Yaakov Selkowitz <yselkowitz at users.sourceforge.net>
---
 Makefile.am  |   11 +----------
 configure.ac |    6 +++---
 2 files changed, 4 insertions(+), 13 deletions(-)

diff --git a/Makefile.am b/Makefile.am
index 8647caa..75e7a33 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -25,16 +25,7 @@ ChangeLog:
 
 dist-hook: ChangeLog INSTALL
 
-# Strings to replace in man pages
-XORGRELSTRING = @PACKAGE_STRING@
-  XORGMANNAME = X Version 11
-
-SED = sed
-
-MAN_SUBSTS = \
-	-e 's|__vendorversion__|"$(XORGRELSTRING)" "$(XORGMANNAME)"|' \
-	-e 's|__appmansuffix__|$(APP_MAN_SUFFIX)|g' \
-	-e 's|__libmansuffix__|$(LIB_MAN_SUFFIX)|g'
+# String replacements in MAN_SUBSTS now come from xorg-macros.m4 via configure
 
 SUFFIXES = .$(APP_MAN_SUFFIX) .man
 
diff --git a/configure.ac b/configure.ac
index 7a57230..adb24e1 100644
--- a/configure.ac
+++ b/configure.ac
@@ -5,10 +5,10 @@ AC_INIT(xcursorgen, [1.0.3], [https://bugs.freedesktop.org/enter_bug.cgi?product
 AM_INIT_AUTOMAKE([foreign dist-bzip2])
 AM_MAINTAINER_MODE
 
-# Require xorg-macros 1.3 or later: XORG_DEFAULT_OPTIONS
+# Require xorg-macros 1.8 or later: 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)
 
 AM_CONFIG_HEADER(config.h)
 
-- 
1.7.1