diff options
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | ChangeLog.pre-1-10 | 5 | ||||
| -rw-r--r-- | ChangeLog.pre-1-4 | 5 | ||||
| -rw-r--r-- | ChangeLog.pre-1-6 | 5 | ||||
| -rw-r--r-- | ChangeLog.pre-1-8 | 5 | ||||
| -rw-r--r-- | acinclude.m4 | 23 |
6 files changed, 42 insertions, 6 deletions
@@ -1,3 +1,8 @@ +2003-08-11 Matthias Clasen <maclas@gmx.de> + + * acinclude.m4: Copy newer versions of JH_CHECK_XML_CATALOG and JH_PATH_XML_CATALOG from + gtk-doc to enable configuring without xmlcatalog in PATH. (#119115) + Fri Aug 8 12:59:42 2003 Owen Taylor <otaylor@redhat.com> * pango/pangoft2-fontmap.c (pango_ft2_font_map_default_substitute): diff --git a/ChangeLog.pre-1-10 b/ChangeLog.pre-1-10 index eecf9063..c0296b07 100644 --- a/ChangeLog.pre-1-10 +++ b/ChangeLog.pre-1-10 @@ -1,3 +1,8 @@ +2003-08-11 Matthias Clasen <maclas@gmx.de> + + * acinclude.m4: Copy newer versions of JH_CHECK_XML_CATALOG and JH_PATH_XML_CATALOG from + gtk-doc to enable configuring without xmlcatalog in PATH. (#119115) + Fri Aug 8 12:59:42 2003 Owen Taylor <otaylor@redhat.com> * pango/pangoft2-fontmap.c (pango_ft2_font_map_default_substitute): diff --git a/ChangeLog.pre-1-4 b/ChangeLog.pre-1-4 index eecf9063..c0296b07 100644 --- a/ChangeLog.pre-1-4 +++ b/ChangeLog.pre-1-4 @@ -1,3 +1,8 @@ +2003-08-11 Matthias Clasen <maclas@gmx.de> + + * acinclude.m4: Copy newer versions of JH_CHECK_XML_CATALOG and JH_PATH_XML_CATALOG from + gtk-doc to enable configuring without xmlcatalog in PATH. (#119115) + Fri Aug 8 12:59:42 2003 Owen Taylor <otaylor@redhat.com> * pango/pangoft2-fontmap.c (pango_ft2_font_map_default_substitute): diff --git a/ChangeLog.pre-1-6 b/ChangeLog.pre-1-6 index eecf9063..c0296b07 100644 --- a/ChangeLog.pre-1-6 +++ b/ChangeLog.pre-1-6 @@ -1,3 +1,8 @@ +2003-08-11 Matthias Clasen <maclas@gmx.de> + + * acinclude.m4: Copy newer versions of JH_CHECK_XML_CATALOG and JH_PATH_XML_CATALOG from + gtk-doc to enable configuring without xmlcatalog in PATH. (#119115) + Fri Aug 8 12:59:42 2003 Owen Taylor <otaylor@redhat.com> * pango/pangoft2-fontmap.c (pango_ft2_font_map_default_substitute): diff --git a/ChangeLog.pre-1-8 b/ChangeLog.pre-1-8 index eecf9063..c0296b07 100644 --- a/ChangeLog.pre-1-8 +++ b/ChangeLog.pre-1-8 @@ -1,3 +1,8 @@ +2003-08-11 Matthias Clasen <maclas@gmx.de> + + * acinclude.m4: Copy newer versions of JH_CHECK_XML_CATALOG and JH_PATH_XML_CATALOG from + gtk-doc to enable configuring without xmlcatalog in PATH. (#119115) + Fri Aug 8 12:59:42 2003 Owen Taylor <otaylor@redhat.com> * pango/pangoft2-fontmap.c (pango_ft2_font_map_default_substitute): diff --git a/acinclude.m4 b/acinclude.m4 index 65036719..48fd5d8e 100644 --- a/acinclude.m4 +++ b/acinclude.m4 @@ -1,6 +1,7 @@ + # Checks the location of the XML Catalog # Usage: -# JH_PATH_XML_CATALOG +# JH_PATH_XML_CATALOG([ACTION-IF-FOUND], [ACTION-IF-NOT-FOUND]) # Defines XMLCATALOG and XML_CATALOG_FILE substitutions AC_DEFUN([JH_PATH_XML_CATALOG], [ @@ -9,20 +10,27 @@ AC_DEFUN([JH_PATH_XML_CATALOG], AC_HELP_STRING([--with-xml-catalog=CATALOG], [path to xml catalog to use]),, [with_xml_catalog=/etc/xml/catalog]) + jh_found_xmlcatalog=true XML_CATALOG_FILE="$with_xml_catalog" + AC_SUBST([XML_CATALOG_FILE]) AC_MSG_CHECKING([for XML catalog ($XML_CATALOG_FILE)]) if test -f "$XML_CATALOG_FILE"; then AC_MSG_RESULT([found]) else + jh_found_xmlcatalog=false AC_MSG_RESULT([not found]) - AC_MSG_ERROR([XML catalog not found]) fi - AC_SUBST([XML_CATALOG_FILE]) # check for the xmlcatalog program AC_PATH_PROG(XMLCATALOG, xmlcatalog, no) if test "x$XMLCATALOG" = xno; then - AC_MSG_ERROR([could not find xmlcatalog program]) + jh_found_xmlcatalog=false + fi + + if $jh_found_xmlcatalog; then + ifelse([$1],,[:],[$1]) + else + ifelse([$2],,[AC_MSG_ERROR([could not find XML catalog])],[$2]) fi ]) @@ -31,9 +39,10 @@ AC_DEFUN([JH_PATH_XML_CATALOG], # JH_CHECK_XML_CATALOG(URI, [FRIENDLY-NAME], [ACTION-IF-FOUND], [ACTION-IF-NOT-FOUND]) AC_DEFUN([JH_CHECK_XML_CATALOG], [ - AC_REQUIRE([JH_PATH_XML_CATALOG])dnl + AC_REQUIRE([JH_PATH_XML_CATALOG],[JH_PATH_XML_CATALOG(,[:])])dnl AC_MSG_CHECKING([for ifelse([$2],,[$1],[$2]) in XML catalog]) - if AC_RUN_LOG([$XMLCATALOG --noout "$XML_CATALOG_FILE" "$1" >&2]); then + if $jh_found_xmlcatalog && \ + AC_RUN_LOG([$XMLCATALOG --noout "$XML_CATALOG_FILE" "$1" >&2]); then AC_MSG_RESULT([found]) ifelse([$3],,,[$3 ])dnl @@ -44,3 +53,5 @@ AC_DEFUN([JH_CHECK_XML_CATALOG], [$4]) fi ]) + + |