mirror of
https://github.com/curl/curl.git
synced 2026-07-28 06:33:06 +03:00
- 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.
This commit is contained in:
parent
2d0aca3b92
commit
ceda7e98f8
4 changed files with 28 additions and 13 deletions
|
|
@ -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
|
||||
])
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue