File slviewer-1.21.6.0-enable_mozlib.patch of Package slviewer-beta

diff -Nur --exclude viewer-linux-x86_64 linden/indra/cmake/Mozlib.cmake linden.patched/indra/cmake/Mozlib.cmake
--- linden/indra/cmake/Mozlib.cmake	2008-10-17 17:37:58.000000000 +0200
+++ linden.patched/indra/cmake/Mozlib.cmake	2008-10-21 23:04:22.220118161 +0200
@@ -15,7 +15,12 @@
     add_definitions(-DLL_LLMOZLIB_ENABLED=1)
 
     if (LINUX)
-        link_directories(${CMAKE_SOURCE_DIR}/newview/app_settings/mozilla-runtime-linux-${ARCH})
+        link_directories(${MOZLIB_LIBRARY_DIR})
+        if (${ARCH} STREQUAL "i686")
+           set(CMAKE_EXE_LINKER_FLAGS "-Wl,-rpath -Wl,/usr/lib/llmozlib2 " )
+        else (${ARCH} STREQUAL "i686")
+           set(CMAKE_EXE_LINKER_FLAGS "-Wl,-rpath -Wl,/usr/lib64/llmozlib2 " )
+        endif (${ARCH} STREQUAL "i686")
         set(MOZLIB_LIBRARIES
             llmozlib2
             mozjs
diff -Nur --exclude viewer-linux-x86_64 linden/indra/llmedia/CMakeLists.txt linden.patched/indra/llmedia/CMakeLists.txt
--- linden/indra/llmedia/CMakeLists.txt	2008-10-17 17:37:59.000000000 +0200
+++ linden.patched/indra/llmedia/CMakeLists.txt	2008-10-21 14:08:37.272698994 +0200
@@ -15,6 +15,7 @@
 include_directories(
     ${GSTREAMER_INCLUDE_DIRS}
     ${GSTREAMER_PLUGINS_BASE_INCLUDE_DIRS}
+    ${MOZLIB_INCLUDE_DIR}
     ${LLAUDIO_INCLUDE_DIRS}
     ${LLCOMMON_INCLUDE_DIRS}
     ${LLIMAGE_INCLUDE_DIRS}
diff -Nur --exclude viewer-linux-x86_64 linden/indra/newview/CMakeLists.txt linden.patched/indra/newview/CMakeLists.txt
--- linden/indra/newview/CMakeLists.txt	2008-10-17 17:38:01.000000000 +0200
+++ linden.patched/indra/newview/CMakeLists.txt	2008-10-21 23:06:22.456117421 +0200
@@ -869,7 +869,7 @@
 
 if (LINUX)
     LIST(APPEND viewer_SOURCE_FILES llappviewerlinux.cpp)
-    LIST(APPEND CMAKE_EXE_LINKER_FLAGS -Wl,--as-needed)
+    set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -Wl,--as-needed")
 
     set(viewer_LIBRARIES
         Xinerama