gjs r71 - trunk

[otaylor svn gnome org]

Author: otaylor
Date: Mon Nov  3 21:24:33 2008
New Revision: 71
URL: http://svn.gnome.org/viewvc/gjs?rev=71&view=rev

Log:
Check for mozilla-js.pc before xulrunner-js.pc

On Ubuntu, xulrunner-js.pc is from the libmozjs package, which
has an older version of spidermonkey, while mozilla-js.pc comes
from xulrunner-1.9, and has a more up-to-date version. So 
check for mozilla-js.pc first.


Modified:
   trunk/configure.ac

Modified: trunk/configure.ac
==============================================================================
--- trunk/configure.ac	(original)
+++ trunk/configure.ac	Mon Nov  3 21:24:33 2008
@@ -48,9 +48,16 @@
 # Checks for libraries.
 m4_define(gobject_required_version, 2.16.0)
 
-## spidermonkey .pc file name varies across distributions
-PKG_CHECK_EXISTS([firefox-js], [JS_PACKAGE=firefox-js],
-                 [PKG_CHECK_EXISTS([xulrunner-js], [JS_PACKAGE=xulrunner-js], [JS_PACKAGE=mozilla-js])])
+## spidermonkey .pc file name varies across distributions and Gecko version
+##
+## mozilla-js: Gecko 1.9, all distributions
+## xulrunner-js: Gecko 1.8 (and earlier?) Debian/Ubuntu
+## firefox-js: ???
+##
+## Checking for mozilla-js first will hopefully get us the newest version
+## of spidermonkey.
+PKG_CHECK_EXISTS([mozilla-js], [JS_PACKAGE=mozilla-js],
+                 [PKG_CHECK_EXISTS([xulrunner-js], [JS_PACKAGE=xulrunner-js], [JS_PACKAGE=firefox-js])])
 
 PKG_CHECK_MODULES(JS, $JS_PACKAGE)
 AC_SUBST(JS_PACKAGE)