Merge branch 'upstream' into upstream-merged

3 files changed, 82 insertions, 0 deletions

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
+                 <http://lists.debian.org/debian-hurd/2010/12/msg00007.html>.)
+
 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/configure b/configure
index db1574fb..717648c6 100755
--- a/configure
+++ b/configure
@@ -595,6 +595,7 @@ ac_includes_default="\
 
 ac_subst_vars='LTLIBOBJS
 LIBOBJS
+HAVE_SUN_RPC
 LIBNCURSESW
 NCURSESW_INCLUDE
 boot_store_types
@@ -4608,6 +4609,75 @@ $as_echo "$hurd_cv_includedir_ncursesw" >&6; }
 
 
 
+# Check for Sun RPC headers and library.
+ac_fn_c_check_header_mongrel "$LINENO" "rpc/types.h" "ac_cv_header_rpc_types_h" "$ac_includes_default"
+if test "x$ac_cv_header_rpc_types_h" = x""yes; then :
+  HAVE_SUN_RPC=yes
+else
+  HAVE_SUN_RPC=no
+fi
+
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing clnt_create" >&5
+$as_echo_n "checking for library containing clnt_create... " >&6; }
+if test "${ac_cv_search_clnt_create+set}" = set; then :
+  $as_echo_n "(cached) " >&6
+else
+  ac_func_search_save_LIBS=$LIBS
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+/* Override any GCC internal prototype to avoid an error.
+   Use char because int might match the return type of a GCC
+   builtin and then its argument prototype would still apply.  */
+#ifdef __cplusplus
+extern "C"
+#endif
+char clnt_create ();
+int
+main ()
+{
+return clnt_create ();
+  ;
+  return 0;
+}
+_ACEOF
+for ac_lib in '' ; do
+  if test -z "$ac_lib"; then
+    ac_res="none required"
+  else
+    ac_res=-l$ac_lib
+    LIBS="-l$ac_lib  $ac_func_search_save_LIBS"
+  fi
+  if ac_fn_c_try_link "$LINENO"; then :
+  ac_cv_search_clnt_create=$ac_res
+fi
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext
+  if test "${ac_cv_search_clnt_create+set}" = set; then :
+  break
+fi
+done
+if test "${ac_cv_search_clnt_create+set}" = set; then :
+
+else
+  ac_cv_search_clnt_create=no
+fi
+rm conftest.$ac_ext
+LIBS=$ac_func_search_save_LIBS
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_clnt_create" >&5
+$as_echo "$ac_cv_search_clnt_create" >&6; }
+ac_res=$ac_cv_search_clnt_create
+if test "$ac_res" != no; then :
+  test "$ac_res" = "none required" || LIBS="$ac_res $LIBS"
+  :
+else
+  HAVE_SUN_RPC=no
+fi
+
+
+
 if test -f ./$ac_unique_file; then
   # Configuring in source directory; don't create any Makefiles.
   makefiles=
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=