mirror of https://github.com/BOINC/boinc.git
Changes from Reinhard to make openssl and curl detection independent.
Useful for building backend components. svn path=/trunk/boinc/; revision=7916
This commit is contained in:
parent
8abc9883d2
commit
b55feabfc7
|
@ -11490,3 +11490,10 @@ Rom 7 Sept 2005 (staging)
|
|||
- Tag for 5.1.2 release, all platforms
|
||||
boinc_core_release_5.1.2
|
||||
|
||||
Bruce 7 Sept 2005
|
||||
- From Reinhard: make openssl and curl detection independent; useful for
|
||||
building server backend components.
|
||||
configure.ac
|
||||
m4/
|
||||
check_ssl.m4
|
||||
|
||||
|
|
20
configure.ac
20
configure.ac
|
@ -255,7 +255,10 @@ dnl m4/boinc_getsockopt.m4
|
|||
BOINC_GETSOCKOPT_TYPE
|
||||
|
||||
dnl ---------- SSL (m4/check_ssl.m4)
|
||||
##CHECK_SSL
|
||||
CHECK_SSL
|
||||
if test "${found_ssl}" = "yes"; then
|
||||
BOINC_EXTRA_LIBS="${BOINC_EXTRA_LIBS} ${SSL_LIBS}"
|
||||
fi
|
||||
|
||||
dnl ---------- libcurl (m4/libcurl.m4) ------------------------------
|
||||
|
||||
|
@ -279,16 +282,19 @@ ERROR: could not find (recent enough) development-libs for libcurl.
|
|||
================================================================================
|
||||
])
|
||||
else
|
||||
if test "${enable_debug}" = yes; then
|
||||
echo "LIBCURL = ${LIBCURL}"
|
||||
echo "LIBCURL_CPPFLAGS = ${LIBCURL_CPPFLAGS}"
|
||||
fi
|
||||
|
||||
## add libcurl et al. to the list of statically linked libs
|
||||
STATIC_LIB_LIST="${STATIC_LIB_LIST} curl idn crypto ssl krb5 k5crypto gssapi_krb5 com_err resolv"
|
||||
CPPFLAGS="${CPPFLAGS} ${LIBCURL_CPPFLAGS}"
|
||||
CURL_LIB_PATHS=`echo $LIBCURL | sed 's/-l[[^ ]]*//g'`
|
||||
LDFLAGS="$LDFLAGS $CURL_LIB_PATHS"
|
||||
LDFLAGS="$CURL_LIB_PATHS $LDFLAGS"
|
||||
|
||||
if test "${enable_debug}" = yes; then
|
||||
echo "LIBCURL = ${LIBCURL}"
|
||||
echo "LIBCURL_CPPFLAGS = ${LIBCURL_CPPFLAGS}"
|
||||
echo "CURL_LIB_PATHS = ${CURL_LIB_PATHS}"
|
||||
echo "LDFLAGS = ${LDFLAGS}"
|
||||
fi
|
||||
|
||||
fi
|
||||
|
||||
fi
|
||||
|
|
|
@ -36,7 +36,7 @@ if test x_$found_ssl != x_yes; then
|
|||
])
|
||||
else
|
||||
printf "OpenSSL found in $ssldir\n";
|
||||
LIBS="$LIBS -lssl -lcrypto";
|
||||
SSL_LIBS="-lssl -lcrypto";
|
||||
LDFLAGS="$LDFLAGS -L$ssldir/lib";
|
||||
AC_DEFINE_UNQUOTED([USE_OPENSSL],[1],
|
||||
["Define to 1 if you want to use the openssl crypto library"])
|
||||
|
|
Loading…
Reference in New Issue