Changeset 89

Timestamp:

Jan 27, 2011, 11:07:48 AM (13 years ago)

Author:

david

Message:

-bug fix javascript package on ubuntu ticket #16

File:

• trunk/zoo-kernel/configure.ac (modified) (2 diffs)

trunk/zoo-kernel/configure.ac

@@ -327 +327 @@
                                 JS_LDFLAGS="-L/usr/lib -lmozjs -lm"
                                 JS_LIB="mozjs"
-                        else
-                                AC_MSG_ERROR([You must install libmozjs-dev or specify your custom install of libjs])
+                        else 
+                                XUL_VERSION="`dpkg -l | grep xulrunner-dev | awk '{print $3;}' | sed -e 's/\([[0-9]]\{1,2\}\.[[0-9]]\{1,2\}\.[[0-9]]\{1,2\}\.[[0-9]]\{1,2\}\).*/\1/'`"
+                                if test -n "$XUL_VERSION"
+                                then
+                                        JS_CPPFLAGS="-I/usr/include/xulrunner-$XUL_VERSION"
+                                        JS_LDFLAGS="-L/usr/lib/xulrunner-$XUL_VERSION -lmozjs -lm"
+                                        JS_LIB="mozjs"
+                                else
+                                        AC_MSG_ERROR([You must install libmozjs-dev or xulrunner-dev ])
+                                fi
                         fi
                 else
@@ -339 +347 @@
 
         fi 
-
+        echo "################################"
+        echo $JS_CPPFLAGS
+        echo "##################################"
         CPPFLAGS_SAVE="$CPPFLAGS"
         CPPFLAGS="$JS_CPPFLAGS"