summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDaniel Stenberg <daniel@haxx.se>2015-10-13 12:56:42 +0200
committerDaniel Stenberg <daniel@haxx.se>2015-10-13 12:58:52 +0200
commit14d5a86b3e63c53e10ffcf526e0e7e75702fc82e (patch)
tree4529453abff2aacbac636fe60ed1bcf5e2158f63
parentdb532eff1ee9380bf7300d18ceffc1823bc30a76 (diff)
downloadcurl-14d5a86b3e63c53e10ffcf526e0e7e75702fc82e.tar.gz
acinclude: remove PKGCONFIG override
... and allow it to get set by a caller easier. Reported-by: Rainer Jung Bug: http://curl.haxx.se/mail/lib-2015-10/0035.html
-rw-r--r--acinclude.m45
1 files changed, 1 insertions, 4 deletions
diff --git a/acinclude.m4 b/acinclude.m4
index 782f32d64..850db317c 100644
--- a/acinclude.m4
+++ b/acinclude.m4
@@ -5,7 +5,7 @@
# | (__| |_| | _ <| |___
# \___|\___/|_| \_\_____|
#
-# Copyright (C) 1998 - 2013, Daniel Stenberg, <daniel@haxx.se>, et al.
+# Copyright (C) 1998 - 2015, Daniel Stenberg, <daniel@haxx.se>, et al.
#
# This software is licensed as described in the file COPYING, which
# you should have received as part of this distribution. The terms
@@ -3052,9 +3052,6 @@ dnl Optionally PKG_CONFIG_LIBDIR may be given as $pcdir.
dnl
AC_DEFUN([CURL_CHECK_PKGCONFIG], [
-
- PKGCONFIG="no"
-
AC_PATH_TOOL( PKGCONFIG, pkg-config, no, $PATH:/usr/bin:/usr/local/bin)
if test x$PKGCONFIG != xno; then