From ceda7e98f8f8d04b26ce0e0ea2f800dcdf966b79 Mon Sep 17 00:00:00 2001
From: Daniel Stenberg <daniel@haxx.se>
Date: Tue, 1 Sep 2009 06:53:01 +0000
Subject: - configure now tries to use pkg-config for a number of
 sub-dependencies even   when cross-compiling. The key to success is then you
 properly setup   PKG_CONFIG_PATH before invoking configure.

  I also improved how NSS is detected by trying nss-config if pkg-config isn't
  present, and as a last resort just use the lib name and force the user to
  setup the LIBS/LDFLAGS/CFLAGS etc properly. The previous last resort would
  add a range of various libs that would almost never be quite correct.
---
 acinclude.m4 | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

(limited to 'acinclude.m4')

diff --git a/acinclude.m4 b/acinclude.m4
index d0e28aa74..b14ae38a2 100644
--- a/acinclude.m4
+++ b/acinclude.m4
@@ -3200,8 +3200,7 @@ dnl "no" anyway!
 dnl
 
 AC_DEFUN([CURL_CHECK_PKGCONFIG], [
-  if test x$cross_compiling != xyes; then
-    dnl only do pkg-config magic when not cross-compiling
+
     AC_PATH_PROG( PKGCONFIG, pkg-config, no, $PATH:/usr/bin:/usr/local/bin)
 
     if test x$PKGCONFIG != xno; then
@@ -3217,8 +3216,4 @@ AC_DEFUN([CURL_CHECK_PKGCONFIG], [
         AC_MSG_RESULT([found])
       fi
     fi
-
-  else
-    PKGCONFIG="no"
-  fi
 ])
-- 
cgit v1.2.3