Merge branch 'master' of git@github.com:mongodb/mongo

1 files changed, 18 insertions, 0 deletions

diff --git a/SConstruct b/SConstruct
index 9ac8f982cbf..70a87e3d997 100644
--- a/SConstruct
+++ b/SConstruct
@@ -312,6 +312,7 @@ elif "sunos5" == os.sys.platform:
      javaHome = "/usr/lib/jvm/java-6-sun/"
      javaOS = "solaris"
      env.Append( CPPDEFINES=[ "__linux__" , "__sunos__" ] )
+     env.Append( LIBS=["socket"] )
 
 elif "win32" == os.sys.platform:
     windows = True
@@ -535,10 +536,27 @@ def doConfigure( myenv , needJava=True , needPcre=True , shell=False ):
         
     myenv["_HAVEPCAP"] = myCheckLib( "pcap", staticOnly=release )
 
+    # this is outside of usesm block so don't have to rebuild for java
+    if windows:
+        myenv.Append( CPPDEFINES=[ "XP_WIN" ] )
+    else:
+        myenv.Append( CPPDEFINES=[ "XP_UNIX" ] )
+
     if usesm:
+
         myCheckLib( [ "js" , "mozjs" ] , True )
+        mozHeader = "js"
         if bigLibString(myenv).find( "mozjs" ) >= 0:
             myenv.Append( CPPDEFINES=[ "MOZJS" ] )
+            mozHeader = "mozjs"
+
+        if not conf.CheckHeader( mozHeader + "/jsapi.h" ):
+            if conf.CheckHeader( "jsapi.h" ):
+                myenv.Append( CPPDEFINES=[ "OLDJS" ] )
+                print( "warning: old spider monkey version" )
+            else:
+                print( "no spider monkey headers!" )
+                Exit(1)
 
     if shell:
         haveReadLine = False