aboutsummaryrefslogtreecommitdiff
path: root/sysdeps/unix
diff options
context:
space:
mode:
authorRoland McGrath <roland@gnu.org>2005-07-03 04:40:53 +0000
committerRoland McGrath <roland@gnu.org>2005-07-03 04:40:53 +0000
commitb3af1a245bc7966ac190661e9fa22258b00b1ff1 (patch)
treefbca6ae82d7353ca567efe43600720bbcc912368 /sysdeps/unix
parent88e3fbcb5d6829f8980d6bb356b1c0cd7a38187b (diff)
downloadglibc-b3af1a245bc7966ac190661e9fa22258b00b1ff1.zip
glibc-b3af1a245bc7966ac190661e9fa22258b00b1ff1.tar.gz
glibc-b3af1a245bc7966ac190661e9fa22258b00b1ff1.tar.bz2
* manual/install.texi (Installation): Don't mention linuxthreads.
(Configuring and compiling): Don't use linuxthreads as example. * sysdeps/unix/sysv/linux/configure.in: Check for nptl add-on only, not linuxthreads. * sysdeps/unix/sysv/linux/configure: Regenerated. * resolv/Depend: Add nptl. * rt/Depend: Likewise. * linuxthreads, linuxthreads_db: Directories removed (preserved in ports repository).
Diffstat (limited to 'sysdeps/unix')
-rw-r--r--sysdeps/unix/sysv/linux/configure21
-rw-r--r--sysdeps/unix/sysv/linux/configure.in21
2 files changed, 12 insertions, 30 deletions
diff --git a/sysdeps/unix/sysv/linux/configure b/sysdeps/unix/sysv/linux/configure
index 325073c..0668308 100644
--- a/sysdeps/unix/sysv/linux/configure
+++ b/sysdeps/unix/sysv/linux/configure
@@ -261,38 +261,29 @@ case "$prefix" in
;;
esac
-# Under Linux the LinuxThreads or NPTL add-on should be available.
+# Under Linux the 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=
+ nptl_missing=
;;
*)
- linuxthreads_missing=yes
+ nptl_missing=yes
;;
esac
-if test "$linuxthreads_missing"; then
+if test "$nptl_missing"; then
if test $enable_sanity = yes; then
echo "\
*** On GNU/Linux systems it is normal to compile GNU libc with the
-*** \`linuxthreads' add-on. Without that, the library will be
+*** \`nptl' add-on. Without that, the library will be
*** incompatible with normal GNU/Linux systems.
*** If you really mean to not use this add-on, run configure again
*** using the extra parameter \`--disable-sanity-checks'."
exit 1
else
echo "\
-*** WARNING: Are you sure you do not want to use the \`linuxthreads'
+*** WARNING: Are you sure you do not want to use the \`nptl'
*** add-on?"
fi
fi
diff --git a/sysdeps/unix/sysv/linux/configure.in b/sysdeps/unix/sysv/linux/configure.in
index 88feb86..b90de06 100644
--- a/sysdeps/unix/sysv/linux/configure.in
+++ b/sysdeps/unix/sysv/linux/configure.in
@@ -196,38 +196,29 @@ case "$prefix" in
;;
esac
-# Under Linux the LinuxThreads or NPTL add-on should be available.
+# Under Linux the 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=
+ nptl_missing=
;;
*)
- linuxthreads_missing=yes
+ nptl_missing=yes
;;
esac
-if test "$linuxthreads_missing"; then
+if test "$nptl_missing"; then
if test $enable_sanity = yes; then
echo "\
*** On GNU/Linux systems it is normal to compile GNU libc with the
-*** \`linuxthreads' add-on. Without that, the library will be
+*** \`nptl' add-on. Without that, the library will be
*** incompatible with normal GNU/Linux systems.
*** If you really mean to not use this add-on, run configure again
*** using the extra parameter \`--disable-sanity-checks'."
exit 1
else
echo "\
-*** WARNING: Are you sure you do not want to use the \`linuxthreads'
+*** WARNING: Are you sure you do not want to use the \`nptl'
*** add-on?"
fi
fi