From 4e43308973bebc4b288770e812b163651bd460ad Mon Sep 17 00:00:00 2001 From: "Eric J. Korpela" Date: Fri, 7 Nov 2008 00:22:18 +0000 Subject: [PATCH] Modified LIBCURL_CHECK_CONFIG to check whether curl-config supports the --static-libs flag. Also check location of the ca file. svn path=/trunk/boinc/; revision=16443 --- m4/libcurl.m4 | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/m4/libcurl.m4 b/m4/libcurl.m4 index 8827709240..0a51220239 100644 --- a/m4/libcurl.m4 +++ b/m4/libcurl.m4 @@ -95,6 +95,14 @@ AC_DEFUN([LIBCURL_CHECK_CONFIG], if test x"$LIBCURL_CPPFLAGS" = "x" ; then LIBCURL_CPPFLAGS=`$_libcurl_config --cflags` fi + if test x"$LIBCURL" = "x" ; then + if test "x${disable_static_linkage}" = "xno" ; then + if $_libcurl_config --static-libs 2>&1 > /dev/null ; then + LIBCURL="`$_libcurl_config --static-libs` -lgcrypt" + fi + fi + fi + if test x"$LIBCURL" = "x" ; then LIBCURL=`$_libcurl_config --libs` @@ -184,6 +192,12 @@ x=CURLOPT_VERBOSE; eval AS_TR_SH(libcurl_feature_$_libcurl_feature)=yes done + if test x$libcurl_feature_SSL = xyes ; then + LIBCURL_CABUNDLE=`$_libcurl_config --ca 2>/dev/null` + AC_DEFINE_UNQUOTED(LIBCURL_CABUNDLE,"${LIBCURL_CABUNDLE}",[Define to the name of libcurl's certification file]) + fi + + if test "x$_libcurl_protocols" = "x" ; then # We don't have --protocols, so just assume that all