From 6d7787b87860463038da9ddf4dfa393f103091ff Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Sat, 5 Nov 2011 17:58:27 +0100 Subject: Disable NFS translator and daemon compilation when Sun RPC is lacking. * Makefile (prog-subdirs): Make `nfs' and `nfsd' conditional on $(HAVE_SUN_RPC) = yes. * config.make.in (HAVE_SUN_RPC): New variable. * configure.in: Check for and `clnt_create'. * README.CVS: Document dependency on a Sun RPC implementation. --- Makefile | 10 +++++++--- README.CVS | 7 +++++++ config.make.in | 3 +++ configure.in | 5 +++++ 4 files changed, 22 insertions(+), 3 deletions(-) diff --git a/Makefile b/Makefile index ad187d0d..e0ba0523 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/README.CVS b/README.CVS index 781acdeb..92a2392d 100644 --- a/README.CVS +++ b/README.CVS @@ -17,6 +17,13 @@ GNU Mach at least 1.3 GNU C library CVS from 2004-03-09 or later GNU C compiler at least 3.3.2 +Optionally, a Sun RPC implementation is needed to build the NFS +translator and daemon: + +GNU C library at most 2.13 +TI-RPC (currently fails to build on GNU, see + .) + Obviously, you also need somewhat recent versions of binutils, make, bash and some other tools. No hard requirements are currently known for these, though. diff --git a/config.make.in b/config.make.in index 986ea2ae..41452464 100644 --- a/config.make.in +++ b/config.make.in @@ -66,6 +66,9 @@ PARTED_LIBS = @PARTED_LIBS@ LIBNCURSESW = @LIBNCURSESW@ NCURSESW_INCLUDE = @NCURSESW_INCLUDE@ +# Whether Sun 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 1cf4daab..635242d2 100644 --- a/configure.in +++ b/configure.in @@ -230,6 +230,11 @@ 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 and library. +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= -- cgit v1.2.3