From 5e90d9fac98f7741eee3cd2c9e0d97fc11d2baef Mon Sep 17 00:00:00 2001 From: Enji Cooper Date: Wed, 25 Dec 2024 23:08:57 -0800 Subject: [PATCH] Remove `--with-atf` This flag was replaced by `--enable-atf` in 0.5. Signed-off-by: Enji Cooper --- INSTALL.md | 2 +- configure.ac | 13 ++++++------- 2 files changed, 7 insertions(+), 8 deletions(-) diff --git a/INSTALL.md b/INSTALL.md index c658570..2389b23 100644 --- a/INSTALL.md +++ b/INSTALL.md @@ -128,7 +128,7 @@ The following flags are specific to Lutok's `configure` script: detection features regardless of the value of this flag. However, such warnings are only fatal when `--enable-developer` is set to "yes". -- `--with-atf` +- `--enable-atf` - **Possible values**: "yes", "no", "auto". - **Default**: "auto" diff --git a/configure.ac b/configure.ac index 357a8d6..7bed5c6 100644 --- a/configure.ac +++ b/configure.ac @@ -59,14 +59,13 @@ AC_ARG_ENABLE([atf], AM_CONDITIONAL([WITH_ATF], [test "x$enable_atf" = "xyes"]) # ATF dependencies -if test "x$enable_atf" = "xyes"; then - ATF_CHECK_CXX([>= 0.22]) - ATF_CHECK_SH([>= 0.22]) -else - AC_MSG_NOTICE([ATF support disabled]) -fi +m4_ifdef([ATF_CHECK_CXX],[ +AS_IF([test "x$enable_atf" = "xyes"],[ + ATF_CHECK_CXX([>= 0.21]) + ATF_CHECK_SH([>= 0.21]) +],[AC_MSG_NOTICE([ATF support disabled])]) +]) -ATF_ARG_WITH KYUA_DOXYGEN KYUA_LUA