From patchwork Wed Oct 24 15:25:59 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jeff Layton X-Patchwork-Id: 1639181 Return-Path: X-Original-To: patchwork-linux-nfs@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork2.kernel.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by patchwork2.kernel.org (Postfix) with ESMTP id 033ECDF2AB for ; Wed, 24 Oct 2012 15:26:22 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S934800Ab2JXP0U (ORCPT ); Wed, 24 Oct 2012 11:26:20 -0400 Received: from mail-vc0-f174.google.com ([209.85.220.174]:39682 "EHLO mail-vc0-f174.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S934913Ab2JXP0T (ORCPT ); Wed, 24 Oct 2012 11:26:19 -0400 Received: by mail-vc0-f174.google.com with SMTP id fk26so666905vcb.19 for ; Wed, 24 Oct 2012 08:26:18 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=sender:from:to:cc:subject:date:message-id:x-mailer:in-reply-to :references:x-gm-message-state; bh=ZXnnF0E97GGoLxQwVL84ZC9e06nwfUEA7Pqwcq9i0E4=; b=n2khlzmLdWGQaMW0MOF6OnMlXS7FY1kVC04MFE4fdCljtTB43DTAJkONHMCP0xtBtt YpCHsH3gpUIIrGusW/zRn1JflTIqTHiJ4uIF3Qy7D5PgeTlqvHu/I8rjceps4QvjvG94 b/WWq4H/TP+z2+rkEcr4XK4Or1QEdbOnida/ADLxfmFWnpOBWpZTFSrK6cZbSpe8hEVa hF0aEpcKXXV1khjofXlr1FmUbfS64FrTsSb63r60OJUfieau4Sk+g92Lo3QJISV5WU4c PUdlbbTY1tyKbxG0Lp05qzvnNqIX4Z47+q6V3wO84pDngVjqgo6AiyvpbJrx4ip3iYXi PRKQ== Received: by 10.52.90.212 with SMTP id by20mr22505081vdb.118.1351092378758; Wed, 24 Oct 2012 08:26:18 -0700 (PDT) Received: from salusa.poochiereds.net (cpe-107-015-110-129.nc.res.rr.com. [107.15.110.129]) by mx.google.com with ESMTPS id y15sm16388744vdt.9.2012.10.24.08.26.17 (version=SSLv3 cipher=OTHER); Wed, 24 Oct 2012 08:26:18 -0700 (PDT) From: Jeff Layton To: steved@redhat.com Cc: linux-nfs@vger.kernel.org Subject: [PATCH v2 10/10] nfsdcltrack: flip the default in autoconf to "yes" for it Date: Wed, 24 Oct 2012 11:25:59 -0400 Message-Id: <1351092359-25842-11-git-send-email-jlayton@redhat.com> X-Mailer: git-send-email 1.7.11.7 In-Reply-To: <1351092359-25842-1-git-send-email-jlayton@redhat.com> References: <1351092359-25842-1-git-send-email-jlayton@redhat.com> X-Gm-Message-State: ALoCoQl0utz1/Isg5kGBmIygniruOnWYYU+8jRNUCJ5WARIY9Yz24en6GvQM6eYNWGdPpQBir4Nc Sender: linux-nfs-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-nfs@vger.kernel.org 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 --- 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"])