From patchwork Mon Oct 1 11:52:40 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jeff Layton X-Patchwork-Id: 1531081 Return-Path: X-Original-To: patchwork-linux-nfs@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork1.kernel.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by patchwork1.kernel.org (Postfix) with ESMTP id A80883FE1C for ; Mon, 1 Oct 2012 11:52:53 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752275Ab2JALww (ORCPT ); Mon, 1 Oct 2012 07:52:52 -0400 Received: from mail-gh0-f174.google.com ([209.85.160.174]:38295 "EHLO mail-gh0-f174.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751821Ab2JALww (ORCPT ); Mon, 1 Oct 2012 07:52:52 -0400 Received: by ghbg15 with SMTP id g15so1356084ghb.19 for ; Mon, 01 Oct 2012 04:52:51 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=sender:from:to:subject:date:message-id:x-mailer:in-reply-to :references:x-gm-message-state; bh=hf2a4RBRt79Q2aMo2slNIYTJdLGdCQXGP74pLx+rYqE=; b=mUOFYHlCuDPl2z4RKj+4ptNAFkH0KoSs0unae6ymmdk432MZBH72CG7XREIwb1Nu8V zuedPtCvmo7yzqzTiGwyo+lH3JXL5uNRdZObsl0d3JrVGU1Fd+0YFzu4fJqxNy1FdvGe 2nuxn7Dg5HP71ucdvWmJf0LBory/uU8S21+dZrWU2jLueDUPnYEq2SVEEVCik2ee9Q9V uTqLO3+ZwzElGBDsBuWqSEld7xcQlPGUryo0z+t4P3913HCczxeyAl1skZlPX612BjqX KYu7LeSgcyAYRKNbb1ilDtdc7qNfQu7z0smDQb6NaG34Cog5E1lmL/e5Rl4zUVRK/kGX oRNA== Received: by 10.100.199.18 with SMTP id w18mr4588375anf.48.1349092371532; Mon, 01 Oct 2012 04:52:51 -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 r43sm5736025yhc.0.2012.10.01.04.52.50 (version=SSLv3 cipher=OTHER); Mon, 01 Oct 2012 04:52:50 -0700 (PDT) From: Jeff Layton To: linux-nfs@vger.kernel.org Subject: [PATCH 1/6] nfsdcltrack: rename the nfsdcld directory and options to nfsdcltrack Date: Mon, 1 Oct 2012 07:52:40 -0400 Message-Id: <1349092365-23920-2-git-send-email-jlayton@redhat.com> X-Mailer: git-send-email 1.7.11.4 In-Reply-To: <1349092365-23920-1-git-send-email-jlayton@redhat.com> References: <1349092365-23920-1-git-send-email-jlayton@redhat.com> X-Gm-Message-State: ALoCoQluDOLVSzUR2KLcC1ebBv3ByjeckTpKCqCdBd8Ittj1LpV/MC1dpVf8S4KuTy9n02p49m9j Sender: linux-nfs-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-nfs@vger.kernel.org We'll soon be adding a new nfsdcltrack program, at which point it won't make much sense to call this directory and the config option "nfsdcld". Rename it to be a bit more generic. Signed-off-by: Jeff Layton --- configure.ac | 20 ++++++++++---------- utils/Makefile.am | 4 ++-- utils/{nfsdcld => nfsdcltrack}/Makefile.am | 0 utils/{nfsdcld => nfsdcltrack}/nfsdcld.c | 0 utils/{nfsdcld => nfsdcltrack}/nfsdcld.man | 0 utils/{nfsdcld => nfsdcltrack}/sqlite.c | 0 utils/{nfsdcld => nfsdcltrack}/sqlite.h | 0 7 files changed, 12 insertions(+), 12 deletions(-) rename utils/{nfsdcld => nfsdcltrack}/Makefile.am (100%) rename utils/{nfsdcld => nfsdcltrack}/nfsdcld.c (100%) rename utils/{nfsdcld => nfsdcltrack}/nfsdcld.man (100%) rename utils/{nfsdcld => nfsdcltrack}/sqlite.c (100%) rename utils/{nfsdcld => nfsdcltrack}/sqlite.h (100%) diff --git a/utils/nfsdcld/Makefile.am b/utils/nfsdcltrack/Makefile.am similarity index 100% rename from utils/nfsdcld/Makefile.am rename to utils/nfsdcltrack/Makefile.am diff --git a/utils/nfsdcld/nfsdcld.c b/utils/nfsdcltrack/nfsdcld.c similarity index 100% rename from utils/nfsdcld/nfsdcld.c rename to utils/nfsdcltrack/nfsdcld.c diff --git a/utils/nfsdcld/nfsdcld.man b/utils/nfsdcltrack/nfsdcld.man similarity index 100% rename from utils/nfsdcld/nfsdcld.man rename to utils/nfsdcltrack/nfsdcld.man diff --git a/utils/nfsdcld/sqlite.c b/utils/nfsdcltrack/sqlite.c similarity index 100% rename from utils/nfsdcld/sqlite.c rename to utils/nfsdcltrack/sqlite.c diff --git a/utils/nfsdcld/sqlite.h b/utils/nfsdcltrack/sqlite.h similarity index 100% rename from utils/nfsdcld/sqlite.h rename to utils/nfsdcltrack/sqlite.h diff --git a/configure.ac b/configure.ac index a174bf4..65d1bea 100644 --- a/configure.ac +++ b/configure.ac @@ -185,11 +185,11 @@ else AM_CONDITIONAL(MOUNT_CONFIG, [test "$enable_mount" = "yes"]) fi -AC_ARG_ENABLE(nfsdcld, - [AC_HELP_STRING([--enable-nfsdcld], - [Create nfsdcld NFSv4 clientid tracking daemon. @<:@default=no@:>@])], - enable_nfsdcld=$enableval, - enable_nfsdcld="no") +AC_ARG_ENABLE(nfsdcltrack, + [AC_HELP_STRING([--enable-nfsdcltrack], + [enable NFSv4 clientid tracking programs @<:@default=no@:>@])], + enable_nfsdctrack=$enableval, + enable_nfsdcltrack="no") dnl Check for TI-RPC library and headers AC_LIBTIRPC @@ -269,12 +269,12 @@ if test "$enable_nfsv4" = yes; then dnl Check for sqlite3 AC_SQLITE3_VERS - if test "$enable_nfsdcld" = "yes"; then + if test "$enable_nfsdcltrack" = "yes"; then AC_CHECK_HEADERS([libgen.h sys/inotify.h], , - AC_MSG_ERROR([Cannot find header needed for nfsdcld])) + AC_MSG_ERROR([Cannot find header needed for nfsdcltrack])) if test "$libsqlite3_cv_is_recent" != "yes" ; then - AC_MSG_ERROR([nfsdcld requires sqlite3]) + AC_MSG_ERROR([nfsdcltrack requires sqlite3]) fi fi @@ -292,7 +292,7 @@ if test "$enable_nfsv41" = yes; then fi dnl enable nfsidmap when its support by libnfsidmap -AM_CONDITIONAL(CONFIG_NFSDCLD, [test "$enable_nfsdcld" = "yes" ]) +AM_CONDITIONAL(CONFIG_NFSDCLTRACK, [test "$enable_nfsdcltrack" = "yes" ]) AM_CONDITIONAL(CONFIG_NFSIDMAP, [test "$ac_cv_header_keyutils_h$ac_cv_lib_nfsidmap_nfs4_owner_to_uid" = "yesyes"]) @@ -477,7 +477,7 @@ AC_CONFIG_FILES([ tools/nfs-iostat/Makefile utils/Makefile utils/blkmapd/Makefile - utils/nfsdcld/Makefile + utils/nfsdcltrack/Makefile utils/exportfs/Makefile utils/gssd/Makefile utils/idmapd/Makefile diff --git a/utils/Makefile.am b/utils/Makefile.am index 09045dd..b892dc8 100644 --- a/utils/Makefile.am +++ b/utils/Makefile.am @@ -21,8 +21,8 @@ if CONFIG_MOUNT OPTDIRS += mount endif -if CONFIG_NFSDCLD -OPTDIRS += nfsdcld +if CONFIG_NFSDCLTRACK +OPTDIRS += nfsdcltrack endif SUBDIRS = \