Suppress xsltproc and xmlcatalog checks if enable_man=no. (#134162, Julio

Sat Feb 14 00:00:52 2004  Matthias Clasen  <maclas@gmx.de>

	* configure.in: Suppress xsltproc and xmlcatalog checks
	if enable_man=no.  (#134162, Julio M. Merino Vidal)

diff --git a/ChangeLog b/ChangeLog
index 5f68a26cb45a133c530bbb5567ccafb7e59f318d..7a3899ce1a2566260ec14c79aab450518bd1d1e3 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Sat Feb 14 00:00:52 2004  Matthias Clasen  <maclas@gmx.de>
+
+       * configure.in: Suppress xsltproc and xmlcatalog checks
+       if enable_man=no.  (#134162, Julio M. Merino Vidal)
+
 Fri Feb 13 23:54:48 2004  Matthias Clasen  <maclas@gmx.de>
 
        * configure.in: Remove checks for sgml2html. It was once

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index 5f68a26cb45a133c530bbb5567ccafb7e59f318d..7a3899ce1a2566260ec14c79aab450518bd1d1e3 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,8 @@
+Sat Feb 14 00:00:52 2004  Matthias Clasen  <maclas@gmx.de>
+
+       * configure.in: Suppress xsltproc and xmlcatalog checks
+       if enable_man=no.  (#134162, Julio M. Merino Vidal)
+
 Fri Feb 13 23:54:48 2004  Matthias Clasen  <maclas@gmx.de>
 
        * configure.in: Remove checks for sgml2html. It was once

diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4
index 5f68a26cb45a133c530bbb5567ccafb7e59f318d..7a3899ce1a2566260ec14c79aab450518bd1d1e3 100644 (file)
--- a/ChangeLog.pre-2-4
+++ b/ChangeLog.pre-2-4
@@ -1,3 +1,8 @@
+Sat Feb 14 00:00:52 2004  Matthias Clasen  <maclas@gmx.de>
+
+       * configure.in: Suppress xsltproc and xmlcatalog checks
+       if enable_man=no.  (#134162, Julio M. Merino Vidal)
+
 Fri Feb 13 23:54:48 2004  Matthias Clasen  <maclas@gmx.de>
 
        * configure.in: Remove checks for sgml2html. It was once

diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index 5f68a26cb45a133c530bbb5567ccafb7e59f318d..7a3899ce1a2566260ec14c79aab450518bd1d1e3 100644 (file)
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,3 +1,8 @@
+Sat Feb 14 00:00:52 2004  Matthias Clasen  <maclas@gmx.de>
+
+       * configure.in: Suppress xsltproc and xmlcatalog checks
+       if enable_man=no.  (#134162, Julio M. Merino Vidal)
+
 Fri Feb 13 23:54:48 2004  Matthias Clasen  <maclas@gmx.de>
 
        * configure.in: Remove checks for sgml2html. It was once

diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index 5f68a26cb45a133c530bbb5567ccafb7e59f318d..7a3899ce1a2566260ec14c79aab450518bd1d1e3 100644 (file)
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,8 @@
+Sat Feb 14 00:00:52 2004  Matthias Clasen  <maclas@gmx.de>
+
+       * configure.in: Suppress xsltproc and xmlcatalog checks
+       if enable_man=no.  (#134162, Julio M. Merino Vidal)
+
 Fri Feb 13 23:54:48 2004  Matthias Clasen  <maclas@gmx.de>
 
        * configure.in: Remove checks for sgml2html. It was once

diff --git a/configure.in b/configure.in
index cd4929f92f74b44489ff0c6d5e7267ca257040f8..b521436998d57df69553562e815bc31dd7a2cf4d 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -1442,19 +1442,22 @@ AC_ARG_ENABLE(man,
                               [regenerate man pages from Docbook [default=no]])],enable_man=yes,
               enable_man=no)
 
-dnl
-dnl Check for xsltproc
-dnl
-AC_PATH_PROG([XSLTPROC], [xsltproc])
-if test -z "$XSLTPROC"; then
-  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
+  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)
 
 ##################################################