diff options
| author | Rüdiger Timm <rt@openoffice.org> | 2005-03-30 10:43:16 +0000 |
|---|---|---|
| committer | Rüdiger Timm <rt@openoffice.org> | 2005-03-30 10:43:16 +0000 |
| commit | 1740375bd32c1a3a5f19ece4ba88817d06317911 (patch) | |
| tree | b6a4d1dc31d50f5574c2b9a2f49c297dfa91b1ea /desktop | |
| parent | 166701096ab98e3dabfb9168df53720612dc4ea4 (diff) | |
INTEGRATION: CWS systemmozilla (1.13.64); FILE MERGED
2005/02/07 20:42:35 rene 1.13.64.1: #i17187# use system mozilla ... (patch)
try to find libnss3 from the system and set the library path accordingly.
based on patch from pmladek@suse.cz
Diffstat (limited to 'desktop')
| -rw-r--r-- | desktop/scripts/soffice.sh | 24 |
1 files changed, 14 insertions, 10 deletions
diff --git a/desktop/scripts/soffice.sh b/desktop/scripts/soffice.sh index 807aef302595..803325230f87 100644 --- a/desktop/scripts/soffice.sh +++ b/desktop/scripts/soffice.sh @@ -96,15 +96,19 @@ fi # set search path for shared libraries sd_platform=`uname -s` +moz_lib= +for moz_lib_path in $MOZILLA_LIBRARY_PATH /usr/lib /usr/lib/mozilla /usr/lib/mozilla-firefox /usr/lib/mozilla-thunderbird /opt/mozilla/lib /opt/MozillaFirefox/lib /opt/MozillaThunderbird/lib; do + test -f $moz_lib_path/libnss3.so && moz_lib="$moz_lib_path" && break; +done case $sd_platform in AIX) # this is a temporary hack until we can live with the default search paths if [ $LIBPATH ]; then SYSTEM_LIBPATH=$LIBPATH export SYSTEM_LIBPATH - LIBPATH="$sd_prog":$LIBPATH + LIBPATH="$sd_prog:$moz_lib":$LIBPATH else - LIBPATH="$sd_prog" + LIBPATH="$sd_prog:$moz_lib" fi export LIBPATH ;; @@ -114,9 +118,9 @@ case $sd_platform in if [ $DYLD_LIBRARY_PATH ]; then SYSTEM_DYLD_LIBRARY_PATH=$DYLD_LIBRARY_PATH export SYSTEM_DYLD_LIBRARY_PATH - DYLD_LIBRARY_PATH="$sd_prog":$DYLD_LIBRARY_PATH + DYLD_LIBRARY_PATH="$sd_prog:$moz_lib":$DYLD_LIBRARY_PATH else - DYLD_LIBRARY_PATH="$sd_prog" + DYLD_LIBRARY_PATH="$sd_prog:$moz_lib" fi export DYLD_LIBRARY_PATH ;; @@ -126,9 +130,9 @@ case $sd_platform in if [ $SHLIB_PATH ]; then SYSTEM_SHLIB_PATH=$SHLIB_PATH export SYSTEM_SHLIB_PATH - SHLIB_PATH="$sd_prog":/usr/openwin/lib:$SHLIB_PATH + SHLIB_PATH="$sd_prog:$moz_lib":/usr/openwin/lib:$SHLIB_PATH else - SHLIB_PATH="$sd_prog":/usr/openwin/lib + SHLIB_PATH="$sd_prog:$moz_lib":/usr/openwin/lib fi export SHLIB_PATH ;; @@ -138,9 +142,9 @@ case $sd_platform in if [ $LD_LIBRARYN32_PATH ]; then SYSTEM_LD_LIBRARYN32_PATH=$LD_LIBRARYN32_PATH export SYSTEM_LD_LIBRARYN32_PATH - LD_LIBRARYN32_PATH=:"$sd_prog":$LD_LIBRARYN32_PATH + LD_LIBRARYN32_PATH=:"$sd_prog:$moz_lib":$LD_LIBRARYN32_PATH else - LD_LIBRARYN32_PATH=:"$sd_prog" + LD_LIBRARYN32_PATH=:"$sd_prog:$moz_lib" fi export LD_LIBRARYN32_PATH ;; @@ -150,9 +154,9 @@ case $sd_platform in if [ $LD_LIBRARY_PATH ]; then SYSTEM_LD_LIBRARY_PATH=$LD_LIBRARY_PATH export SYSTEM_LD_LIBRARY_PATH - LD_LIBRARY_PATH="$sd_prog":$LD_LIBRARY_PATH + LD_LIBRARY_PATH="$sd_prog:$moz_lib":$LD_LIBRARY_PATH else - LD_LIBRARY_PATH="$sd_prog" + LD_LIBRARY_PATH="$sd_prog:$moz_lib" fi export LD_LIBRARY_PATH ;; |