diff options
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | ChangeLog.pre-2-10 | 5 | ||||
| -rw-r--r-- | ChangeLog.pre-2-4 | 5 | ||||
| -rw-r--r-- | ChangeLog.pre-2-6 | 5 | ||||
| -rw-r--r-- | ChangeLog.pre-2-8 | 5 | ||||
| -rw-r--r-- | configure.in | 25 |
6 files changed, 39 insertions, 11 deletions
@@ -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 5f68a26cb..7a3899ce1 100644 --- 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 5f68a26cb..7a3899ce1 100644 --- 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 5f68a26cb..7a3899ce1 100644 --- 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 5f68a26cb..7a3899ce1 100644 --- 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 cd4929f92..b52143699 100644 --- 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) ################################################## |