bug-hurd
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[PATCH] Disable NFS translator & daemon when Sun RPC support is missing


From: Ludovic Courtès
Subject: [PATCH] Disable NFS translator & daemon when Sun RPC support is missing
Date: Thu, 03 Nov 2011 23:12:52 +0100
User-agent: Gnus/5.110018 (No Gnus v0.18) Emacs/24.0.90 (gnu/linux)

Hello,

The patch below disables building of the NFS translator and daemon when
Sun/ONC RPC support is missing, as is the case with GNU libc 2.14+, and
until TI-RPC actually is actually buildable on GNU.

OK to apply?

Thanks,
Ludo’.

diff --git a/Makefile b/Makefile
index ad187d0..e0ba052 100644
--- a/Makefile
+++ b/Makefile
@@ -1,6 +1,6 @@
 #
 #   Copyright (C) 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2001, 2002, 2004,
-#   2006, 2009 Free Software Foundation, Inc.
+#   2006, 2009, 2011 Free Software Foundation, Inc.
 #
 #   This program is free software; you can redistribute it and/or
 #   modify it under the terms of the GNU General Public License as
@@ -35,13 +35,17 @@ lib-subdirs = libshouldbeinlibc libihash libiohelp libports 
libthreads \
 
 # Hurd programs
 prog-subdirs = auth proc exec init term \
-              ufs ext2fs isofs nfs tmpfs fatfs \
+              ufs ext2fs isofs tmpfs fatfs \
               storeio pflocal pfinet defpager mach-defpager \
-              login daemons nfsd boot console \
+              login daemons boot console \
               hostmux usermux ftpfs trans \
               console-client utils sutils ufs-fsck ufs-utils \
               benchmarks fstests
 
+ifeq ($(HAVE_SUN_RPC),yes)
+prog-subdirs += nfs nfsd
+endif
+
 # Other directories
 other-subdirs = hurd doc config release include
 
diff --git a/config.make.in b/config.make.in
index 986ea2a..beb89d1 100644
--- a/config.make.in
+++ b/config.make.in
@@ -66,6 +66,9 @@ PARTED_LIBS = @PARTED_LIBS@
 LIBNCURSESW = @LIBNCURSESW@
 NCURSESW_INCLUDE = @NCURSESW_INCLUDE@
 
+# Whether TI-RPC or GNU libc's RPC support is available.
+HAVE_SUN_RPC = @HAVE_SUN_RPC@
+
 # Installation tools.
 INSTALL = @INSTALL@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
diff --git a/configure.in b/configure.in
index 1cf4daa..283e52c 100644
--- a/configure.in
+++ b/configure.in
@@ -230,6 +230,14 @@ AC_MSG_RESULT($boot_store_types)
 # Check for ncursesw, which is needed for the console-curses client.
 hurd_LIB_NCURSESW
 
+# Check for Sun RPC headers.  Sun RPC support is no longer available
+# starting from GNU libc 2.14 and will be provided by TI-RPC.
+# However TI-RPC has yet to be ported to GNU/Hurd:
+# see <http://lists.debian.org/debian-hurd/2010/12/msg00007.html>.
+AC_CHECK_HEADER([rpc/types.h], [HAVE_SUN_RPC=yes], [HAVE_SUN_RPC=no])
+AC_SEARCH_LIBS([clnt_create], [], [:], [HAVE_SUN_RPC=no])
+AC_SUBST([HAVE_SUN_RPC])
+
 if test -f ./$ac_unique_file; then
   # Configuring in source directory; don't create any Makefiles.
   makefiles=

reply via email to

[Prev in Thread] Current Thread [Next in Thread]