Commit 712cb972 authored by Rom Walton's avatar Rom Walton

libcurl depends on openssl, GCC is order dependent and fails with unresolved...

libcurl depends on openssl, GCC is order dependent and fails with unresolved symbol errors if curl is included after openssl.

svn path=/trunk/boinc/; revision=12670
parent 73230372
......@@ -239,12 +239,6 @@ esac
dnl m4/boinc_getsockopt.m4
BOINC_GETSOCKOPT_TYPE
dnl ---------- SSL (m4/check_ssl.m4)
CHECK_SSL
if test "${found_ssl}" = "yes"; then
BOINC_EXTRA_LIBS="${BOINC_EXTRA_LIBS} ${SSL_LIBS}"
fi
dnl ---------- libcurl (m4/libcurl.m4) ------------------------------
if test "${enable_client}" = yes; then
......@@ -284,6 +278,12 @@ ERROR: could not find (recent enough) development-libs for libcurl.
fi
dnl ---------- SSL (m4/check_ssl.m4)
CHECK_SSL
if test "${found_ssl}" = "yes"; then
BOINC_EXTRA_LIBS="${BOINC_EXTRA_LIBS} ${SSL_LIBS}"
fi
dnl save the libs, since SAH_CHECK_LIB() will change them
SAVELIBS_AAF="${LIBS}"
SAH_CHECK_LIB([cygipc], [shmget],
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment