Allow nfsdcltrack to be built by default if all of the requirements for it are in place. Set the initial state of $enable_nfsdcltrack to "maybe", and fix the appropriate tests to just disable building the binary unless someone explicitly requests it. Signed-off-by: Jeff Layton <jlayton@xxxxxxxxxx> --- configure.ac | 24 +++++++++++++++++------- 1 file changed, 17 insertions(+), 7 deletions(-) diff --git a/configure.ac b/configure.ac index 65d1bea..aa41e0a 100644 --- a/configure.ac +++ b/configure.ac @@ -187,9 +187,9 @@ fi AC_ARG_ENABLE(nfsdcltrack, [AC_HELP_STRING([--enable-nfsdcltrack], - [enable NFSv4 clientid tracking programs @<:@default=no@:>@])], + [enable NFSv4 clientid tracking programs @<:@default=yes@:>@])], enable_nfsdctrack=$enableval, - enable_nfsdcltrack="no") + enable_nfsdcltrack="maybe") dnl Check for TI-RPC library and headers AC_LIBTIRPC @@ -269,12 +269,22 @@ if test "$enable_nfsv4" = yes; then dnl Check for sqlite3 AC_SQLITE3_VERS - if test "$enable_nfsdcltrack" = "yes"; then + if test "$enable_nfsdcltrack" != "no"; then AC_CHECK_HEADERS([libgen.h sys/inotify.h], , - AC_MSG_ERROR([Cannot find header needed for nfsdcltrack])) - - if test "$libsqlite3_cv_is_recent" != "yes" ; then + if test "$enable_nfsdcltrack" = "yes"; then + AC_MSG_ERROR([Cannot find header needed for nfsdcltrack]) + else + AC_MSG_WARN([Cannot find header needed for nfsdcltrack. Disabling it.]) + enable_nfsdcltrack="no" + fi + ) + fi + if test "$libsqlite3_cv_is_recent" != "yes" ; then + if test "$enable_nfsdcltrack" = "yes"; then AC_MSG_ERROR([nfsdcltrack requires sqlite3]) + elif test "$enable_nfsdcltrack" != "no"; then + AC_MSG_WARN([nfsdcltrack requires sqlite3. Disabling it.]) + enable_nfsdcltrack="no" fi fi @@ -292,7 +302,7 @@ if test "$enable_nfsv41" = yes; then fi dnl enable nfsidmap when its support by libnfsidmap -AM_CONDITIONAL(CONFIG_NFSDCLTRACK, [test "$enable_nfsdcltrack" = "yes" ]) +AM_CONDITIONAL(CONFIG_NFSDCLTRACK, [test "$enable_nfsdcltrack" != "no" ]) AM_CONDITIONAL(CONFIG_NFSIDMAP, [test "$ac_cv_header_keyutils_h$ac_cv_lib_nfsidmap_nfs4_owner_to_uid" = "yesyes"]) -- 1.7.11.7 -- To unsubscribe from this list: send the line "unsubscribe linux-nfs" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
