Created
October 18, 2012 06:14
-
-
Save suma/3910145 to your computer and use it in GitHub Desktop.
jubatus/simple-server diff
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| diff --git a/src/framework/mixer/wscript b/src/framework/mixer/wscript | |
| index 17b366e..20fe479 100644 | |
| --- a/src/framework/mixer/wscript | |
| +++ b/src/framework/mixer/wscript | |
| @@ -5,11 +5,12 @@ def configure(conf): | |
| pass | |
| def build(bld): | |
| - bld.shlib(target = 'jubamixer', | |
| - source = 'linear_mixer.cpp', | |
| - use = 'PFICOMMON jubacommon MSGPACK LIBGLOG jubacommon_mprpc') | |
| + if bld.env.HAVE_ZOOKEEPER_H: | |
| + bld.shlib(target = 'jubamixer', | |
| + source = 'linear_mixer.cpp', | |
| + use = 'PFICOMMON jubacommon MSGPACK LIBGLOG jubacommon_mprpc') | |
| - bld.install_files('${PREFIX}/include/jubatus/framework/mixer', [ | |
| - 'mixer.hpp', | |
| - 'linear_mixer.hpp' | |
| - ]) | |
| + bld.install_files('${PREFIX}/include/jubatus/framework/mixer', [ | |
| + 'mixer.hpp', | |
| + 'linear_mixer.hpp' | |
| + ]) | |
| diff --git a/src/server/wscript b/src/server/wscript | |
| index 1c5809b..8c58166 100644 | |
| --- a/src/server/wscript | |
| +++ b/src/server/wscript | |
| @@ -27,7 +27,7 @@ def build_one(bld, name, libraries = '', sources = ''): | |
| source = '%s_test.cpp' % name, | |
| target = '%s_test' % name, | |
| includes = '.', | |
| - use = 'PFICOMMON MSGPACK jubacommon_mprpc', | |
| + use = 'PFICOMMON jubacommon MSGPACK jubacommon_mprpc', | |
| ) |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment