summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEliot Horowitz <eliot@10gen.com>2010-04-15 10:15:10 -0400
committerEliot Horowitz <eliot@10gen.com>2010-04-15 10:21:55 -0400
commitcddcfc5c94fb9359e5889f3426e3d4aa7438bda9 (patch)
tree11ac0d3f7beff92e34e82b51dd1f62cc989b9bdd
parent4731f0bc59eb09b6c942630baaa415aa04a84c2d (diff)
downloadmongo-cddcfc5c94fb9359e5889f3426e3d4aa7438bda9.tar.gz
newer xulrunner
-rw-r--r--buildscripts/hacks_ubuntu.py4
-rw-r--r--scripting/engine_spidermonkey.h1
2 files changed, 4 insertions, 1 deletions
diff --git a/buildscripts/hacks_ubuntu.py b/buildscripts/hacks_ubuntu.py
index 56649f89355..480c6226856 100644
--- a/buildscripts/hacks_ubuntu.py
+++ b/buildscripts/hacks_ubuntu.py
@@ -39,7 +39,9 @@ def foundxulrunner( env , options ):
env.Prepend( RPATH=[ libroot ] )
env.Prepend( CPPPATH=[ incroot + "stable/" ,
- incroot + "unstable/" ] )
+ incroot + "unstable/" ,
+ incroot ] )
+ env.Prepend( CPPPATH=[ "/usr/include/nspr/" ] )
env.Append( CPPDEFINES=[ "XULRUNNER" , "OLDJS" ] )
if best.find( "1.9.0" ) >= 0 or best.endswith("1.9"):
diff --git a/scripting/engine_spidermonkey.h b/scripting/engine_spidermonkey.h
index a39d8fb1061..4e420de7f26 100644
--- a/scripting/engine_spidermonkey.h
+++ b/scripting/engine_spidermonkey.h
@@ -42,6 +42,7 @@
#endif
#include "jsapi.h"
+#include "jsobj.h"
#include "jsdate.h"
#include "jsregexp.h"