Merge branch 'vapier-master'

c050fca1 · Tatsuhiro Tsujikawa · 90bcdb0d · 19309823 · c050fca1
Commit c050fca1 authored Jun 18, 2015 by Tatsuhiro Tsujikawa
Hide whitespace changes
Inline Side-by-side

Showing with 4 additions and 3 deletions

configure.ac configure.ac +4 -3

No files found.
--- a/configure.ac
+++ b/configure.ac
@@ -464,11 +464,12 @@ fi

 AM_CONDITIONAL([ENABLE_EXAMPLES], [ test "x${enable_examples}" = "xyes" ])

-# third-party only be built if either enable_examples or enable_app is
-# yes
+# third-party only be built when needed

 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
 fi