diff options
| author | Kamil Dudka <kdudka@redhat.com> | 2010-01-14 01:37:55 +0000 |
|---|---|---|
| committer | Kamil Dudka <kdudka@redhat.com> | 2010-01-14 01:37:55 +0000 |
| commit | 383bf1e4764cf141846e27bca8872f80fecdd1a7 (patch) | |
| tree | 668624405b0cd68d7cb44ec38d15e1459cea8b14 /configure.ac | |
| parent | 8c8df3966be526a6961f7c861b4576cc885d927d (diff) | |
- Suppressed side effect of OpenSSL configure checks, which prevented NSS from
being properly detected under certain circumstances. It had been caused by
strange behavior of pkg-config when handling PKG_CONFIG_LIBDIR. pkg-config
distinguishes among empty and non-existent environment variable in that case.
Diffstat (limited to 'configure.ac')
| -rw-r--r-- | configure.ac | 25 |
1 files changed, 12 insertions, 13 deletions
diff --git a/configure.ac b/configure.ac index 22e1598a8..1366eee5e 100644 --- a/configure.ac +++ b/configure.ac @@ -1205,7 +1205,6 @@ if test X"$OPT_SSL" != Xno; then CLEANLDFLAGS="$LDFLAGS" CLEANCPPFLAGS="$CPPFLAGS" CLEANLIBS="$LIBS" - SAVE_PKG_CONFIG_LIBDIR="$PKG_CONFIG_LIBDIR" case "$OPT_SSL" in yes) @@ -1233,10 +1232,9 @@ if test X"$OPT_SSL" != Xno; then dnl Try pkg-config even when cross-compiling. Since we dnl specify PKG_CONFIG_LIBDIR we're only looking where dnl the user told us to look - PKG_CONFIG_LIBDIR=$OPT_SSL/lib/pkgconfig - export PKG_CONFIG_LIBDIR - AC_MSG_NOTICE([set PKG_CONFIG_LIBDIR to "$PKG_CONFIG_LIBDIR"]) - if test -e "$PKG_CONFIG_LIBDIR/openssl.pc"; then + OPENSSL_PCDIR="$OPT_SSL/lib/pkgconfig" + AC_MSG_NOTICE([PKG_CONFIG_LIBDIR will be set to "$OPENSSL_PCDIR"]) + if test -e "$OPENSSL_PCDIR/openssl.pc"; then PKGTEST="yes" fi @@ -1253,12 +1251,17 @@ if test X"$OPT_SSL" != Xno; then if test "$PKGTEST" = "yes"; then - CURL_CHECK_PKGCONFIG(openssl) + CURL_CHECK_PKGCONFIG(openssl, [$OPENSSL_PCDIR]) if test "$PKGCONFIG" != "no" ; then - SSL_LIBS=`$PKGCONFIG --libs-only-l openssl 2>/dev/null` - SSL_LDFLAGS=`$PKGCONFIG --libs-only-L openssl 2>/dev/null` - SSL_CPPFLAGS=`$PKGCONFIG --cflags-only-I openssl 2>/dev/null` + SSL_LIBS=`CURL_EXPORT_PCDIR([$OPENSSL_PCDIR]) dnl + $PKGCONFIG --libs-only-l openssl 2>/dev/null` + + SSL_LDFLAGS=`CURL_EXPORT_PCDIR([$OPENSSL_PCDIR]) dnl + $PKGCONFIG --libs-only-L openssl 2>/dev/null` + + SSL_CPPFLAGS=`CURL_EXPORT_PCDIR([$OPENSSL_PCDIR]) dnl + $PKGCONFIG --cflags-only-I openssl 2>/dev/null` AC_MSG_NOTICE([pkg-config: SSL_LIBS: "$SSL_LIBS"]) AC_MSG_NOTICE([pkg-config: SSL_LDFLAGS: "$SSL_LDFLAGS"]) @@ -1276,10 +1279,6 @@ if test X"$OPT_SSL" != Xno; then fi fi - dnl we're done using pkg-config for openssl - PKG_CONFIG_LIBDIR="$SAVE_PKG_CONFIG_LIBDIR" - export PKG_CONFIG_LIBDIR - dnl finally, set flags to use SSL CPPFLAGS="$CPPFLAGS $SSL_CPPFLAGS" LDFLAGS="$LDFLAGS $SSL_LDFLAGS" |