diff options
| author | Eliot Horowitz <eliot@10gen.com> | 2009-07-23 20:48:23 -0400 |
|---|---|---|
| committer | Eliot Horowitz <eliot@10gen.com> | 2009-07-23 20:48:23 -0400 |
| commit | 2d61cb2d7c475ceeb76055cb473b1f1a6e84f360 (patch) | |
| tree | af8ee405478154e2af43db38d00f6cf172e8f618 /SConstruct | |
| parent | 767d576ca4730946feb34534625d0b96ab4e2018 (diff) | |
| download | mongo-2d61cb2d7c475ceeb76055cb473b1f1a6e84f360.tar.gz | |
don't link against pcap except for mongosniff
Diffstat (limited to 'SConstruct')
| -rw-r--r-- | SConstruct | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/SConstruct b/SConstruct index b9ca5eadaaa..c3a1f2a7b0c 100644 --- a/SConstruct +++ b/SConstruct @@ -152,6 +152,10 @@ AddOption( "--boost-compiler", # --- environment setup --- +def removeIfInList( lst , thing ): + if thing in lst: + lst.remove( thing ) + def printLocalInfo(): import sys, SCons print( "scons version: " + SCons.__version__ ) @@ -598,6 +602,7 @@ def doConfigure( myenv , needJava=True , needPcre=True , shell=False ): myCheckLib( "pcre" , True ) myenv["_HAVEPCAP"] = myCheckLib( "pcap" ) + removeIfInList( myenv["LIBS"] , "pcap" ) # this is outside of usesm block so don't have to rebuild for java if windows: @@ -707,10 +712,6 @@ env.Append( BUILDERS={'JSHeader' : jshBuilder}) # --- targets ---- -def removeIfInList( lst , thing ): - if thing in lst: - lst.remove( thing ) - clientEnv = env.Clone(); clientEnv.Append( CPPPATH=["../"] ) clientEnv.Prepend( LIBS=[ "mongoclient"] ) |