Commit 8df3ccba authored by Michał Górny's avatar Michał Górny Committed by Nick Wellnhofer

Use AC_PATH_TOOL to find libgcrypt-config and xml2-config

Using AC_PATH_TOOL prefers ${CHOST}-prefixed tools over 'bare' ones,
therefore improving support for cross-compilation and multilib. This
is useful for environment where libgcrypt-config and xml2-config
correspond to the build host environment, while
${CHOST}-libgcrypt-config and ${CHOST}-xml2-config are installed for
each supported build targets.

Fixes: https://bugzilla.gnome.org/show_bug.cgi?id=725635
Fixes: https://bugs.gentoo.org/show_bug.cgi?id=518728
parent fd675976
......@@ -393,7 +393,7 @@ case $host in
CRYPTO_TESTDIR=crypto
;;
*)
AC_PATH_PROG(LIBGCRYPT_CONFIG, libgcrypt-config, no)
AC_PATH_TOOL(LIBGCRYPT_CONFIG, libgcrypt-config, no)
if test "$LIBGCRYPT_CONFIG" != "no" ; then
LIBGCRYPT_VERSION=`$LIBGCRYPT_CONFIG --version`
if test VERSION_TO_NUMBER(echo $LIBGCRYPT_VERSION) -lt VERSION_TO_NUMBER(echo "1.1.42")
......@@ -507,9 +507,9 @@ AC_SUBST(LIBXML_REQUIRED_VERSION)
AC_MSG_CHECKING(for libxml libraries >= $LIBXML_REQUIRED_VERSION)
if test "x$LIBXML_CONFIG_PREFIX" != "x"
then
XML_CONFIG=${LIBXML_CONFIG_PREFIX}/bin/xml2-config
AC_PATH_TOOL([XML_CONFIG], [xml2-config], [false], [${LIBXML_CONFIG_PREFIX}/bin])
else
XML_CONFIG=xml2-config
AC_PATH_TOOL([XML_CONFIG], [xml2-config], [false])
fi
dnl
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment