diff --git a/ChangeLog b/ChangeLog
index 995c79d04c..6127b7913f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -3,6 +3,14 @@
 	* sysdeps/unix/sysv/linux/netinet/ip.h: Moved to ...
 	* sysdeps/generic/netinet/ip.h: ... here, replacing old file.
 
+2002-01-05  Roland McGrath  <roland@frob.com>
+
+	* sysdeps/mach/configure.in: New file.
+	* sysdeps/mach/configure: New generated file.
+
+	* mach/Makefile (user-interfaces): Remove default_pager_helper.
+	It has never been used by anything.
+
 2002-02-06  H.J. Lu  <hjl@gnu.org>
 
 	* sysdeps/mips/elf/ldsodefs.h: Make sure the right <ldsodefs.h>
diff --git a/mach/Makefile b/mach/Makefile
index ef6a6105d6..f13c285fd9 100644
--- a/mach/Makefile
+++ b/mach/Makefile
@@ -1,4 +1,5 @@
-# Copyright (C) 1991,92,93,94,95,96,97,98,2001 Free Software Foundation, Inc.
+# Copyright (C) 1991,92,93,94,95,96,97,98,2001,02
+#	Free Software Foundation, Inc.
 # This file is part of the GNU C Library.
 
 # The GNU C Library is free software; you can redistribute it and/or
@@ -42,7 +43,7 @@ user-interfaces := $(addprefix mach/,mach_interface mach_port mach_host	\
 				     memory_object_user			\
 				     memory_object_default		\
 				     exc mach4				\
-				     default_pager default_pager_helper	\
+				     default_pager			\
 	            )\
 		   $(addprefix device/,device device_request)
 # We produce mach_interface.h from mach.defs because there is already a
diff --git a/sysdeps/mach/configure b/sysdeps/mach/configure
new file mode 100644
index 0000000000..83dc58365c
--- /dev/null
+++ b/sysdeps/mach/configure
@@ -0,0 +1,94 @@
+ 
+
+
+echo $ac_n "checking for task_t in mach/mach_types.h""... $ac_c" 1>&6
+echo "configure:6: checking for task_t in mach/mach_types.h" >&5
+if eval "test \"`echo '$''{'libc_cv_mach_task_t'+set}'`\" = set"; then
+  echo $ac_n "(cached) $ac_c" 1>&6
+else
+  cat > conftest.$ac_ext <<EOF
+#line 11 "configure"
+#include "confdefs.h"
+#include <mach/mach_types.h>
+int main() {
+extern task_t foo;
+; return 0; }
+EOF
+if { (eval echo configure:18: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+  rm -rf conftest*
+  libc_cv_mach_task_t=task_t
+else
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  rm -rf conftest*
+  libc_cv_mach_task_t=task_port_t
+fi
+rm -f conftest*
+fi
+
+echo "$ac_t""$libc_cv_mach_task_t" 1>&6
+if test $libc_cv_mach_task_t != task_t; then
+  DEFINES="$DEFINES -Dtask_t=task_port_t"
+fi
+echo $ac_n "checking for thread_t in mach/mach_types.h""... $ac_c" 1>&6
+echo "configure:35: checking for thread_t in mach/mach_types.h" >&5
+if eval "test \"`echo '$''{'libc_cv_mach_thread_t'+set}'`\" = set"; then
+  echo $ac_n "(cached) $ac_c" 1>&6
+else
+  cat > conftest.$ac_ext <<EOF
+#line 40 "configure"
+#include "confdefs.h"
+#include <mach/mach_types.h>
+int main() {
+extern thread_t foo;
+; return 0; }
+EOF
+if { (eval echo configure:47: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+  rm -rf conftest*
+  libc_cv_mach_thread_t=thread_t
+else
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  rm -rf conftest*
+  libc_cv_mach_thread_t=thread_port_t
+fi
+rm -f conftest*
+fi
+
+echo "$ac_t""$libc_cv_mach_thread_t" 1>&6
+if test $libc_cv_mach_thread_t != thread_t; then
+  DEFINES="$DEFINES -Dthread_t=thread_port_t"
+fi
+
+echo $ac_n "checking for creation_time in task_basic_info""... $ac_c" 1>&6
+echo "configure:65: checking for creation_time in task_basic_info" >&5
+if eval "test \"`echo '$''{'libc_cv_mach_task_creation_time'+set}'`\" = set"; then
+  echo $ac_n "(cached) $ac_c" 1>&6
+else
+  cat > conftest.$ac_ext <<EOF
+#line 70 "configure"
+#include "confdefs.h"
+#include <mach/task_info.h>
+int main() {
+
+extern struct task_basic_info *i;
+long s = i->creation_time.seconds;
+
+; return 0; }
+EOF
+if { (eval echo configure:80: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+  rm -rf conftest*
+  libc_cv_mach_task_creation_time=yes
+else
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  rm -rf conftest*
+  libc_cv_mach_task_creation_time=no
+fi
+rm -f conftest*
+fi
+
+echo "$ac_t""$libc_cv_mach_task_creation_time" 1>&6
+if test $libc_cv_mach_task_creation_time = no; then
+  DEFINES="$DEFINES -DNO_CREATION_TIME=1"
+fi
diff --git a/sysdeps/mach/configure.in b/sysdeps/mach/configure.in
new file mode 100644
index 0000000000..2a76ead8ed
--- /dev/null
+++ b/sysdeps/mach/configure.in
@@ -0,0 +1,32 @@
+sinclude(./aclocal.m4)dnl Autoconf lossage.
+GLIBC_PROVIDES dnl See aclocal.m4 in the top level source directory.
+
+dnl
+dnl mach_TYPE_CHECK(foo_t, bar_t)
+dnl
+dnl Check if foo_t is defined by <mach/mach_types.h>.
+dnl If not, compile with -Dfoo_t=bar_t.
+dnl
+AC_DEFUN([mach_TYPE_CHECK], [dnl
+AC_CACHE_CHECK(for $1 in mach/mach_types.h, libc_cv_mach_$1,
+AC_TRY_COMPILE([#include <mach/mach_types.h>], [extern $1 foo;],
+libc_cv_mach_$1=$1, libc_cv_mach_$1=$2))
+if test [$]libc_cv_mach_$1 != $1; then
+  DEFINES="$DEFINES -D$1=$2"
+fi])
+
+dnl
+dnl OSF Mach has renamed these typedefs for some reason.
+dnl
+mach_TYPE_CHECK(task_t, task_port_t)
+mach_TYPE_CHECK(thread_t, thread_port_t)
+
+AC_CACHE_CHECK(for creation_time in task_basic_info,
+	       libc_cv_mach_task_creation_time, [dnl
+AC_TRY_COMPILE([#include <mach/task_info.h>], [
+extern struct task_basic_info *i;
+long s = i->creation_time.seconds;
+], libc_cv_mach_task_creation_time=yes, libc_cv_mach_task_creation_time=no)])
+if test $libc_cv_mach_task_creation_time = no; then
+  DEFINES="$DEFINES -DNO_CREATION_TIME=1"
+fi