diff options
| -rw-r--r-- | ChangeLog | 4 | ||||
| -rw-r--r-- | sysdeps/unix/sysv/linux/configure | 13 |
2 files changed, 15 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog index fe0f90cc60..b263691b2d 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +2002-09-24 Ulrich Drepper <drepper@redhat.com> + + * sysdeps/unix/sysv/linux/configure.in: Recognize nptl add-on name. + 2002-09-24 Roland McGrath <roland@redhat.com> * sysdeps/mach/hurd/Versions (ld: GLIBC_2.0): Move __libc_read, diff --git a/sysdeps/unix/sysv/linux/configure b/sysdeps/unix/sysv/linux/configure index cdaf1ef9eb..b815ebf7d7 100644 --- a/sysdeps/unix/sysv/linux/configure +++ b/sysdeps/unix/sysv/linux/configure @@ -204,12 +204,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 ;; @@ -287,7 +296,7 @@ if test $host = $build; then ac_prefix=$ac_default_prefix fi echo $ac_n "checking for symlinks in ${ac_prefix}/include""... $ac_c" 1>&6 -echo "configure:291: checking for symlinks in ${ac_prefix}/include" >&5 +echo "configure:300: checking for symlinks in ${ac_prefix}/include" >&5 ac_message= if test -L ${ac_prefix}/include/net; then ac_message="$ac_message |