From b7637e58bef73abfced2721d6b697e47b2d9f622 Mon Sep 17 00:00:00 2001
From: "Andrew A. de Laix" <alain@lindenlab.com>
Date: Thu, 13 Jan 2011 13:09:27 -0800
Subject: mac buiding with autobuild and autobuild style packages (just say no
 to install.py)

---
 indra/cmake/OpenSSL.cmake | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'indra/cmake/OpenSSL.cmake')

diff --git a/indra/cmake/OpenSSL.cmake b/indra/cmake/OpenSSL.cmake
index 81584c09ea..c692b67b49 100644
--- a/indra/cmake/OpenSSL.cmake
+++ b/indra/cmake/OpenSSL.cmake
@@ -13,7 +13,7 @@ else (STANDALONE)
   else (WINDOWS)
     set(OPENSSL_LIBRARIES ssl)
   endif (WINDOWS)
-  set(OPENSSL_INCLUDE_DIRS ${LIBS_PREBUILT_DIR}/${LL_ARCH_DIR}/include)
+  set(OPENSSL_INCLUDE_DIRS ${LIBS_PREBUILT_DIR}/include)
 endif (STANDALONE)
 
 if (LINUX)
-- 
cgit v1.3


From d9715317b17152c445f6c5933fbeb2c1e0900bba Mon Sep 17 00:00:00 2001
From: "Andrew A. de Laix" <alain@lindenlab.com>
Date: Mon, 7 Mar 2011 14:54:50 -0800
Subject: update openSSL archive usage for darwin.

---
 autobuild.xml             | 4 ++--
 indra/cmake/OpenSSL.cmake | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

(limited to 'indra/cmake/OpenSSL.cmake')

diff --git a/autobuild.xml b/autobuild.xml
index 0736a6afca..aa3414efc5 100644
--- a/autobuild.xml
+++ b/autobuild.xml
@@ -1244,9 +1244,9 @@
             <key>archive</key>
             <map>
               <key>hash</key>
-              <string>9cf8e84cb91996616cf627ad18c85442</string>
+              <string>facee34b8bd57ad602157e65a5af1a49</string>
               <key>url</key>
-              <string>http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/openSSL-0.9.8l-darwin-20101004.tar.bz2</string>
+              <string>http://automated-builds-secondlife-com.s3.amazonaws.com/hg/repo/3p-openssl/rev/220986/arch/Darwin/installer/openssl-0.9.8q-darwin-20110211.tar.bz2</string>
             </map>
             <key>name</key>
             <string>darwin</string>
diff --git a/indra/cmake/OpenSSL.cmake b/indra/cmake/OpenSSL.cmake
index c692b67b49..5982ee9a49 100644
--- a/indra/cmake/OpenSSL.cmake
+++ b/indra/cmake/OpenSSL.cmake
@@ -19,5 +19,5 @@ endif (STANDALONE)
 if (LINUX)
   set(CRYPTO_LIBRARIES crypto)
 elseif (DARWIN)
-  set(CRYPTO_LIBRARIES llcrypto)
+  set(CRYPTO_LIBRARIES crypto)
 endif (LINUX)
-- 
cgit v1.3