moparisthebest/curl
1
0
Fork 0
mirror of https://github.com/moparisthebest/curl synced 2024-08-13 17:03:50 -04:00
Code Issues Releases Wiki Activity

build: Fix support for PKG_CONFIG

Browse Source 
- Allow the user to use PKG_CONFIG but not PKGCONFIG.

Background:

Last week in 14d5a86 a change was made to allow the user to set the
PKGCONFIG variable. Today in 72d99f2 I supplemented that to allow the
more common PKG_CONFIG as an alternative if PKGCONFIG is not set.

Neither of those changes worked as expected because PKGCONFIG is
occasionally reset in configure and by the CURL_CHECK_PKGCONFIG macro.
Instead in this commit I take the approach that the user may set
PKG_CONFIG only.
This commit is contained in:
Jay Satiro 2015-10-24 03:31:57 -04:00
parent 72d99f2e7b
commit d9a1776b32
1 changed files with 2 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
acinclude.m4
View File

@ -3052,12 +3052,9 @@ dnl Optionally PKG_CONFIG_LIBDIR may be given as $pcdir.
dnl dnl
AC_DEFUN([CURL_CHECK_PKGCONFIG], [ AC_DEFUN([CURL_CHECK_PKGCONFIG], [
if test -n "$PKG_CONFIG"; then
if test -z "$PKGCONFIG"; then
PKGCONFIG="$PKG_CONFIG" PKGCONFIG="$PKG_CONFIG"
fi else
if test -z "$PKGCONFIG"; then
AC_PATH_TOOL([PKGCONFIG], [pkg-config], [no], AC_PATH_TOOL([PKGCONFIG], [pkg-config], [no],
[$PATH:/usr/bin:/usr/local/bin]) [$PATH:/usr/bin:/usr/local/bin])
fi fi