From 981e4f39b227c38c05f7c4500ebf7b7b14d1201d Mon Sep 17 00:00:00 2001
From: narv <narvczervik@gmail.com>
Date: Thu, 12 May 2011 07:41:49 -0700
Subject: [PATCH] Revert to build llcommon on Darwin

---
 indra/llcommon/CMakeLists.txt    | 9 +++++++++
 indra/newview/viewer_manifest.py | 2 ++
 2 files changed, 11 insertions(+)

diff --git a/indra/llcommon/CMakeLists.txt b/indra/llcommon/CMakeLists.txt
index 7f352269b..29fa35619 100644
--- a/indra/llcommon/CMakeLists.txt
+++ b/indra/llcommon/CMakeLists.txt
@@ -216,3 +216,12 @@ target_link_libraries(
     ${WINDOWS_LIBRARIES}
     )
 
+if (DARWIN)
+    # Don't embed a full path in the library's install name
+    set_target_properties(
+        llcommon
+        PROPERTIES
+        BUILD_WITH_INSTALL_RPATH 1
+        INSTALL_NAME_DIR "@executable_path/../Resources"
+      )
+endif (DARWIN)
diff --git a/indra/newview/viewer_manifest.py b/indra/newview/viewer_manifest.py
index 8c2b42f5e..0bead92ab 100755
--- a/indra/newview/viewer_manifest.py
+++ b/indra/newview/viewer_manifest.py
@@ -495,6 +495,8 @@ class DarwinManifest(ViewerManifest):
                 self.path("vivox-runtime/universal-darwin/libortp.dylib", "libortp.dylib")
                 self.path("vivox-runtime/universal-darwin/libvivoxsdk.dylib", "libvivoxsdk.dylib")
                 self.path("vivox-runtime/universal-darwin/SLVoice", "SLVoice")
+
+		self.path("../llcommon/" + self.args['configuration'] + "/libllcommon.dylib", "libllcommon.dylib")
                 
                 libfile = "lib%s.dylib"
                 libdir = "../../libraries/universal-darwin/lib_release"