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

Work around for bug in RHEL6 curl 7.19.7 port (curl-config --libs reports 

incorrectly.)
This commit is contained in:
Eric J Korpela 2016-09-07 16:14:23 -07:00
parent edac8a5287
commit 0c08a4ef92
2 changed files with 12 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
configure.ac
View File

@ -438,6 +438,11 @@ if test "x${enable_fcgi}" = xyes ; then
dnl m4/boinc_check_fcgi.m4 dnl m4/boinc_check_fcgi.m4
BOINC_CHECK_FCGI BOINC_CHECK_FCGI
fi fi
dnl ---------- SSL (m4/check_ssl.m4)
if [[ "x${enable_client}" = "xyes" -o "x${enable_server}" = "xyes" ]]
then
CHECK_SSL
fi
dnl ---------- libcurl (m4/libcurl.m4) ------------------------------ dnl ---------- libcurl (m4/libcurl.m4) ------------------------------
dnl curl is needed for libraries and those are needed by everything else dnl curl is needed for libraries and those are needed by everything else
@ -469,16 +474,11 @@ else
echo "CURL_LIB_PATHS = ${CURL_LIB_PATHS}" echo "CURL_LIB_PATHS = ${CURL_LIB_PATHS}"
echo "LDFLAGS = ${LDFLAGS}" echo "LDFLAGS = ${LDFLAGS}"
fi fi
BOINC_EXTRA_LIBS="${BOINC_EXTRA_LIBS} ${LIBCURL}" BOINC_EXTRA_LIBS="${BOINC_EXTRA_LIBS} ${LIBCURL}"
fi fi
dnl ---------- SSL (m4/check_ssl.m4) if test "x${found_ssl}" = "xyes"; then
if [[ "x${enable_client}" = "xyes" -o "x${enable_server}" = "xyes" ]] BOINC_EXTRA_LIBS="${BOINC_EXTRA_LIBS} ${SSL_LIBS}"
then
CHECK_SSL
if test "x${found_ssl}" = "xyes"; then
BOINC_EXTRA_LIBS="${BOINC_EXTRA_LIBS} ${SSL_LIBS}"
fi
fi fi
dnl save the libs, since SAH_CHECK_LIB() will change them dnl save the libs, since SAH_CHECK_LIB() will change them

5
m4/libcurl.m4
View File

@ -70,7 +70,6 @@ AC_DEFUN([LIBCURL_CHECK_CONFIG],
fi fi
AC_PATH_PROG([_libcurl_config],[curl-config]) AC_PATH_PROG([_libcurl_config],[curl-config])
if test x$_libcurl_config != "x" ; then if test x$_libcurl_config != "x" ; then
AC_CACHE_CHECK([for the version of libcurl], AC_CACHE_CHECK([for the version of libcurl],
[libcurl_cv_lib_curl_version], [libcurl_cv_lib_curl_version],
@ -107,6 +106,10 @@ AC_DEFUN([LIBCURL_CHECK_CONFIG],
if test x"$LIBCURL" = "x" ; then if test x"$LIBCURL" = "x" ; then
LIBCURL="`$_libcurl_config --libs`" LIBCURL="`$_libcurl_config --libs`"
if test "x`echo \""$LIBCURL"\" | grep ssl`" = x ; then
LIBCURL="${LIBCURL} ${SSL_LIBS}"
fi
# This is so silly, but Apple actually has a bug in their # This is so silly, but Apple actually has a bug in their
# curl-config script. Fixed in Tiger, but there are still # curl-config script. Fixed in Tiger, but there are still
# lots of Panther installs around. # lots of Panther installs around.