diff options
| -rw-r--r-- | acinclude.m4 | 16 | 
1 files changed, 13 insertions, 3 deletions
| diff --git a/acinclude.m4 b/acinclude.m4 index b14ae38a2..18f4d8202 100644 --- 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]) | 
