mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-12-18 02:46:28 +00:00
a5880ace7f
The patch removes the need for a separate script to combine existing catalog files, making the package simpler.
16 lines
587 B
Diff
16 lines
587 B
Diff
diff --git a/acinclude.m4 b/acinclude.m4
|
|
index be626c5..b449b1b 100644
|
|
--- a/acinclude.m4
|
|
+++ b/acinclude.m4
|
|
@@ -40,8 +40,8 @@ AC_DEFUN([JH_CHECK_XML_CATALOG],
|
|
[
|
|
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
|
|
+ # empty argument forces libxml to use XML_CATALOG_FILES variable
|
|
+ if AC_RUN_LOG([$XMLCATALOG --noout "" "$1" >&2]); then
|
|
AC_MSG_RESULT([found])
|
|
ifelse([$3],,,[$3
|
|
])dnl
|