moparisthebest/curl
1
0
Fork 0
mirror of https://github.com/moparisthebest/curl synced 2024-12-22 16:18:48 -05:00
Code Issues Releases Wiki Activity

- David Byron improved the configure script to use pkg-config to find OpenSSL

Browse Source 
(and in particular the list of required libraries) even if a path is given
  as argument to --with-ssl
This commit is contained in:
Kamil Dudka 2009-11-15 15:23:43 +00:00
parent 5b3be2ee35
commit 530fde3a22
2 changed files with 40 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
CHANGES
View File

@ -6,6 +6,11 @@
Changelog 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) Claes Jakobsson (14 Nov 2009)
- curl-config now accepts '--configure' to see what arguments was - curl-config now accepts '--configure' to see what arguments was
passed to the configure script when building curl. passed to the configure script when building curl.

41
configure.ac
View File

@ -1148,6 +1148,7 @@ if test X"$OPT_SSL" != Xno; then
CLEANLDFLAGS="$LDFLAGS" CLEANLDFLAGS="$LDFLAGS"
CLEANCPPFLAGS="$CPPFLAGS" CLEANCPPFLAGS="$CPPFLAGS"
CLEANLIBS="$LIBS" CLEANLIBS="$LIBS"
SAVE_PKG_CONFIG_LIBDIR="$PKG_CONFIG_LIBDIR"
case "$OPT_SSL" in case "$OPT_SSL" in
yes) yes)
@ -1171,12 +1172,25 @@ if test X"$OPT_SSL" != Xno; then
dnl check the given --with-ssl spot dnl check the given --with-ssl spot
PKGTEST="no" PKGTEST="no"
PREFIX_OPENSSL=$OPT_SSL 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" LIB_OPENSSL="$PREFIX_OPENSSL/lib$libsuff"
if test "$PREFIX_OPENSSL" != "/usr" ; then if test "$PREFIX_OPENSSL" != "/usr" ; then
LDFLAGS="$LDFLAGS -L$LIB_OPENSSL" SSL_LDFLAGS="-L$LIB_OPENSSL"
CPPFLAGS="$CPPFLAGS -I$PREFIX_OPENSSL/include" SSL_CPPFLAGS="-I$PREFIX_OPENSSL/include"
fi fi
CPPFLAGS="$CPPFLAGS -I$PREFIX_OPENSSL/include/openssl" SSL_CPPFLAGS="$SSL_CPPFLAGS -I$PREFIX_OPENSSL/include/openssl"
;; ;;
esac esac
@ -1189,15 +1203,30 @@ if test X"$OPT_SSL" != Xno; then
SSL_LDFLAGS=`$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_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'` 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" LIBS="$LIBS $SSL_LIBS"
CPPFLAGS="$CPPFLAGS $SSL_CPPFLAGS"
LDFLAGS="$LDFLAGS $SSL_LDFLAGS"
fi fi
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 dnl This is for Msys/Mingw
case $host in case $host in
*-*-msys* | *-*-mingw*) *-*-msys* | *-*-mingw*)