[the-board] [script] Work around Ubuntu's xulrunner bug



commit c778a9c6a7488592dbe01e249a71843cdfb64312
Author: Lucas Rocha <lucasr gnome org>
Date:   Mon Jan 31 16:12:57 2011 +0000

    [script] Work around Ubuntu's xulrunner bug
    
    LINK TO BUG

 src/the-board-uninstalled.in |   12 ++++++++++--
 src/the-board.in             |   14 ++++++++++++++
 2 files changed, 24 insertions(+), 2 deletions(-)
---
diff --git a/src/the-board-uninstalled.in b/src/the-board-uninstalled.in
index a6328ad..b84386d 100644
--- a/src/the-board-uninstalled.in
+++ b/src/the-board-uninstalled.in
@@ -12,10 +12,18 @@ else
     export GI_TYPELIB_PATH= abs_top_srcdir@/src:$GI_TYPELIB_PATH
 fi
 
+# Work around Ubuntu xulrunner bug:
+# http://bugzilla.gnome.org/show_bug.cgi?id=573413
+MOZJS_LD_LIBRARY_PATH=""
+MOZJS_LIB_DIR=`pkg-config --variable=sdkdir mozilla-js | sed -e "s/-\(sdk\|devel\)//"`
+if test x"$MOZJS_LIB_DIR" != x ; then
+    MOZJS_LD_LIBRARY_PATH=$MOZJS_LIB_DIR
+fi
+
 if test x"LD_LIBRARY_PATH" = x ; then
-    export LD_LIBRARY_PATH= abs_top_srcdir@/src/.libs
+    export LD_LIBRARY_PATH= abs_top_srcdir@/src/.libs:$MOZJS_LD_LIBRARY_PATH
 else
-    export LD_LIBRARY_PATH= abs_top_srcdir@/src/.libs:$LD_LIBRARY_PATH
+    export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:@abs_top_srcdir@/src/.libs:$MOZJS_LD_LIBRARY_PATH
 fi
 
 if test x"$FONTCONFIG_FILE" = x ; then
diff --git a/src/the-board.in b/src/the-board.in
index 9de8c87..bf838bb 100644
--- a/src/the-board.in
+++ b/src/the-board.in
@@ -6,6 +6,20 @@ else
     export GJS_PATH= pkgdatadir@/js:$GJS_PATH
 fi
 
+# Work around Ubuntu xulrunner bug:
+# http://bugzilla.gnome.org/show_bug.cgi?id=573413
+MOZJS_LD_LIBRARY_PATH=""
+MOZJS_LIB_DIR=`pkg-config --variable=sdkdir mozilla-js | sed -e "s/-\(sdk\|devel\)//"`
+if test x"$MOZJS_LIB_DIR" != x ; then
+    MOZJS_LD_LIBRARY_PATH=$MOZJS_LIB_DIR
+fi
+
+if test x"$LD_LIBRARY_PATH" = x ; then
+    export LD_LIBRARY_PATH=$MOZJS_LD_LIBRARY_PATH
+else
+    export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:$MOZJS_LD_LIBRARY_PATH
+fi
+
 if test x"$FONTCONFIG_FILE" = x ; then
     export FONTCONFIG_FILE= pkgdatadir@/fonts.conf
 fi



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]