diff options
| author | Daniel Stenberg <daniel@haxx.se> | 2009-09-01 06:53:01 +0000 |
|---|---|---|
| committer | Daniel Stenberg <daniel@haxx.se> | 2009-09-01 06:53:01 +0000 |
| commit | ceda7e98f8f8d04b26ce0e0ea2f800dcdf966b79 (patch) | |
| tree | 41e1d60b03f9abb02597b5ac5abc9b67929b93b4 /acinclude.m4 | |
| parent | 2d0aca3b92aba75bfc6d975ac2d4f5aa3e25793a (diff) | |
| download | curl-ceda7e98f8f8d04b26ce0e0ea2f800dcdf966b79.tar.gz | |
- 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.
Diffstat (limited to 'acinclude.m4')
| -rw-r--r-- | acinclude.m4 | 7 |
1 files changed, 1 insertions, 6 deletions
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 ]) |