extended CURL_CHECK_PKGCONFIG to check for a host-specific version of the

pkg-config first before the "normal" one (if cross-compiling)

diff --git a/acinclude.m4 b/acinclude.m4
index b14ae38..18f4d82 100644 (file)
--- a/acinclude.m4
+++ b/acinclude.m4
@@ -3195,13 +3195,23 @@ dnl ------------------------
 dnl search for the pkg-config tool (if not cross-compiling). Set the PKGCONFIG
 dnl variable to hold the path to it, or 'no' if not found/present.
 dnl
-dnl If pkg-config is present, check that it has info about the $module or return
-dnl "no" anyway!
+dnl If pkg-config is present, check that it has info about the $module or
+dnl return "no" anyway!
 dnl
 
 AC_DEFUN([CURL_CHECK_PKGCONFIG], [
 
-    AC_PATH_PROG( PKGCONFIG, pkg-config, no, $PATH:/usr/bin:/usr/local/bin)
+    PKGCONFIG="no"
+
+    if test x$cross_compiling = xyes; then
+      dnl see if there's a pkg-specific for this host setup
+      AC_PATH_PROG( PKGCONFIG, ${host}-pkg-config, no,
+                    $PATH:/usr/bin:/usr/local/bin)
+    fi
+
+    if test x$PKGCONFIG = xno; then
+      AC_PATH_PROG( PKGCONFIG, pkg-config, no, $PATH:/usr/bin:/usr/local/bin)
+    fi
 
     if test x$PKGCONFIG != xno; then
       AC_MSG_CHECKING([for $1 options with pkg-config])