blob: eff4dfed5abd5f09cfd6a2427b63498dfc3e383b (
plain) (
blame)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
|
diff -ru gtk-doc-GTK_DOC_1_32.orig/m4/gtkdoc_jh_check_xml_catalog.m4 gtk-doc-GTK_DOC_1_32.new/m4/gtkdoc_jh_check_xml_catalog.m4
--- gtk-doc-GTK_DOC_1_32.orig/m4/gtkdoc_jh_check_xml_catalog.m4 2021-03-17 08:00:49.717688000 -0700
+++ gtk-doc-GTK_DOC_1_32.new/m4/gtkdoc_jh_check_xml_catalog.m4 2021-03-17 08:01:30.600655000 -0700
@@ -6,7 +6,7 @@
AC_REQUIRE([JH_PATH_XML_CATALOG],[JH_PATH_XML_CATALOG(,[:])])dnl
AC_MSG_CHECKING([for ifelse([$2],,[$1],[$2]) in XML catalog])
if $jh_found_xmlcatalog && \
- AC_RUN_LOG([$XMLCATALOG --noout "$XML_CATALOG_FILE" "$1" >&2]); then
+ AC_RUN_LOG([$XMLCATALOG --noout "" "$1" >&2]); then
AC_MSG_RESULT([found])
ifelse([$3],,,[$3])
else
diff -ru gtk-doc-GTK_DOC_1_32.orig/m4/gtkdoc_jh_path_xml_catalog.m4 gtk-doc-GTK_DOC_1_32.new/m4/gtkdoc_jh_path_xml_catalog.m4
--- gtk-doc-GTK_DOC_1_32.orig/m4/gtkdoc_jh_path_xml_catalog.m4 2021-03-17 08:00:49.720681000 -0700
+++ gtk-doc-GTK_DOC_1_32.new/m4/gtkdoc_jh_path_xml_catalog.m4 2021-03-17 08:09:44.424666000 -0700
@@ -37,6 +37,9 @@
break
fi
done
+ if test -n "$XML_CATALOG_FILES"; then
+ jh_found_xmlcatalog=true
+ fi
IFS="$jh_xml_catalog_saved_ifs"
fi
if $jh_found_xmlcatalog; then
|
