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:15:52 -0400
commit22c7c88d013d78091e097525b43a9cfa69385a7b (patch)
tree7284b5a5f15bae16a9446ab921a229085039f1fb
parent5bd47701aa3e9dfb3345035e614959f1fd3ee702 (diff)
downloadmongo-v1.2.tar.gz
newer xulrunnerv1.2
-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 8aeb56cc5fc..938df68651b 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"