Re: configure patches

[Andreas Jaeger <aj at suse dot de>]

Here's an updated patch which fixes also PR libc/2369,

Andreas

2001-07-05  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: Rename --disable-sanity-checks to
	--disable-linuxthreads-check.
	Remove unused sysconfdir substitution.

============================================================
Index: configure.in
--- configure.in	2001/06/16 04:31:44	1.318
+++ configure.in	2001/07/05 11:43:13
@@ -91,10 +91,10 @@
 	       fi],
 	      stdio=default)
 
-AC_ARG_ENABLE(sanity-checks, dnl
-[  --disable-sanity-checks really do not use threads (should not be used
+AC_ARG_ENABLE(linuxthreads-check,dnl
+[  --disable-linuxthreads-check really do not use threads (should not be used
 			  except in special situations) [default=yes]],
-              enable_sanity=$enableval, enable_sanity=yes)
+              enable_linuxthreads_check=$enableval, enable_linuxthreads_check=yes)
 
 dnl Arguments to enable or disable building the static, shared, profiled,
 dnl and -fomit-frame-pointer libraries.
============================================================
Index: config.make.in
--- config.make.in	2001/03/18 21:27:28	1.76
+++ config.make.in	2001/07/05 11:43:13
@@ -13,7 +13,7 @@
 libdir = @libdir@
 slibdir = @libc_cv_slibdir@
 localedir = @libc_cv_localedir@
-sysconfdir = @libc_cv_sysconfdir@
+sysconfdir = @sysconfdir@
 libexecdir = @libexecdir@
 rootsbindir = @libc_cv_rootsbindir@
 infodir = @infodir@
@@ -45,6 +45,8 @@
 need-nopic-initfini = @nopic_initfini@
 with-cvs = @with_cvs@
 old-glibc-headers = @old_glibc_headers@
+
+need-frame-dwarf2 = @libc_cv_frame_dwarf2@
 
 versioning = @VERSIONING@
 oldest-abi = @oldest_abi@
============================================================
Index: sysdeps/unix/sysv/linux/configure.in
--- sysdeps/unix/sysv/linux/configure.in	2001/05/11 16:48:37	1.39
+++ sysdeps/unix/sysv/linux/configure.in	2001/07/05 11:43:13
@@ -39,6 +39,9 @@
 # kernel headers are young enough.  Additionally we have minimal
 # kernel versions for some architectures.
 case "$machine" in
+  alpha*)
+    arch_minimum_kernel=2.1.100
+    ;;
   mips*)
     arch_minimum_kernel=2.2.15
     ;;
@@ -122,27 +125,26 @@
 case $add_ons in
   # It is available.  Good.
   *linuxthreads*)
-    message=
+    linuxthreads_missing=
     ;;
   *)
-    message="\
-*** WARNING: Are you sure you do not want to use the \`linuxthreads'
-*** add-on?"
+    linuxthreads_missing=yes
     ;;
 esac
 
-if test "$message"; then
-  if test $enable_sanity = yes; then
+if test "$linuxthreads_missing"; then
+  if test $enable_linuxthreads_check = yes; then
     echo "\
-*** You should not compile the GNU libc without the \`linuxthreads'
-*** add-on.  Not using them risks being incompatible with the
-*** libraries of other systems.  Consider getting the add-on and restarting
-*** the configuration.
+*** On GNU/Linux systems it is normal to compile GNU libc with the
+*** \`linuxthreads' 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'."
+*** using the extra parameter \`--disable-linuxthreads-check'."
     exit 1
   else
-    echo "$message"
+    echo "\
+*** WARNING: Are you sure you do not want to use the \`linuxthreads'
+*** add-on?"
   fi
 fi
 
============================================================
Index: sysdeps/unix/sysv/linux/alpha/configure.in
--- sysdeps/unix/sysv/linux/alpha/configure.in	Sat Aug 22 00:29:33 1998	1.1
+++ sysdeps/unix/sysv/linux/alpha/configure.in	removed
@@ -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

-- 
 Andreas Jaeger
  SuSE Labs aj@suse.de
   private aj@arthur.inka.de
    http://www.suse.de/~aj