- 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:
20
configure.ac
20
configure.ac
@@ -1663,13 +1663,21 @@ if test "$OPENSSL_ENABLED" != "1" -a "$GNUTLS_ENABLED" != "1"; then
|
||||
addcflags=`$PKGCONFIG --cflags nss`
|
||||
version=`$PKGCONFIG --modversion nss`
|
||||
nssprefix=`$PKGCONFIG --variable=prefix nss`
|
||||
else
|
||||
dnl Without pkg-config, we check for nss-config
|
||||
|
||||
check=`nss-config --version 2>/dev/null`
|
||||
if test -n "$check"; then
|
||||
addlib=`nss-config --libs`
|
||||
addcflags=`nss-config --cflags`
|
||||
version=`nss-config --version`
|
||||
nssprefix=`nss-config --prefix`
|
||||
else
|
||||
addlib="-lnss3"
|
||||
addcflags=""
|
||||
version="unknown"
|
||||
fi
|
||||
fi
|
||||
else
|
||||
# Without pkg-config, we'll kludge in some defaults
|
||||
addlib="-L$OPT_NSS/lib -lssl3 -lsmime3 -lnss3 -lplds4 -lplc4 -lnspr4 -lpthread -ldl"
|
||||
addcflags="-I$OPT_NSS/include"
|
||||
version="unknown"
|
||||
nssprefix=$OPT_NSS
|
||||
fi
|
||||
|
||||
dnl Check for functionPK11_CreateGenericObject
|
||||
|
||||
Reference in New Issue
Block a user