From 61d0ff7edd06c91ec1ffe3e2976eacd3df92680c Mon Sep 17 00:00:00 2001 From: Matthias Clasen Date: Sat, 14 Feb 2004 01:04:47 +0000 Subject: [PATCH] Suppress xsltproc and xmlcatalog checks if enable_man=no. (#134091, Julio Sat Feb 14 02:08:03 2004 Matthias Clasen * configure.in: Suppress xsltproc and xmlcatalog checks if enable_man=no. (#134091, Julio M. Merino Vidal) --- ChangeLog | 5 +++++ ChangeLog.pre-2-10 | 5 +++++ ChangeLog.pre-2-12 | 5 +++++ ChangeLog.pre-2-4 | 5 +++++ ChangeLog.pre-2-6 | 5 +++++ ChangeLog.pre-2-8 | 5 +++++ configure.in | 18 +++++++++++------- 7 files changed, 41 insertions(+), 7 deletions(-) diff --git a/ChangeLog b/ChangeLog index cc1641a9e..dfd9e4e95 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +Sat Feb 14 02:08:03 2004 Matthias Clasen + + * configure.in: Suppress xsltproc and xmlcatalog checks + if enable_man=no. (#134091, Julio M. Merino Vidal) + Sat Feb 14 01:21:34 2004 Matthias Clasen * glib/gmain.h: diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index cc1641a9e..dfd9e4e95 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,3 +1,8 @@ +Sat Feb 14 02:08:03 2004 Matthias Clasen + + * configure.in: Suppress xsltproc and xmlcatalog checks + if enable_man=no. (#134091, Julio M. Merino Vidal) + Sat Feb 14 01:21:34 2004 Matthias Clasen * glib/gmain.h: diff --git a/ChangeLog.pre-2-12 b/ChangeLog.pre-2-12 index cc1641a9e..dfd9e4e95 100644 --- a/ChangeLog.pre-2-12 +++ b/ChangeLog.pre-2-12 @@ -1,3 +1,8 @@ +Sat Feb 14 02:08:03 2004 Matthias Clasen + + * configure.in: Suppress xsltproc and xmlcatalog checks + if enable_man=no. (#134091, Julio M. Merino Vidal) + Sat Feb 14 01:21:34 2004 Matthias Clasen * glib/gmain.h: diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4 index cc1641a9e..dfd9e4e95 100644 --- a/ChangeLog.pre-2-4 +++ b/ChangeLog.pre-2-4 @@ -1,3 +1,8 @@ +Sat Feb 14 02:08:03 2004 Matthias Clasen + + * configure.in: Suppress xsltproc and xmlcatalog checks + if enable_man=no. (#134091, Julio M. Merino Vidal) + Sat Feb 14 01:21:34 2004 Matthias Clasen * glib/gmain.h: diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6 index cc1641a9e..dfd9e4e95 100644 --- a/ChangeLog.pre-2-6 +++ b/ChangeLog.pre-2-6 @@ -1,3 +1,8 @@ +Sat Feb 14 02:08:03 2004 Matthias Clasen + + * configure.in: Suppress xsltproc and xmlcatalog checks + if enable_man=no. (#134091, Julio M. Merino Vidal) + Sat Feb 14 01:21:34 2004 Matthias Clasen * glib/gmain.h: diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index cc1641a9e..dfd9e4e95 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -1,3 +1,8 @@ +Sat Feb 14 02:08:03 2004 Matthias Clasen + + * configure.in: Suppress xsltproc and xmlcatalog checks + if enable_man=no. (#134091, Julio M. Merino Vidal) + Sat Feb 14 01:21:34 2004 Matthias Clasen * glib/gmain.h: diff --git a/configure.in b/configure.in index d6bcbaf45..f6e087529 100644 --- a/configure.in +++ b/configure.in @@ -1948,19 +1948,23 @@ AC_ARG_ENABLE(man, [AC_HELP_STRING([--enable-man], [regenerate man pages from Docbook [default=no]])],enable_man=yes, enable_man=no) + +if test "${enable_man}" != no; then dnl dnl Check for xsltproc dnl AC_PATH_PROG([XSLTPROC], [xsltproc]) -if test -z "$XSLTPROC"; then - enable_man=no + if test -z "$XSLTPROC"; then + enable_man=no + fi + + dnl check for DocBook DTD and stylesheets in the local catalog. + JH_CHECK_XML_CATALOG([-//OASIS//DTD DocBook XML V4.1.2//EN], + [DocBook XML DTD V4.1.2],,enable_man=no) + JH_CHECK_XML_CATALOG([http://docbook.sourceforge.net/release/xsl/current/manpages/docbook.xsl], + [DocBook XSL Stylesheets],,enable_man=no) fi -dnl check for DocBook DTD and stylesheets in the local catalog. -JH_CHECK_XML_CATALOG([-//OASIS//DTD DocBook XML V4.1.2//EN], - [DocBook XML DTD V4.1.2],,enable_man=no) -JH_CHECK_XML_CATALOG([http://docbook.sourceforge.net/release/xsl/current/manpages/docbook.xsl], - [DocBook XSL Stylesheets],,enable_man=no) AM_CONDITIONAL(ENABLE_MAN, test x$enable_man != xno) dnl ******************************