Rooba
/
boinc
mirror of https://github.com/BOINC/boinc.git
1
0
Fork 0
Code Issues 1 Packages Projects Releases Wiki Activity

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
This commit is contained in:
Eric J. Korpela 2008-11-07 00:22:18 +00:00
parent 894df8935c
commit 4e43308973
1 changed files with 14 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
m4/libcurl.m4
View File

@ -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