[PATCH nfs-utils 1/2] README: update git repository URL

[PATCH nfs-utils 1/2] README: update git repository URL

[Roland Hieber]

The old URL is no longer available. Update to the new URL that is
mentioned on https://linux-nfs.org.

Signed-off-by: Roland Hieber <rhi@pengutronix.de>
---
 README | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README b/README
index 7034c0091d49..663b667437dc 100644
--- a/README
+++ b/README
@@ -34,7 +34,7 @@ To install binaries and documenation, run this command:
 
 Getting nfs-utils for the first time:
 
-	git clone git://linux-nfs.org/nfs-utils
+	git clone git://git.linux-nfs.org/projects/steved/nfs-utils.git
 
 Updating to the latest head after you've already got it.
 
-- 
2.29.2

[PATCH nfs-utils 2/2] configure: check for rpc/rpc.h presence

[Roland Hieber]

Recent versions of glibc (since 2.26?) no longer supply rpc/rpc.h, and
in previous versions, RPC was optional. Detect such cases and prompt the
user to build with libtirpc instead.

Signed-off-by: Roland Hieber <rhi@pengutronix.de>
---
 configure.ac | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/configure.ac b/configure.ac
index f2e1bd30d0f2..25e988dfa33c 100644
--- a/configure.ac
+++ b/configure.ac
@@ -335,6 +335,13 @@ AC_CHECK_HEADERS([sched.h], [], [])
 AC_CHECK_FUNCS([unshare fstatat statx], [] , [])
 AC_LIBPTHREAD([])
 
+# rpc/rpc.h can come from the glibc or from libtirpc
+nfsutils_save_CPPFLAGS="${CPPFLAGS}"
+CPPFLAGS="${CPPFLAGS} ${TIRPC_CFLAGS}"
+AC_CHECK_HEADER(rpc/rpc.h, ,
+                AC_MSG_ERROR([Header file rpc/rpc.h not found - maybe try building with --enable-tirpc]))
+CPPFLAGS="${nfsutils_save_CPPFLAGS}"
+
 if test "$enable_nfsv4" = yes; then
   dnl check for libevent libraries and headers
   AC_LIBEVENT
-- 
2.29.2

Re: [PATCH nfs-utils 1/2] README: update git repository URL

[Steve Dickson]

On 5/25/21 7:27 AM, Roland Hieber wrote:
> The old URL is no longer available. Update to the new URL that is
> mentioned on https://linux-nfs.org.
> 
> Signed-off-by: Roland Hieber <rhi@pengutronix.de>
> ---
>  README | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
Committed (tag: nfs-utils-2-5-4-rc5)

steved.

> 
> diff --git a/README b/README
> index 7034c0091d49..663b667437dc 100644
> --- a/README
> +++ b/README
> @@ -34,7 +34,7 @@ To install binaries and documenation, run this command:
>  
>  Getting nfs-utils for the first time:
>  
> -	git clone git://linux-nfs.org/nfs-utils
> +	git clone git://git.linux-nfs.org/projects/steved/nfs-utils.git
>  
>  Updating to the latest head after you've already got it.
>  
> 

Re: [PATCH nfs-utils 2/2] configure: check for rpc/rpc.h presence

[Steve Dickson]

On 5/25/21 7:27 AM, Roland Hieber wrote:
> Recent versions of glibc (since 2.26?) no longer supply rpc/rpc.h, and
> in previous versions, RPC was optional. Detect such cases and prompt the
> user to build with libtirpc instead.
> 
> Signed-off-by: Roland Hieber <rhi@pengutronix.de>
Committed... (tag: nfs-utils-2-5-4-rc5)

steved.
> ---
>  configure.ac | 7 +++++++
>  1 file changed, 7 insertions(+)
> 
> diff --git a/configure.ac b/configure.ac
> index f2e1bd30d0f2..25e988dfa33c 100644
> --- a/configure.ac
> +++ b/configure.ac
> @@ -335,6 +335,13 @@ AC_CHECK_HEADERS([sched.h], [], [])
>  AC_CHECK_FUNCS([unshare fstatat statx], [] , [])
>  AC_LIBPTHREAD([])
>  
> +# rpc/rpc.h can come from the glibc or from libtirpc
> +nfsutils_save_CPPFLAGS="${CPPFLAGS}"
> +CPPFLAGS="${CPPFLAGS} ${TIRPC_CFLAGS}"
> +AC_CHECK_HEADER(rpc/rpc.h, ,
> +                AC_MSG_ERROR([Header file rpc/rpc.h not found - maybe try building with --enable-tirpc]))
> +CPPFLAGS="${nfsutils_save_CPPFLAGS}"
> +
>  if test "$enable_nfsv4" = yes; then
>    dnl check for libevent libraries and headers
>    AC_LIBEVENT
>