diff options
| author | Jay Satiro <raysatiro@yahoo.com> | 2015-10-24 03:31:57 -0400 |
|---|---|---|
| committer | Jay Satiro <raysatiro@yahoo.com> | 2015-10-24 03:31:57 -0400 |
| commit | d9a1776b323f2a000da9cf5a6b9ba1eda58b80e2 (patch) | |
| tree | 27dc78d50b09744c9115d0fe703ec7be4579faf1 | |
| parent | 72d99f2e7b7594545bca9f13ddfa0ba7f0e51066 (diff) | |
build: Fix support for PKG_CONFIG
- 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.
| -rw-r--r-- | acinclude.m4 | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/acinclude.m4 b/acinclude.m4 index cff4d645c..5a760132e 100644 --- a/acinclude.m4 +++ b/acinclude.m4 @@ -3052,12 +3052,9 @@ dnl Optionally PKG_CONFIG_LIBDIR may be given as $pcdir. dnl AC_DEFUN([CURL_CHECK_PKGCONFIG], [ - - if test -z "$PKGCONFIG"; then + if test -n "$PKG_CONFIG"; then PKGCONFIG="$PKG_CONFIG" - fi - - if test -z "$PKGCONFIG"; then + else AC_PATH_TOOL([PKGCONFIG], [pkg-config], [no], [$PATH:/usr/bin:/usr/local/bin]) fi |