diff -r 0d2b3d8256a9 indra/cmake/CURL.cmake --- a/indra/cmake/CURL.cmake Mon Dec 20 09:57:39 2010 -0800 +++ b/indra/cmake/CURL.cmake Mon Dec 20 22:24:58 2010 -0800 @@ -10,10 +10,10 @@ use_prebuilt_binary(curl) if (WINDOWS) set(CURL_LIBRARIES - debug libcurld - optimized libcurl) + debug libcurld.lib + optimized libcurl.lib) else (WINDOWS) - set(CURL_LIBRARIES curl) + set(CURL_LIBRARIES libcurl.a) endif (WINDOWS) set(CURL_INCLUDE_DIRS ${LIBS_PREBUILT_DIR}/include) endif (STANDALONE) diff -r 0d2b3d8256a9 indra/mac_updater/CMakeLists.txt --- a/indra/mac_updater/CMakeLists.txt Mon Dec 20 09:57:39 2010 -0800 +++ b/indra/mac_updater/CMakeLists.txt Mon Dec 20 22:24:58 2010 -0800 @@ -3,6 +3,7 @@ project(mac_updater) include(00-Common) +include(OpenSSL) include(CURL) include(LLCommon) include(LLVFS) @@ -49,6 +50,8 @@ target_link_libraries(mac-updater ${LLVFS_LIBRARIES} + ${OPENSSL_LIBRARIES} + ${CRYPTO_LIBRARIES} ${CURL_LIBRARIES} ${LLCOMMON_LIBRARIES} ) diff -r 0d2b3d8256a9 install.xml --- a/install.xml Mon Dec 20 09:57:39 2010 -0800 +++ b/install.xml Mon Dec 20 22:24:58 2010 -0800 @@ -233,16 +233,16 @@ darwin md5sum - 752e295ccb17f0dcb7c0167db3ad1e69 + ca8f0134fa5ab6f34a6eeb8d0896c9b0 url - http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/curl-7.20.1-darwin-20100606.tar.bz2 + https://s3.amazonaws.com/automated-builds-secondlife-com/hg/repo/brad_curl-autobuild/rev/216961/arch/Darwin/installer/curl-7.21.1-darwin-20101214.tar.bz2 linux md5sum - a20e73f2e7d6a032ff25a5161b1b7394 + 9c9b629b62bf874d550c430ad678dc04 url - http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/curl-7.20.1-linux-20100527.tar.bz2 + https://s3.amazonaws.com/automated-builds-secondlife-com/hg/repo/brad_curl-autobuild/rev/216961/arch/Linux/installer/curl-7.21.1-linux-20101215.tar.bz2 linux64 @@ -254,9 +254,9 @@ windows md5sum - b28856d3d02ee680353ae440561a6579 + 48691883065a82d53691d73aae81d4c1 url - http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/curl-7.20.1-windows-20100611.tar.bz2 + https://s3.amazonaws.com/automated-builds-secondlife-com/hg/repo/brad_curl-autobuild/rev/216961/arch/CYGWIN/installer/curl-7.21.1-windows-20101214.tar.bz2