Merge branch 'vapier-master'

This commit is contained in:
Tatsuhiro Tsujikawa 2015-06-18 17:55:50 +09:00
commit c050fca177
1 changed files with 4 additions and 3 deletions

View File

@ -464,11 +464,12 @@ fi
AM_CONDITIONAL([ENABLE_EXAMPLES], [ test "x${enable_examples}" = "xyes" ]) AM_CONDITIONAL([ENABLE_EXAMPLES], [ test "x${enable_examples}" = "xyes" ])
# third-party only be built if either enable_examples or enable_app is # third-party only be built when needed
# yes
enable_third_party=no enable_third_party=no
if test "x${enable_examples}" = "xyes" || test "x${enable_app}" = "xyes"; then if test "x${enable_examples}" = "xyes" ||
test "x${enable_app}" = "xyes" ||
test "x${enable_asio_lib}" = "xyes"; then
enable_third_party=yes enable_third_party=yes
fi fi