Pull in merov_linden/viewer-autobuild2010

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}
     )
 

indra/newview/viewer_manifest.py

@@ -931,12 +931,18 @@ def construct(self):
         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")