about summary refs log tree commit diff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog12
-rwxr-xr-xsysdeps/unix/sysv/linux/alpha/configure51
-rw-r--r--sysdeps/unix/sysv/linux/alpha/configure.in36
3 files changed, 12 insertions, 87 deletions
diff --git a/ChangeLog b/ChangeLog
index f017b6e88c..3167c8a30e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,17 @@
 2001-07-06  Andreas Jaeger  <aj@suse.de>
 
+	* config.make.in (sysconfdir): Replace correctly.
+	Closes PR libc/2369, reported by Peter Simons <simons@cryp.to>.
+
+	* sysdeps/unix/sysv/linux/alpha/configure.in: Removed, it's no
+	longer needed.
+
+	* sysdeps/unix/sysv/linux/configure.in (libc_cv_linuxVER): Add
+	case for alpha.
+	Rework handling of missing linuxthreads add-on.
+
+	* configure.in: Remove unused sysconfdir substitution.
+
 	* manual/Makefile (texis): Add fdl.texi.
 	* manual/fdl.texi: New.
 	* manual/socket.texi (Host Names): Improve grammar, fix overflow hbox.
diff --git a/sysdeps/unix/sysv/linux/alpha/configure b/sysdeps/unix/sysv/linux/alpha/configure
deleted file mode 100755
index 5b36e71719..0000000000
--- a/sysdeps/unix/sysv/linux/alpha/configure
+++ /dev/null
@@ -1,51 +0,0 @@
- # Local configure fragment for sysdeps/unix/sysv/linux/alpha.
-
-# Don't bother trying to generate any glue code to be compatible with the
-# existing system library, because we are the only system library.
-inhibit_glue=yes
-
-if test -n "$sysheaders"; then
-  OLD_CFLAGS=$CFLAGS
-  CFLAGS="$CFLAGS $SYSINCLUDES"
-fi
-echo $ac_n "checking installed Linux kernel header files""... $ac_c" 1>&6
-echo "configure:13: checking installed Linux kernel header files" >&5
-if eval "test \"`echo '$''{'libc_cv_linux21100'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  cat > conftest.$ac_ext <<EOF
-#line 18 "configure"
-#include "confdefs.h"
-#include <linux/version.h>
-int main() {
-#if LINUX_VERSION_CODE <  (2 *65536+ 1 *256+ 100) /* 2.1.100 */
-eat flaming death
-#endif
-; return 0; }
-EOF
-if { (eval echo configure:27: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-  rm -rf conftest*
-  libc_cv_linux21100='2.1.100 or later'
-else
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  libc_cv_linux21100='TOO OLD!'
-fi
-rm -f conftest*
-fi
-
-echo "$ac_t""$libc_cv_linux21100" 1>&6
-if test "$libc_cv_linux21100" != '2.1.100 or later'; then
-  { echo "configure: error: GNU libc requires kernel header files from
-Linux 2.1.100 or later to be installed before configuring.
-The kernel header files are found usually in /usr/include/asm and
-/usr/include/linux; make sure these directories use files from
-Linux 2.1.100 or later.  This check uses <linux/version.h>, so
-make sure that file was built correctly when installing the kernel header
-files.  To use kernel headers not from /usr/include/linux, use the
-configure option --with-headers." 1>&2; exit 1; }
-fi
-if test -n "$sysheaders"; then
-  CFLAGS=$OLD_CFLAGS
-fi
diff --git a/sysdeps/unix/sysv/linux/alpha/configure.in b/sysdeps/unix/sysv/linux/alpha/configure.in
deleted file mode 100644
index 690defa98b..0000000000
--- a/sysdeps/unix/sysv/linux/alpha/configure.in
+++ /dev/null
@@ -1,36 +0,0 @@
-sinclude(./aclocal.m4)dnl Autoconf lossage
-GLIBC_PROVIDES dnl See aclocal.m4 in the top level source directory.
-# Local configure fragment for sysdeps/unix/sysv/linux/alpha.
-
-# Don't bother trying to generate any glue code to be compatible with the
-# existing system library, because we are the only system library.
-inhibit_glue=yes
-
-define([LIBC_LINUX_VERSION],[2.1.100])dnl
-if test -n "$sysheaders"; then
-  OLD_CFLAGS=$CFLAGS
-  CFLAGS="$CFLAGS $SYSINCLUDES"
-fi
-define([libc_cv_linuxVER], [libc_cv_linux]patsubst(LIBC_LINUX_VERSION,[\.]))dnl
-AC_CACHE_CHECK(installed Linux kernel header files, libc_cv_linuxVER, [dnl
-AC_TRY_COMPILE([#include <linux/version.h>],
-[#if LINUX_VERSION_CODE < ]dnl
-patsubst(LIBC_LINUX_VERSION,[^\([^.]*\)\.\([^.]*\)\.\([^.]*\)$],dnl
-[ (\1 *65536+ \2 *256+ \3) /* \1.\2.\3 */])[
-eat flaming death
-#endif],
-	       libc_cv_linuxVER='LIBC_LINUX_VERSION or later',
-	       libc_cv_linuxVER='TOO OLD!')])
-if test "$libc_cv_linuxVER" != 'LIBC_LINUX_VERSION or later'; then
-  AC_MSG_ERROR([GNU libc requires kernel header files from
-Linux LIBC_LINUX_VERSION or later to be installed before configuring.
-The kernel header files are found usually in /usr/include/asm and
-/usr/include/linux; make sure these directories use files from
-Linux LIBC_LINUX_VERSION or later.  This check uses <linux/version.h>, so
-make sure that file was built correctly when installing the kernel header
-files.  To use kernel headers not from /usr/include/linux, use the
-configure option --with-headers.])
-fi
-if test -n "$sysheaders"; then
-  CFLAGS=$OLD_CFLAGS
-fi