Received-SPF: pass (google.com: domain of linux-nfs-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20;
Message-ID: <2561e8c5-ce9c-6649-389e-08c49d919cf2@redhat.com>
Date:   Tue, 20 Sep 2022 15:37:42 -0400
MIME-Version: 1.0
User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:102.0) Gecko/20100101
 Thunderbird/102.2.0
Subject: Re: [PATCH] configure.ac: allow to disable nfsrahead tool
Content-Language: en-US
To:     Giulio Benetti <giulio.benetti@benettiengineering.com>,
        linux-nfs@vger.kernel.org
Cc:     Petr Vorel <pvorel@suse.cz>
References: <20220919221832.2234294-1-giulio.benetti@benettiengineering.com>
From:   Steve Dickson <steved@redhat.com>
In-Reply-To: <20220919221832.2234294-1-giulio.benetti@benettiengineering.com>
Content-Type: text/plain; charset=UTF-8; format=flowed
Content-Transfer-Encoding: 7bit
Precedence: bulk


On 9/19/22 6:18 PM, Giulio Benetti wrote:
> This allows to make libmount not mandatory but depending on nfsrahead
> since it only requires it. This is useful when cross-compiling because
> in that case we need rpcgen only built for host but not nfsrahead that
> also require libmount. So this reduces the dependencies for host
> building.
> 
> Signed-off-by: Giulio Benetti <giulio.benetti@benettiengineering.com>
Committed... (tag: nfs-utils-2-6-3-rc2)

steved.
> ---
>   configure.ac      | 13 ++++++++++---
>   tools/Makefile.am |  6 +++++-
>   2 files changed, 15 insertions(+), 4 deletions(-)
> 
> diff --git a/configure.ac b/configure.ac
> index ff85200b..5d9cbf31 100644
> --- a/configure.ac
> +++ b/configure.ac
> @@ -249,6 +249,16 @@ AC_ARG_ENABLE(nfsdcld,
>   	enable_nfsdcld=$enableval,
>   	enable_nfsdcld="yes")
>   
> +AC_ARG_ENABLE(nfsrahead,
> +	[AS_HELP_STRING([--disable-nfsrahead],[disable nfsrahead command @<:@default=no@:>@])],
> +	enable_nfsrahead=$enableval,
> +	enable_nfsrahead="yes")
> +	AM_CONDITIONAL(CONFIG_NFSRAHEAD, [test "$enable_nfsrahead" = "yes" ])
> +	if test "$enable_nfsrahead" = yes; then
> +		dnl Check for -lmount
> +		PKG_CHECK_MODULES([LIBMOUNT], [mount])
> +	fi
> +
>   AC_ARG_ENABLE(nfsdcltrack,
>   	[AS_HELP_STRING([--disable-nfsdcltrack],[disable NFSv4 clientid tracking programs @<:@default=no@:>@])],
>   	enable_nfsdcltrack=$enableval,
> @@ -273,9 +283,6 @@ AC_LIBCAP
>   dnl Check for -lxml2
>   AC_LIBXML2
>   
> -dnl Check for -lmount
> -PKG_CHECK_MODULES([LIBMOUNT], [mount])
> -
>   # Check whether user wants TCP wrappers support
>   AC_TCP_WRAPPERS
>   
> diff --git a/tools/Makefile.am b/tools/Makefile.am
> index 40c17c37..48fd0cdf 100644
> --- a/tools/Makefile.am
> +++ b/tools/Makefile.am
> @@ -12,6 +12,10 @@ if CONFIG_NFSDCLD
>   OPTDIRS += nfsdclddb
>   endif
>   
> -SUBDIRS = locktest rpcdebug nlmtest mountstats nfs-iostat rpcctl nfsdclnts nfsrahead $(OPTDIRS)
> +if CONFIG_NFSRAHEAD
> +OPTDIRS += nfsrahead
> +endif
> +
> +SUBDIRS = locktest rpcdebug nlmtest mountstats nfs-iostat rpcctl nfsdclnts $(OPTDIRS)
>   
>   MAINTAINERCLEANFILES = Makefile.in