secondlife-standalone-maint-svn/link_against_system_mozlib.patch

   1 diff -Naur o/maint-viewer/indra/cmake/Mozlib.cmake p/maint-viewer/indra/cmake/Mozlib.cmake
   2 --- o/maint-viewer/indra/cmake/Mozlib.cmake     2009-08-18 02:09:39.000000000 +0200
   3 +++ p/maint-viewer/indra/cmake/Mozlib.cmake     2009-08-18 02:05:06.210986952 +0200
   4 @@ -15,7 +15,11 @@
   5      add_definitions(-DLL_LLMOZLIB_ENABLED=1)
   6
   7      if (LINUX)
   8 -        link_directories(${CMAKE_SOURCE_DIR}/newview/app_settings/mozilla-runtime-linux-${ARCH})
   9 +        link_directories(/usr/lib/llmozlib2/runtime_release)
  10 +        link_directories(/usr/lib/llmozlib2/lib_release)
  11 +        link_directories(/usr/lib)
  12 +        include_directories(/usr/include)
  13 +        include_directories(/usr/include/llmozlib2)
  14          set(MOZLIB_LIBRARIES
  15              llmozlib2
  16              mozjs
  17 @@ -26,16 +30,15 @@
  18              xul
  19              profdirserviceprovider_s
  20              )
  21 -       set(MOZLIB_INCLUDE_DIR ${LIBS_PREBUILT_DIR}/include)
  22 -       set(MOZLIB_LIBRARIES ${LIBS_PREBUILT_DIR}/${LL_ARCH_DIR}/lib_release_client/libllmozlib2.a
  23 -                            ${LIBS_PREBUILT_DIR}/${LL_ARCH_DIR}/lib_release_client/libmozjs.so
  24 -                            ${LIBS_PREBUILT_DIR}/${LL_ARCH_DIR}/lib_release_client/libnspr4.so
  25 -                            ${LIBS_PREBUILT_DIR}/${LL_ARCH_DIR}/lib_release_client/libplc4.so
  26 -                            ${LIBS_PREBUILT_DIR}/${LL_ARCH_DIR}/lib_release_client/libplds4.so
  27 -                            ${LIBS_PREBUILT_DIR}/${LL_ARCH_DIR}/lib_release_client/libprofdirserviceprovider_s.a
  28 -                            ${LIBS_PREBUILT_DIR}/${LL_ARCH_DIR}/lib_release_client/libxul.so)
  29 -
  30 -
  31 +        set(MOZLIB_INCLUDE_DIR /usr/include /usr/include/llmozlib2)
  32 +        set(MOZLIB_LIBRARIES  /usr/lib/libllmozlib2.a
  33 +                              /usr/lib/llmozlib2/lib_release/libmozjs.so
  34 +                              /usr/lib/llmozlib2/lib_release/libnspr4.so
  35 +                              /usr/lib/llmozlib2/lib_release/libplc4.so
  36 +                              /usr/lib/llmozlib2/lib_release/libplds4.so
  37 +                              /usr/lib/llmozlib2/lib_release/libprofdirserviceprovider_s.a
  38 +                              /usr/lib/llmozlib2/lib_release/libxpcom.so
  39 +                              /usr/lib/llmozlib2/lib_release/libxul.so)
  40      elseif (WINDOWS)
  41          if (MSVC71)
  42              set(MOZLIB_LIBRARIES