2002-09-12 H.J. Lu <hjl@lucon.org>

	* configure.in: Remove checking svctcp_socket and svcudp_socket.
	* configure: Regenerated.

	* support/include/config.h.in (HAVE_SVCTCP_SOCKET): Removed.
	(HAVE_SVCUDP_SOCKET): Removed.

	* support/include/nfslib.h: Undo the last change.

5 files changed, 12 insertions, 126 deletions

diff --git a/ChangeLog b/ChangeLog
index 00fc995..f7a5c5f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,15 @@
 2002-09-12  H.J. Lu <hjl@lucon.org>
 
+	* configure.in: Remove checking svctcp_socket and svcudp_socket.
+	* configure: Regenerated.
+
+	* support/include/config.h.in (HAVE_SVCTCP_SOCKET): Removed.
+	(HAVE_SVCUDP_SOCKET): Removed.
+
+	* support/include/nfslib.h: Undo the last change.
+
+2002-09-12  H.J. Lu <hjl@lucon.org>
+
 	* support/include/nfslib.h (svctcp_socket): Protect it with
 	HAVE_SVCTCP_SOCKET.
 	(svcudp_socket): Protect it with HAVE_SVCUDP_SOCKET.
diff --git a/configure b/configure
index 49fa033..41c1d68 100755
--- a/configure
+++ b/configure
@@ -1582,116 +1582,6 @@ else
 fi
 done
 
-for ac_func in svctcp_socket
-do
-echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:1589: checking for $ac_func" >&5
-if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  cat > conftest.$ac_ext <<EOF
-#line 1594 "configure"
-#include "confdefs.h"
-/* System header to define __stub macros and hopefully few prototypes,
-    which can conflict with char $ac_func(); below.  */
-#include <assert.h>
-/* Override any gcc2 internal prototype to avoid an error.  */
-/* We use char because int might match the return type of a gcc2
-    builtin and then its argument prototype would still apply.  */
-char $ac_func();
-
-int main() {
-
-/* The GNU C library defines this for functions which it implements
-    to always fail with ENOSYS.  Some functions are actually named
-    something starting with __ and the normal name is an alias.  */
-#if defined (__stub_$ac_func) || defined (__stub___$ac_func)
-choke me
-#else
-$ac_func();
-#endif
-
-; return 0; }
-EOF
-if { (eval echo configure:1617: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-  rm -rf conftest*
-  eval "ac_cv_func_$ac_func=yes"
-else
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  eval "ac_cv_func_$ac_func=no"
-fi
-rm -f conftest*
-fi
-
-if eval "test \"`echo '$ac_cv_func_'$ac_func`\" = yes"; then
-  echo "$ac_t""yes" 1>&6
-    ac_tr_func=HAVE_`echo $ac_func | tr 'abcdefghijklmnopqrstuvwxyz' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'`
-  cat >> confdefs.h <<EOF
-#define $ac_tr_func 1
-EOF
- 
-else
-  echo "$ac_t""no" 1>&6
-fi
-done
-
-for ac_func in svcudp_socket
-do
-echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:1644: checking for $ac_func" >&5
-if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  cat > conftest.$ac_ext <<EOF
-#line 1649 "configure"
-#include "confdefs.h"
-/* System header to define __stub macros and hopefully few prototypes,
-    which can conflict with char $ac_func(); below.  */
-#include <assert.h>
-/* Override any gcc2 internal prototype to avoid an error.  */
-/* We use char because int might match the return type of a gcc2
-    builtin and then its argument prototype would still apply.  */
-char $ac_func();
-
-int main() {
-
-/* The GNU C library defines this for functions which it implements
-    to always fail with ENOSYS.  Some functions are actually named
-    something starting with __ and the normal name is an alias.  */
-#if defined (__stub_$ac_func) || defined (__stub___$ac_func)
-choke me
-#else
-$ac_func();
-#endif
-
-; return 0; }
-EOF
-if { (eval echo configure:1672: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-  rm -rf conftest*
-  eval "ac_cv_func_$ac_func=yes"
-else
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  eval "ac_cv_func_$ac_func=no"
-fi
-rm -f conftest*
-fi
-
-if eval "test \"`echo '$ac_cv_func_'$ac_func`\" = yes"; then
-  echo "$ac_t""yes" 1>&6
-    ac_tr_func=HAVE_`echo $ac_func | tr 'abcdefghijklmnopqrstuvwxyz' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'`
-  cat >> confdefs.h <<EOF
-#define $ac_tr_func 1
-EOF
- 
-else
-  echo "$ac_t""no" 1>&6
-fi
-done
-
 
 cat >> confdefs.h <<EOF
 #define NFS_STATEDIR "$statedir"
diff --git a/configure.in b/configure.in
index 063e296..aece32c 100644
--- a/configure.in
+++ b/configure.in
@@ -98,8 +98,6 @@ dnl *************************************************************
 dnl Check for functions
 dnl *************************************************************
 AC_HAVE_FUNCS(innetgr)
-AC_HAVE_FUNCS(svctcp_socket)
-AC_HAVE_FUNCS(svcudp_socket)
 
 dnl *************************************************************
 dnl Export some path names to config.h
diff --git a/support/include/config.h.in b/support/include/config.h.in
index 6d12cc6..f8c1497 100644
--- a/support/include/config.h.in
+++ b/support/include/config.h.in
@@ -9,14 +9,6 @@
  */
 #undef  HAVE_INNETGR
 
-/* Define this if you have svctcp_socket
- */
-#undef  HAVE_SVCTCP_SOCKET
-
-/* Define this if you have svcudp_socket
- */
-#undef  HAVE_SVCUDP_SOCKET
-
 /* Define this if you want NFSv3 support compiled in
  */
 #undef  NFS3_SUPPORTED
diff --git a/support/include/nfslib.h b/support/include/nfslib.h
index 82335fc..95c3fe7 100644
--- a/support/include/nfslib.h
+++ b/support/include/nfslib.h
@@ -125,11 +125,7 @@ struct nfs_fh_len *	getfh_size(struct sockaddr *addr, const char *, int size);
 /* lockd. */
 int			lockdsvc();
 
-#ifndef HAVE_SVCTCP_SOCKET
-extern			int svctcp_socket (u_long __number, int __reuse);
-#endif
-#ifndef HAVE_SVCUDP_SOCKET
-extern			int svcudp_socket (u_long __number, int __reuse);
-#endif
+int			svctcp_socket (u_long __number, int __reuse);
+int			svcudp_socket (u_long __number, int __reuse);
 
 #endif /* NFSLIB_H */