diff options
| -rw-r--r-- | CHANGES | 5 | ||||
| -rw-r--r-- | configure.ac | 41 |
2 files changed, 40 insertions, 6 deletions
@@ -6,6 +6,11 @@ Changelog +Kamil Dudka (15 Nov 2009) +- David Byron improved the configure script to use pkg-config to find OpenSSL + (and in particular the list of required libraries) even if a path is given + as argument to --with-ssl + Claes Jakobsson (14 Nov 2009) - curl-config now accepts '--configure' to see what arguments was passed to the configure script when building curl. diff --git a/configure.ac b/configure.ac index 5f605443d..42c09c6eb 100644 --- a/configure.ac +++ b/configure.ac @@ -1148,6 +1148,7 @@ 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) @@ -1171,12 +1172,25 @@ if test X"$OPT_SSL" != Xno; then dnl check the given --with-ssl spot PKGTEST="no" PREFIX_OPENSSL=$OPT_SSL + + 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 + PKGTEST="yes" + fi + + dnl in case pkg-config comes up empty, use what we got + dnl via --with-ssl LIB_OPENSSL="$PREFIX_OPENSSL/lib$libsuff" if test "$PREFIX_OPENSSL" != "/usr" ; then - LDFLAGS="$LDFLAGS -L$LIB_OPENSSL" - CPPFLAGS="$CPPFLAGS -I$PREFIX_OPENSSL/include" + SSL_LDFLAGS="-L$LIB_OPENSSL" + SSL_CPPFLAGS="-I$PREFIX_OPENSSL/include" fi - CPPFLAGS="$CPPFLAGS -I$PREFIX_OPENSSL/include/openssl" + SSL_CPPFLAGS="$SSL_CPPFLAGS -I$PREFIX_OPENSSL/include/openssl" ;; esac @@ -1189,15 +1203,30 @@ if test X"$OPT_SSL" != Xno; then SSL_LDFLAGS=`$PKGCONFIG --libs-only-L openssl 2>/dev/null` SSL_CPPFLAGS=`$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"]) + AC_MSG_NOTICE([pkg-config: SSL_CPPFLAGS: "$SSL_CPPFLAGS"]) + LIB_OPENSSL=`echo $SSL_LDFLAGS | sed -e 's/-L//g'` - dnl use the values pkg-config reported + dnl use the values pkg-config reported. This is here + dnl instead of below with CPPFLAGS and LDFLAGS because we only + dnl learn about this via pkg-config. If we only have + dnl the argument to --with-ssl we don't know what + dnl additional libs may be necessary. Hope that we + dnl don't need any. LIBS="$LIBS $SSL_LIBS" - CPPFLAGS="$CPPFLAGS $SSL_CPPFLAGS" - LDFLAGS="$LDFLAGS $SSL_LDFLAGS" 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" + dnl This is for Msys/Mingw case $host in *-*-msys* | *-*-mingw*) |