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)

diff --git a/ChangeLog b/ChangeLog
index 4328a18ef6a9d5b23989ffbc26590ec25e89049b..c4e7bd1c0063f84e10bf2bf21a2c683a766123cd 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,11 @@
+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)
+
 2003-08-10  Matthias Clasen  <maclas@gmx.de>
 
-       * gtk/gtkwidget.h (struct _GtkWidget): Mark some members as public. 
+       * gtk/gtkwidget.h (struct _GtkWidget): Mark some members as public.  (#119463) 
 
 2003-08-09  Noah Levitt  <nlevitt@columbia.edu>
 

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index 4328a18ef6a9d5b23989ffbc26590ec25e89049b..c4e7bd1c0063f84e10bf2bf21a2c683a766123cd 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,6 +1,11 @@
+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)
+
 2003-08-10  Matthias Clasen  <maclas@gmx.de>
 
-       * gtk/gtkwidget.h (struct _GtkWidget): Mark some members as public. 
+       * gtk/gtkwidget.h (struct _GtkWidget): Mark some members as public.  (#119463) 
 
 2003-08-09  Noah Levitt  <nlevitt@columbia.edu>
 

diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4
index 4328a18ef6a9d5b23989ffbc26590ec25e89049b..c4e7bd1c0063f84e10bf2bf21a2c683a766123cd 100644 (file)
--- a/ChangeLog.pre-2-4
+++ b/ChangeLog.pre-2-4
@@ -1,6 +1,11 @@
+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)
+
 2003-08-10  Matthias Clasen  <maclas@gmx.de>
 
-       * gtk/gtkwidget.h (struct _GtkWidget): Mark some members as public. 
+       * gtk/gtkwidget.h (struct _GtkWidget): Mark some members as public.  (#119463) 
 
 2003-08-09  Noah Levitt  <nlevitt@columbia.edu>
 

diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index 4328a18ef6a9d5b23989ffbc26590ec25e89049b..c4e7bd1c0063f84e10bf2bf21a2c683a766123cd 100644 (file)
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,6 +1,11 @@
+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)
+
 2003-08-10  Matthias Clasen  <maclas@gmx.de>
 
-       * gtk/gtkwidget.h (struct _GtkWidget): Mark some members as public. 
+       * gtk/gtkwidget.h (struct _GtkWidget): Mark some members as public.  (#119463) 
 
 2003-08-09  Noah Levitt  <nlevitt@columbia.edu>
 

diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index 4328a18ef6a9d5b23989ffbc26590ec25e89049b..c4e7bd1c0063f84e10bf2bf21a2c683a766123cd 100644 (file)
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,6 +1,11 @@
+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)
+
 2003-08-10  Matthias Clasen  <maclas@gmx.de>
 
-       * gtk/gtkwidget.h (struct _GtkWidget): Mark some members as public. 
+       * gtk/gtkwidget.h (struct _GtkWidget): Mark some members as public.  (#119463) 
 
 2003-08-09  Noah Levitt  <nlevitt@columbia.edu>
 

diff --git a/acinclude.m4 b/acinclude.m4
index 74d13bf41b11482c37dbf73eaf99e11bacf7d3e9..f6f719d427c826c360a63c343e5971a84e9a14d2 100644 (file)
--- 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

diff --git a/docs/reference/ChangeLog b/docs/reference/ChangeLog
index e7ee7e8c1feda3600d9a33c440e0be92d342ef5f..a9b390276841c3aa8a3af55612191fa40d613ebf 100644 (file)
--- a/docs/reference/ChangeLog
+++ b/docs/reference/ChangeLog
@@ -1,6 +1,6 @@
 2003-08-10  Matthias Clasen  <maclas@gmx.de>
 
-       * gtk/tmpl/gtkwidget.sgml: Document public GtkWidget members.
+       * gtk/tmpl/gtkwidget.sgml: Document public GtkWidget members.  (#119463)
 
 2003-08-09  Matthias Clasen  <maclas@gmx.de>