diff options
| author | Owen Taylor <otaylor@redhat.com> | 2004-02-13 15:29:33 +0000 |
|---|---|---|
| committer | Owen Taylor <otaylor@src.gnome.org> | 2004-02-13 15:29:33 +0000 |
| commit | a036dc6bbf67584d8e7ae8ac0a72b7c922977a7a (patch) | |
| tree | 8a8e7362b4453414039cfce7d4eae2348a850f57 | |
| parent | 7ff50a2173cb8fdf59472c24cde9883dd0d862bf (diff) | |
| download | pango-a036dc6bbf67584d8e7ae8ac0a72b7c922977a7a.tar.gz | |
Skip the xslt and stylesheet checks unless --enable-man is specified.
Fri Feb 13 10:19:16 2004 Owen Taylor <otaylor@redhat.com>
* configure.in: Skip the xslt and stylesheet checks
unless --enable-man is specified. (#134133,
Julio M. Merino Vidal)
| -rw-r--r-- | ChangeLog | 6 | ||||
| -rw-r--r-- | ChangeLog.pre-1-10 | 6 | ||||
| -rw-r--r-- | ChangeLog.pre-1-4 | 6 | ||||
| -rw-r--r-- | ChangeLog.pre-1-6 | 6 | ||||
| -rw-r--r-- | ChangeLog.pre-1-8 | 6 | ||||
| -rw-r--r-- | configure.in | 27 |
6 files changed, 46 insertions, 11 deletions
@@ -1,3 +1,9 @@ +Fri Feb 13 10:19:16 2004 Owen Taylor <otaylor@redhat.com> + + * configure.in: Skip the xslt and stylesheet checks + unless --enable-man is specified. (#134133, + Julio M. Merino Vidal) + Tue Feb 10 19:03:44 2004 Manish Singh <yosh@gimp.org> * pango/pango-context.c (itemize_state_init): initialize font_desc diff --git a/ChangeLog.pre-1-10 b/ChangeLog.pre-1-10 index 044309b4..419f49ec 100644 --- a/ChangeLog.pre-1-10 +++ b/ChangeLog.pre-1-10 @@ -1,3 +1,9 @@ +Fri Feb 13 10:19:16 2004 Owen Taylor <otaylor@redhat.com> + + * configure.in: Skip the xslt and stylesheet checks + unless --enable-man is specified. (#134133, + Julio M. Merino Vidal) + Tue Feb 10 19:03:44 2004 Manish Singh <yosh@gimp.org> * pango/pango-context.c (itemize_state_init): initialize font_desc diff --git a/ChangeLog.pre-1-4 b/ChangeLog.pre-1-4 index 044309b4..419f49ec 100644 --- a/ChangeLog.pre-1-4 +++ b/ChangeLog.pre-1-4 @@ -1,3 +1,9 @@ +Fri Feb 13 10:19:16 2004 Owen Taylor <otaylor@redhat.com> + + * configure.in: Skip the xslt and stylesheet checks + unless --enable-man is specified. (#134133, + Julio M. Merino Vidal) + Tue Feb 10 19:03:44 2004 Manish Singh <yosh@gimp.org> * pango/pango-context.c (itemize_state_init): initialize font_desc diff --git a/ChangeLog.pre-1-6 b/ChangeLog.pre-1-6 index 044309b4..419f49ec 100644 --- a/ChangeLog.pre-1-6 +++ b/ChangeLog.pre-1-6 @@ -1,3 +1,9 @@ +Fri Feb 13 10:19:16 2004 Owen Taylor <otaylor@redhat.com> + + * configure.in: Skip the xslt and stylesheet checks + unless --enable-man is specified. (#134133, + Julio M. Merino Vidal) + Tue Feb 10 19:03:44 2004 Manish Singh <yosh@gimp.org> * pango/pango-context.c (itemize_state_init): initialize font_desc diff --git a/ChangeLog.pre-1-8 b/ChangeLog.pre-1-8 index 044309b4..419f49ec 100644 --- a/ChangeLog.pre-1-8 +++ b/ChangeLog.pre-1-8 @@ -1,3 +1,9 @@ +Fri Feb 13 10:19:16 2004 Owen Taylor <otaylor@redhat.com> + + * configure.in: Skip the xslt and stylesheet checks + unless --enable-man is specified. (#134133, + Julio M. Merino Vidal) + Tue Feb 10 19:03:44 2004 Manish Singh <yosh@gimp.org> * pango/pango-context.c (itemize_state_init): initialize font_desc diff --git a/configure.in b/configure.in index ca6a0c98..76ddbe58 100644 --- a/configure.in +++ b/configure.in @@ -422,19 +422,24 @@ 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 "x$enable_man" != xno ; then + dnl + dnl Check for xsltproc + dnl + AC_PATH_PROG([XSLTPROC], [xsltproc]) + if test -z "$XSLTPROC"; then + enable_man=no + fi +fi + +if test "x$enable_man" != xno ; then + 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 ******************************************************** |