summaryrefslogtreecommitdiff
path: root/acinclude.m4
diff options
context:
space:
mode:
authorJay Satiro <raysatiro@yahoo.com>2015-10-23 17:17:54 -0400
committerJay Satiro <raysatiro@yahoo.com>2015-10-23 17:17:54 -0400
commit72d99f2e7b7594545bca9f13ddfa0ba7f0e51066 (patch)
tree751cd9b1e8a015b1261c0c7184859878a246c1e3 /acinclude.m4
parent2f4f4108d6c39f8599febe4c787b6456dc2c6aba (diff)
downloadcurl-72d99f2e7b7594545bca9f13ddfa0ba7f0e51066.tar.gz
build: Fix mingw ssl gdi32 order
- If mingw ssl make sure -lgdi32 comes after ssl libs - Allow PKG_CONFIG to set pkg-config location and options Bug: https://github.com/bagder/curl/pull/501 Reported-by: Kang Lin
Diffstat (limited to 'acinclude.m4')
-rw-r--r--acinclude.m412
1 files changed, 10 insertions, 2 deletions
diff --git a/acinclude.m4 b/acinclude.m4
index 850db317c..cff4d645c 100644
--- a/acinclude.m4
+++ b/acinclude.m4
@@ -3052,9 +3052,17 @@ dnl Optionally PKG_CONFIG_LIBDIR may be given as $pcdir.
dnl
AC_DEFUN([CURL_CHECK_PKGCONFIG], [
- AC_PATH_TOOL( PKGCONFIG, pkg-config, no, $PATH:/usr/bin:/usr/local/bin)
- if test x$PKGCONFIG != xno; then
+ if test -z "$PKGCONFIG"; then
+ PKGCONFIG="$PKG_CONFIG"
+ fi
+
+ if test -z "$PKGCONFIG"; then
+ AC_PATH_TOOL([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])
dnl ask pkg-config about $1
itexists=`CURL_EXPORT_PCDIR([$2]) dnl