Fix brew check for GitHub actions

Don't abort if a brew catalog file is missing.

This is needed for the GitHub actions environment
which provides brew also for Linux.

Running cross builds then failed at AC_CHECK_FILE.

Signed-off-by: Stefan Weil <sw@weilnetz.de>
This commit is contained in:
Stefan Weil 2021-01-05 23:57:19 +01:00
parent a772571401
commit e1f1f325f7

View File

@ -440,15 +440,12 @@ if $have_asciidoc && $have_xsltproc; then
if $have_brew; then if $have_brew; then
brew_prefix=$(brew --prefix) brew_prefix=$(brew --prefix)
catalog_file=$brew_prefix/etc/xml/catalog catalog_file=$brew_prefix/etc/xml/catalog
AC_CHECK_FILE($catalog_file, if test -f $catalog_file; then
[ AM_CONDITIONAL([HAVE_XML_CATALOG_FILES], true)
AM_CONDITIONAL([HAVE_XML_CATALOG_FILES], true) XML_CATALOG_FILES=file:$catalog_file
XML_CATALOG_FILES=file:$catalog_file else
], AC_MSG_WARN([Missing file $catalog_file.])
[ fi
AC_MSG_ERROR([Missing file $catalog_file.])
]
)
fi fi
AC_SUBST([XML_CATALOG_FILES]) AC_SUBST([XML_CATALOG_FILES])
else else