From 14a44a692041897082ff4f07be9e24ea512f45b2 Mon Sep 17 00:00:00 2001 From: Ulrich Drepper Date: Fri, 21 Aug 1998 22:29:58 +0000 Subject: Update. 1998-08-12 Andreas Jaeger * sysdeps/unix/sysv/linux/configure.in: Obey --with-headers, document it. * sysdeps/unix/sysv/linux/alpha/configure.in: New file, contains test for recent Linux 2.1.100+ headers. --- sysdeps/unix/sysv/linux/alpha/configure | 51 ++++++++++++++++++++++++++++++ sysdeps/unix/sysv/linux/alpha/configure.in | 36 +++++++++++++++++++++ sysdeps/unix/sysv/linux/configure | 17 +++++++--- sysdeps/unix/sysv/linux/configure.in | 11 +++++-- 4 files changed, 108 insertions(+), 7 deletions(-) create mode 100755 sysdeps/unix/sysv/linux/alpha/configure create mode 100644 sysdeps/unix/sysv/linux/alpha/configure.in (limited to 'sysdeps/unix/sysv/linux') diff --git a/sysdeps/unix/sysv/linux/alpha/configure b/sysdeps/unix/sysv/linux/alpha/configure new file mode 100755 index 0000000000..5b36e71719 --- /dev/null +++ b/sysdeps/unix/sysv/linux/alpha/configure @@ -0,0 +1,51 @@ + # 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 < +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 , 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 new file mode 100644 index 0000000000..690defa98b --- /dev/null +++ b/sysdeps/unix/sysv/linux/alpha/configure.in @@ -0,0 +1,36 @@ +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 ], +[#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 , 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 diff --git a/sysdeps/unix/sysv/linux/configure b/sysdeps/unix/sysv/linux/configure index 2b8483c370..a55ba24fe2 100644 --- a/sysdeps/unix/sysv/linux/configure +++ b/sysdeps/unix/sysv/linux/configure @@ -7,13 +7,17 @@ test $stdio = default && stdio=libio # 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:12: checking installed Linux kernel header files" >&5 +echo "configure:16: checking installed Linux kernel header files" >&5 if eval "test \"`echo '$''{'libc_cv_linux2010'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < int main() { @@ -22,7 +26,7 @@ eat flaming death #endif ; return 0; } EOF -if { (eval echo configure:26: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:30: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* libc_cv_linux2010='2.0.10 or later' else @@ -42,9 +46,12 @@ The kernel header files are found usually in /usr/include/asm and /usr/include/linux; make sure these directories use files from Linux 2.0.10 or later. This check uses , so make sure that file was built correctly when installing the kernel header -files." 1>&2; exit 1; } +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 - # The Linux filesystem standard prescribes where to place "essential" # files. I.e., when the installation prefix is "/usr" we have to place # shared library objects and the configuration files on the root partition diff --git a/sysdeps/unix/sysv/linux/configure.in b/sysdeps/unix/sysv/linux/configure.in index 2e7e944aa5..535cd8f41d 100644 --- a/sysdeps/unix/sysv/linux/configure.in +++ b/sysdeps/unix/sysv/linux/configure.in @@ -10,6 +10,10 @@ test $stdio = default && stdio=libio inhibit_glue=yes define([LIBC_LINUX_VERSION],[2.0.10])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 ], @@ -27,9 +31,12 @@ 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 , so make sure that file was built correctly when installing the kernel header -files.]) +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 - # The Linux filesystem standard prescribes where to place "essential" # files. I.e., when the installation prefix is "/usr" we have to place # shared library objects and the configuration files on the root partition -- cgit 1.4.1