From 1ad484c629e37cd2ec5e88ebe3429d5dbf479bc2 Mon Sep 17 00:00:00 2001
From: Ulrich Drepper <drepper@redhat.com>
Date: Wed, 25 Sep 2002 06:44:02 +0000
Subject: [PATCH] Recognize nptl add-on name.

---
 sysdeps/unix/sysv/linux/configure.in | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/sysdeps/unix/sysv/linux/configure.in b/sysdeps/unix/sysv/linux/configure.in
index 4d52ee539c..f3af969c0e 100644
--- a/sysdeps/unix/sysv/linux/configure.in
+++ b/sysdeps/unix/sysv/linux/configure.in
@@ -174,12 +174,21 @@ if test "$prefix" = "/usr" -o "$prefix" = "/usr/"; then
   libc_cv_rootsbindir="/sbin"
 fi
 
-# Under Linux the LinuxThreads add-on should be available.
+# Under Linux the LinuxThreads or NPTL add-on should be available.
 case $add_ons in
+  # Only one of the add-ons should be available.
+  *linuxthreads*nptl*|*nptl*linuxthreads*)
+    echo "\
+*** LinuxThreads and NPTL add-ons are both available.  Only one must be used."
+    exit 1
+    ;;
   # It is available.  Good.
   *linuxthreads*)
     linuxthreads_missing=
     ;;
+  *nptl*)
+    linuxthreads_missing=
+    ;;
   *)
     linuxthreads_missing=yes
     ;;