pyrox.dev
lol
gtk-doc: clean up XML_CATALOG_FILES patch
libxml2 1.9.7 supports the XML_CATALOG_FILES environment variable
natively by using empty catalogfile argument.
+8
-23
pkgs/development/tools/documentation/gtk-doc/respect-xml-catalog-files-var.patch
+8
-23
pkgs/development/tools/documentation/gtk-doc/respect-xml-catalog-files-var.patch
···
1
-
diff --git a/m4/gtkdoc_jh_check_xml_catalog.m4 b/m4/gtkdoc_jh_check_xml_catalog.m4
2
-
index 618c1c9..1842a0d 100644
3
1
--- a/m4/gtkdoc_jh_check_xml_catalog.m4
4
2
+++ b/m4/gtkdoc_jh_check_xml_catalog.m4
5
-
@@ -10,7 +10,21 @@ AC_DEFUN([JH_CHECK_XML_CATALOG],
3
+
@@ -5,8 +5,8 @@
4
+
[
5
+
AC_REQUIRE([JH_PATH_XML_CATALOG],[JH_PATH_XML_CATALOG(,[:])])dnl
6
+
AC_MSG_CHECKING([for ifelse([$2],,[$1],[$2]) in XML catalog])
7
+
- if $jh_found_xmlcatalog && \
8
+
- AC_RUN_LOG([$XMLCATALOG --noout "$XML_CATALOG_FILE" "$1" >&2]); then
9
+
+ # empty argument forces libxml to use XML_CATALOG_FILES variable
10
+
+ if AC_RUN_LOG([$XMLCATALOG --noout "" "$1" >&2]); then
6
11
AC_MSG_RESULT([found])
7
12
ifelse([$3],,,[$3])
8
13
else
9
-
- AC_MSG_RESULT([not found])
10
-
- ifelse([$4],,[AC_MSG_ERROR([could not find ifelse([$2],,[$1],[$2]) in XML catalog])],[$4])
11
-
+ jh_check_xml_catalog_saved_ifs="$IFS"
12
-
+ IFS=' '
13
-
+ for f in $XML_CATALOG_FILES; do
14
-
+ if [[ -f "$f" ]] && \
15
-
+ AC_RUN_LOG([$XMLCATALOG --noout "$f" "$1" >&2]); then
16
-
+ jh_found_xmlcatalog=true
17
-
+ AC_MSG_RESULT([found])
18
-
+ ifelse([$3],,,[$3])
19
-
+ break
20
-
+ fi
21
-
+ done
22
-
+ IFS="$jh_check_xml_catalog_saved_ifs"
23
-
+ if ! $jh_found_xmlcatalog; then
24
-
+ AC_MSG_RESULT([not found])
25
-
+ ifelse([$4],,[AC_MSG_ERROR([could not find ifelse([$2],,[$1],[$2]) in XML catalog])],[$4])
26
-
+ fi
27
-
fi
28
-
])