Currently the build fails if --enable-destructive is specified without
--enable-test, but --enable-destructive assumes that --enable-test is
already specified. Just force --enable-test to satisfy the requirement.
Reported-by: Ross Zwisler <ross.zwisler(a)linux.intel.com>
Signed-off-by: Dan Williams <dan.j.williams(a)intel.com>
---
configure.ac | 14 +++++++-------
1 file changed, 7 insertions(+), 7 deletions(-)
diff --git a/configure.ac b/configure.ac
index 01f4345fa263..126fc6bf16ef 100644
--- a/configure.ac
+++ b/configure.ac
@@ -92,13 +92,6 @@ AS_IF([test "x$enable_debug" = "xyes"], [
AC_DEFINE(ENABLE_DEBUG, [1], [Debug messages.])
])
-AC_ARG_ENABLE([test],
- AS_HELP_STRING([--enable-test], [enable ndctl test command
@<:@default=disabled@:>@]),
- [], [enable_test=no])
-AS_IF([test "x$enable_test" = "xyes"],
- [AC_DEFINE([ENABLE_TEST], [1], [ndctl test support])])
-AM_CONDITIONAL([ENABLE_TEST], [test "x$enable_test" = "xyes"])
-
AC_ARG_ENABLE([destructive],
AS_HELP_STRING([--enable-destructive], [enable destructive functional tests
@<:@default=disabled@:>@]),
[], [enable_destructive=no])
@@ -106,6 +99,13 @@ AS_IF([test "x$enable_destructive" = "xyes"],
[AC_DEFINE([ENABLE_DESTRUCTIVE], [1], [destructive functional tests support])])
AM_CONDITIONAL([ENABLE_DESTRUCTIVE], [test "x$enable_destructive" =
"xyes"])
+AC_ARG_ENABLE([test],
+ AS_HELP_STRING([--enable-test], [enable ndctl test command
@<:@default=disabled@:>@]),
+ [], [enable_test=$enable_destructive])
+AS_IF([test "x$enable_test" = "xyes"],
+ [AC_DEFINE([ENABLE_TEST], [1], [ndctl test support])])
+AM_CONDITIONAL([ENABLE_TEST], [test "x$enable_test" = "xyes"])
+
PKG_CHECK_MODULES([KMOD], [libkmod])
PKG_CHECK_MODULES([UDEV], [libudev])
PKG_CHECK_MODULES([UUID], [uuid])
Show replies by date
On Fri, Jul 29, 2016 at 09:44:02PM -0700, Dan Williams wrote:
Currently the build fails if --enable-destructive is specified
without
--enable-test, but --enable-destructive assumes that --enable-test is
already specified. Just force --enable-test to satisfy the requirement.
Reported-by: Ross Zwisler <ross.zwisler(a)linux.intel.com>
Signed-off-by: Dan Williams <dan.j.williams(a)intel.com>
Tested-by: Ross Zwisler <ross.zwisler(a)linux.intel.com>