diff options
| author | Matthias Clasen <matthiasc@src.gnome.org> | 2003-08-10 22:30:02 +0000 |
|---|---|---|
| committer | Matthias Clasen <matthiasc@src.gnome.org> | 2003-08-10 22:30:02 +0000 |
| commit | 19d81dab2b28924d711c32fd951dfccd25041429 (patch) | |
| tree | 56c3c96af2980629af179407d5bdee4ab70ce72f /acinclude.m4 | |
| parent | 219ddba9281dbe94a88f0e93cfc51e021c6bf7e3 (diff) | |
| download | gtk+-19d81dab2b28924d711c32fd951dfccd25041429.tar.gz | |
Copy newer versions of JH_CHECK_XML_CATALOG and JH_PATH_XML_CATALOG from
* 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)
Diffstat (limited to 'acinclude.m4')
| -rw-r--r-- | acinclude.m4 | 21 |
1 files changed, 15 insertions, 6 deletions
diff --git a/acinclude.m4 b/acinclude.m4 index 74d13bf41b..f6f719d427 100644 --- a/acinclude.m4 +++ b/acinclude.m4 @@ -22,9 +22,10 @@ AC_DEFUN([GTK_ADD_LIB], esac ]) + # 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], [ @@ -33,20 +34,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 ]) @@ -55,9 +63,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 |