diff options
| author | Eliot Horowitz <erh@tnt3.localdomain> | 2009-03-31 22:09:10 -0400 |
|---|---|---|
| committer | Eliot Horowitz <erh@tnt3.localdomain> | 2009-03-31 22:09:10 -0400 |
| commit | 1f476f2524833546a92255210ffea8feb6d7b504 (patch) | |
| tree | a0425eeb9a20ca0c96c9c736b5643406ae49c06a | |
| parent | 86d6f70c83a73ee1e8481cff5edbc4ed818c9f4c (diff) | |
| parent | c3ba79f829b29c254e29b55c05d83b767f24868d (diff) | |
| download | mongo-1f476f2524833546a92255210ffea8feb6d7b504.tar.gz | |
Merge branch 'master' of git@github.com:mongodb/mongo
| -rw-r--r-- | SConstruct | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/SConstruct b/SConstruct index a7e928557f6..e0728a690a1 100644 --- a/SConstruct +++ b/SConstruct @@ -400,7 +400,7 @@ def doConfigure( myenv , needJava=True , needPcre=True , shell=False ): print( "can't find stdc++ library which is needed" ); Exit(1) - def myCheckLib( poss , failIfNotFound=False , java=False ): + def myCheckLib( poss , failIfNotFound=False , java=False , staticOnly=False): if type( poss ) != types.ListType : poss = [poss] @@ -426,8 +426,8 @@ def doConfigure( myenv , needJava=True , needPcre=True , shell=False ): extra += " 32 bit version for shell" print( "ERROR: can't find static version of: " + str( poss ) + extra + " in: " + str( allPlaces ) ) Exit(1) - - res = conf.CheckLib( poss ) + + res = not staticOnly and conf.CheckLib( poss ) if res: return True @@ -468,7 +468,7 @@ def doConfigure( myenv , needJava=True , needPcre=True , shell=False ): myCheckLib( "pcrecpp" , True ) myCheckLib( "pcre" , True ) - myenv["_HAVEPCAP"] = myCheckLib( "pcap" ) + myenv["_HAVEPCAP"] = myCheckLib( "pcap", staticOnly=release ) if shell: haveReadLine = False |