[PATCH macros] linuxdoc: Use XORG_WITH_PS2PDF to check for ps2pdf

Yaakov (Cygwin/X) yselkowitz at users.sourceforge.net
Tue Apr 13 10:55:27 PDT 2010


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

Besides reusing existing code, this allows linuxdoc PDF output to be
enabled or disabled by configure.

Signed-off-by: Yaakov Selkowitz <yselkowitz at users.sourceforge.net>
---
 xorg-macros.m4.in |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/xorg-macros.m4.in b/xorg-macros.m4.in
index 916b472..412ee66 100644
--- a/xorg-macros.m4.in
+++ b/xorg-macros.m4.in
@@ -213,9 +213,9 @@ AC_SUBST(XORG_SGML_PATH)
 # with the AM_CONDITIONAL "BUILD_LINUXDOC"
 AC_DEFUN([XORG_CHECK_LINUXDOC],[
 AC_REQUIRE([XORG_CHECK_SGML_DOCTOOLS])
+AC_REQUIRE([XORG_WITH_PS2PDF])
 
 AC_PATH_PROG(LINUXDOC, linuxdoc)
-AC_PATH_PROG(PS2PDF, ps2pdf)
 
 AC_MSG_CHECKING([whether to build documentation])
 
@@ -231,7 +231,7 @@ AC_MSG_RESULT([$BUILDDOC])
 
 AC_MSG_CHECKING([whether to build pdf documentation])
 
-if test x$PS2PDF != x && test x$BUILD_PDFDOC != xno; then
+if test x$have_ps2pdf != xno && test x$BUILD_PDFDOC != xno; then
    BUILDPDFDOC=yes
 else
    BUILDPDFDOC=no
-- 
1.6.6.1



More information about the xorg-devel mailing list