Fix Mesos 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/53137/ Project: http://git-wip-us.apache.org/repos/asf/mesos/repo Commit: http://git-wip-us.apache.org/repos/asf/mesos/commit/cf7b1979 Tree: http://git-wip-us.apache.org/repos/asf/mesos/tree/cf7b1979 Diff: http://git-wip-us.apache.org/repos/asf/mesos/diff/cf7b1979 Branch: refs/heads/1.0.x Commit: cf7b19799feac6f4d076f8323b29758dd51436c4 Parents: 691b167 Author: James Peach <[email protected]> Authored: Thu Nov 3 15:50:59 2016 -0400 Committer: Kapil Arya <[email protected]> Committed: Fri Apr 14 17:16:40 2017 -0400 ---------------------------------------------------------------------- configure.ac | 61 +++++++++++++++++++++++++--------------------------- src/Makefile.am | 2 +- 2 files changed, 30 insertions(+), 33 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/mesos/blob/cf7b1979/configure.ac ---------------------------------------------------------------------- diff --git a/configure.ac b/configure.ac index a2e6541..ddbf68b 100644 --- a/configure.ac +++ b/configure.ac @@ -152,34 +152,34 @@ 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([bundled-pip], AS_HELP_STRING([--disable-bundled-pip], [excludes building and using the bundled pip package in lieu of an installed version in PYTHONPATH]), - [without_bundled_pip=yes], []) + [], [enable_bundled_pip=yes]) AC_ARG_ENABLE([bundled-setuptools], AS_HELP_STRING([--disable-bundled-setuptools], [excludes building and using the bundled setuptools package in lieu of an installed version in PYTHONPATH]), - [without_bundled_setuptools=yes], []) + [], [enable_bundled_setuptools=yes]) AC_ARG_ENABLE([bundled-wheel], AS_HELP_STRING([--disable-bundled-wheel], [excludes building and using the bundled wheel package in lieu of an installed version in PYTHONPATH]), - [without_bundled_wheel=yes], []) + [], [enable_bundled_wheel=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], []) + option won't change them]), + [], [enable_debug=no]) AC_ARG_ENABLE([java], AS_HELP_STRING([--disable-java], @@ -188,25 +188,25 @@ AC_ARG_ENABLE([java], AC_ARG_ENABLE([libevent], AS_HELP_STRING([--enable-libevent], - [use libevent instead of libev default: no]), - [enable_libevent=yes], []) + [use libevent instead of libev]), + [], [enable_libevent=no]) AC_ARG_ENABLE([install-module-dependencies], AS_HELP_STRING([--enable-install-module-dependencies], [Install third-party bundled dependencies required - for module development default: no]), - [enable_install_module_dependencies=yes], []) + for module development]), + [], [enable_install_module_dependencies=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], []) + this option won't change them]), + [], [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([python], AS_HELP_STRING([--disable-python], @@ -221,37 +221,34 @@ AC_ARG_ENABLE([python-dependency-install], [when the python packages are installed during make install, no external dependencies are downloaded or installed]), - [without_python_deps=yes], []) + [], [enable_python_dependency_install=yes]) AC_ARG_ENABLE([ssl], AS_HELP_STRING([--enable-ssl], - [use ssl for libprocess communication - default: no]), - [enable_ssl=yes], []) + [use ssl for libprocess communication]), + [], [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], []) + functions]), + [], [enable_static_unimplemented=no]) AC_ARG_ENABLE([tests-install], AS_HELP_STRING([--enable-tests-install], - [build and install tests and their helper tools - default: no]), + [build and install tests and their helper tools]), [], [enable_tests_install=no]) AC_ARG_ENABLE([xfs-disk-isolator], AS_HELP_STRING([--enable-xfs-disk-isolator], - [builds the XFS disk isolator - default: no]), + [builds the XFS disk isolator]), [], [enable_xfs_disk_isolator=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]) ############################################################################### @@ -593,7 +590,7 @@ AM_CONDITIONAL([OS_LINUX], [test "x$OS_NAME" = "xlinux"]) AM_CONDITIONAL([OS_FREEBSD], [test "x$OS_NAME" = "xfreebsd"]) AM_CONDITIONAL([GIT_REPO], [test -d ${srcdir}"/.git"]) -AM_CONDITIONAL([HAS_GPERFTOOLS], [test "x$gperftools" = "xyes"]) +AM_CONDITIONAL([HAS_GPERFTOOLS], [test "x$enable_perftools" = "xyes"]) AM_CONDITIONAL([INSTALL_MODULE_DEPENDENCIES], [test x"$enable_install_module_dependencies" = "xyes"]) @@ -1690,7 +1687,7 @@ There are two possible workarounds for this issue: # Check if user has asked us to use a preinstalled setuptools, or if # they asked us to ignore all bundled libraries while compiling and linking. - if test "x$without_bundled_setuptools" = "xyes" || \ + if test "x$enable_bundled_setuptools" != "xyes" || \ test "x$enable_bundled" != "xyes"; then AC_PYTHON_MODULE([distutils], [no]) @@ -1725,7 +1722,7 @@ correct if you're already doing this. # Check if user has asked us to use a preinstalled pip, or if # they asked us to ignore all bundled libraries while compiling and linking. - if test "x$without_bundled_pip" = "xyes" || \ + if test "x$enable_bundled_pip" != "xyes" || \ test "x$enable_bundled" != "xyes"; then AC_PYTHON_MODULE([pip], [no]) @@ -1749,7 +1746,7 @@ correct if you're already doing this. # Check if user has asked us to use a preinstalled wheel, or if # they asked us to ignore all bundled libraries while compiling and linking. - if test "x$without_bundled_wheel" = "xyes" || \ + if test "x$enable_bundled_wheel" != "xyes" || \ test "x$enable_bundled" != "xyes"; then AC_PYTHON_MODULE([wheel], [no]) @@ -1783,8 +1780,8 @@ AM_CONDITIONAL([WITH_BUNDLED_PIP], AM_CONDITIONAL([WITH_BUNDLED_WHEEL], [test "x$with_bundled_wheel" = "xyes"]) -AM_CONDITIONAL([WITHOUT_PYTHON_DEPS], - [test "x$without_python_deps" = "xyes"]) +AM_CONDITIONAL([ENABLE_PYTHON_DEPENDENCY_INSTALL], + [test "x$enable_python_dependency_install" = "xyes"]) if test -n "`echo $with_picojson`"; then @@ -2122,7 +2119,7 @@ fi if test -n "`echo $with_zookeeper`"; then CPPFLAGS="$CPPFLAGS -I${with_zookeeper}/include/zookeeper" LDFLAGS="$LDFLAGS -L${with_zookeeper}/lib" -elif test "x$enable_bundled" = "xno"; then +elif test "x$enable_bundled" != "xyes"; then CPPFLAGS="$CPPFLAGS -I/usr/include/zookeeper" fi http://git-wip-us.apache.org/repos/asf/mesos/blob/cf7b1979/src/Makefile.am ---------------------------------------------------------------------- diff --git a/src/Makefile.am b/src/Makefile.am index 28dd151..0643003 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -1785,7 +1785,7 @@ python/dist/setup.cfg: # Makefile.am for an explanation of this variable. pipinstallargs= -if WITHOUT_PYTHON_DEPS +if !ENABLE_PYTHON_DEPENDENCY_INSTALL pipinstallargs += --no-deps endif
