From b260e89eef8d3c4a0a06419697f822de1f53f2a9 Mon Sep 17 00:00:00 2001
From: Andrew de Laix <alain@lindenlab.com>
Date: Thu, 17 Mar 2011 21:48:47 +0000
Subject: package .so links needed by linux webkit plugin.

---
 indra/newview/viewer_manifest.py | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/indra/newview/viewer_manifest.py b/indra/newview/viewer_manifest.py
index f600cb42b0..b48b0e7a3a 100644
--- a/indra/newview/viewer_manifest.py
+++ b/indra/newview/viewer_manifest.py
@@ -931,12 +931,18 @@ class Linux_i686Manifest(LinuxManifest):
         super(Linux_i686Manifest, self).construct()
 
         if self.prefix("../packages/lib/release", dst="lib"):
+            self.path("libapr-1.so")
+            self.path("libapr-1.so.0")
             self.path("libapr-1.so.0.4.2")
+            self.path("libaprutil-1.so")
+            self.path("libaprutil-1.so.0")
             self.path("libaprutil-1.so.0.3.10")
             self.path("libbreakpad_client.so.0.0.0")
             self.path("libbreakpad_client.so.0")
             self.path("libbreakpad_client.so")
             self.path("libdb-5.1.so")
+            self.path("libdb-5.so")
+            self.path("libdb.so")
             self.path("libcrypto.so.0.9.8")
             self.path("libexpat.so.1.5.2")
             self.path("libssl.so.0.9.8")
-- 
cgit v1.2.3


From 28eaade69b4b330db7a9dfea528cc4f0a3998841 Mon Sep 17 00:00:00 2001
From: Merov Linden <merov@lindenlab.com>
Date: Thu, 17 Mar 2011 22:51:23 -0700
Subject: Autobuild: Fix Mac building failure: c-ares linking of mac_updater

---
 indra/mac_updater/CMakeLists.txt | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/indra/mac_updater/CMakeLists.txt b/indra/mac_updater/CMakeLists.txt
index a4a6b50c6c..00dcedecaa 100644
--- a/indra/mac_updater/CMakeLists.txt
+++ b/indra/mac_updater/CMakeLists.txt
@@ -5,6 +5,7 @@ project(mac_updater)
 include(00-Common)
 include(OpenSSL)
 include(CURL)
+include(CARes)
 include(LLCommon)
 include(LLVFS)
 include(Linking)
@@ -12,6 +13,8 @@ include(Linking)
 include_directories(
     ${LLCOMMON_INCLUDE_DIRS}
     ${LLVFS_INCLUDE_DIRS}
+    ${CURL_INCLUDE_DIRS}
+    ${CARES_INCLUDE_DIRS}
     )
 
 set(mac_updater_SOURCE_FILES
@@ -53,6 +56,7 @@ target_link_libraries(mac-updater
     ${OPENSSL_LIBRARIES}
     ${CRYPTO_LIBRARIES}
     ${CURL_LIBRARIES}
+    ${CARES_LIBRARIES}
     ${LLCOMMON_LIBRARIES}
     )
 
-- 
cgit v1.2.3