[the-board] [script] Fix Ubuntu's workaround for libmozjs.so in LD_LIBRARY_PATH

[Lucas Rocha <lucasr src gnome org>]

commit 8922f95a1904131f8c4302013677be31dbffddfe
Author: Lucas Rocha <lucasr gnome org>
Date:   Mon Jan 31 22:45:43 2011 +0000

    [script] Fix Ubuntu's workaround for libmozjs.so in LD_LIBRARY_PATH
    
    The the-board-uninstalled script doesn't actually need it because it's always
    used inside a jhbuild environment which does set the proper mozilla ld paths
    already.

 src/the-board-uninstalled.in |   12 ++----------
 src/the-board.in             |   11 +++++++----
 2 files changed, 9 insertions(+), 14 deletions(-)
---
diff --git a/src/the-board-uninstalled.in b/src/the-board-uninstalled.in
index e18563b..24590dd 100644
--- a/src/the-board-uninstalled.in
+++ b/src/the-board-uninstalled.in
@@ -12,18 +12,10 @@ 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:$MOZJS_LD_LIBRARY_PATH
+    export LD_LIBRARY_PATH= abs_top_srcdir@/src/.libs
 else
-    export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:@abs_top_srcdir@/src/.libs:$MOZJS_LD_LIBRARY_PATH
+    export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:@abs_top_srcdir@/src/.libs
 fi
 
 if test x"$FONTCONFIG_FILE" = x ; then
diff --git a/src/the-board.in b/src/the-board.in
index 5d083d8..61868c6 100644
--- a/src/the-board.in
+++ b/src/the-board.in
@@ -9,10 +9,13 @@ 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
+
+for i in /usr/lib/xulrunner-2.0b* /usr/lib/xulrunner-2.0.0.* ; do
+   if [ -f ${i}/libmozjs.so ] ; then
+       MOZJS_LD_LIBRARY_PATH=${i}
+       break
+   fi
+done
 
 if test x"$LD_LIBRARY_PATH" = x ; then
     export LD_LIBRARY_PATH=$MOZJS_LD_LIBRARY_PATH