Fix libprocess build option argument handling. Fix all the AC_ARG_ENABLED options to correctly handle --enable-foo and --disable-foo variants. Update all the invocations to have a consistent calling convention.
Review: https://reviews.apache.org/r/53138/ Project: http://git-wip-us.apache.org/repos/asf/mesos/repo Commit: http://git-wip-us.apache.org/repos/asf/mesos/commit/517cbeaf Tree: http://git-wip-us.apache.org/repos/asf/mesos/tree/517cbeaf Diff: http://git-wip-us.apache.org/repos/asf/mesos/diff/517cbeaf Branch: refs/heads/1.0.x Commit: 517cbeaf14aeb07032f0dbe2795608b55b58d4d4 Parents: cf7b197 Author: James Peach <[email protected]> Authored: Thu Nov 3 15:51:04 2016 -0400 Committer: Kapil Arya <[email protected]> Committed: Fri Apr 14 17:17:02 2017 -0400 ---------------------------------------------------------------------- 3rdparty/libprocess/configure.ac | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/mesos/blob/517cbeaf/3rdparty/libprocess/configure.ac ---------------------------------------------------------------------- diff --git a/3rdparty/libprocess/configure.ac b/3rdparty/libprocess/configure.ac index c71fec0..98654ae 100644 --- a/3rdparty/libprocess/configure.ac +++ b/3rdparty/libprocess/configure.ac @@ -73,13 +73,13 @@ AC_ARG_ENABLE([bundled], AS_HELP_STRING([--disable-bundled], [build against preinstalled dependencies instead of bundled libraries]), - [enable_bundled=no], [enable_bundled=yes]) + [], [enable_bundled=yes]) AC_ARG_ENABLE([debug], AS_HELP_STRING([--enable-debug], [enable debugging. If CFLAGS/CXXFLAGS are set, this option won't change them default: no]), - [enable_debug=yes], []) + [], [enable_debug=no]) AC_ARG_ENABLE([install], AS_HELP_STRING([--enable-install], @@ -89,36 +89,36 @@ AC_ARG_ENABLE([install], AC_ARG_ENABLE([libevent], AS_HELP_STRING([--enable-libevent], [use libevent instead of libev default: no]), - [enable_libevent=yes], []) + [], [enable_libevent=no]) AC_ARG_ENABLE([optimize], AS_HELP_STRING([--enable-optimize], [enable optimizations. If CFLAGS/CXXFLAGS are set, this option won't change them default: no]), - [enable_optimize=yes], []) + [], [enable_optimize=no]) AC_ARG_ENABLE([perftools], AS_HELP_STRING([--enable-perftools], - [enable google perftools]), - [gperftools=yes], []) + [enable Google perftools]), + [], [enable_perftools=no]) AC_ARG_ENABLE([ssl], AS_HELP_STRING([--enable-ssl], [use ssl for libprocess communication default: no]), - [enable_ssl=yes], []) + [], [enable_ssl=no]) AC_ARG_ENABLE([static-unimplemented], AS_HELP_STRING([--enable-static-unimplemented], [generate static assertion errors for unimplemented functions default: no]), - [enable_static_unimplemented=yes], []) + [], [enable_static_unimplemented=no]) AC_ARG_ENABLE([zlib], AS_HELP_STRING([--disable-zlib], [disables zlib compression, which means the webui will be far less responsive; not recommended]), - [enable_zlib=no], [enable_zlib=yes]) + [], [enable_zlib=yes]) ############################################################################### @@ -338,7 +338,7 @@ if test "x$enable_static_unimplemented" = "xyes"; then AC_DEFINE([ENABLE_STATIC_UNIMPLEMENTED], [1]) fi -AM_CONDITIONAL([HAS_GPERFTOOLS], [test x"$gperftools" = "xyes"]) +AM_CONDITIONAL([HAS_GPERFTOOLS], [test x"$enable_perftools" = "xyes"]) AM_COND_IF([HAS_GPERFTOOLS], AC_DEFINE([ENABLE_GPERFTOOLS], [1])) # Disable static libprocess by default.
