Check sysheaders when looking for Mach and Hurd headers
Commit Message
Hello everyone,
With this patch, glibc's configure takes into account the
"--with-headers" argument
when checking for Mach and Hurd header.
This patch applies on glibc master.
Comments
Hello,
Manolis Ragkousis, le Fri 04 Sep 2015 10:38:22 +0300, a écrit :
> With this patch, glibc's configure takes into account the
> "--with-headers" argument
> when checking for Mach and Hurd header.
I have pushed it, thanks!
Samuel
From 163cac91f3e5d8e200cf2ddd4a44fe582b989f48 Mon Sep 17 00:00:00 2001
From: Manolis Ragkousis <manolis837@gmail.com>
Date: Wed, 26 Aug 2015 23:48:33 +0200
Subject: [PATCH] Check sysheaders when looking for Mach and Hurd headers
* sysdeps/mach/configure.ac: Add sysheaders check.
* sysdeps/mach/configure: Regenerate.
* sysdeps/mach/hurd/configure.ac: Add sysheaders check.
* sysdeps/mach/hurd/configure: Regenerate.
---
sysdeps/mach/configure | 9 +++++++++
sysdeps/mach/configure.ac | 9 +++++++++
sysdeps/mach/hurd/configure | 9 +++++++++
sysdeps/mach/hurd/configure.ac | 9 +++++++++
4 files changed, 36 insertions(+)
@@ -165,6 +165,11 @@ fi
config_vars="$config_vars
MIG = $MIG"
+if test -n "$sysheaders"; then
+ OLD_CPPFLAGS=$CPPFLAGS
+ CPPFLAGS="$CPPFLAGS $SYSINCLUDES"
+fi
+
### Sanity checks for Mach header installation
@@ -553,3 +558,7 @@ if test $hurd_cv_mig_retcode = yes; then
$as_echo "#define HAVE_MIG_RETCODE 1" >>confdefs.h
fi
+
+if test -n "$sysheaders"; then
+ CPPFLAGS=$OLD_CPPFLAGS
+fi
@@ -6,6 +6,11 @@ if test "x$MIG" = xMISSING; then
fi
LIBC_CONFIG_VAR([MIG], [$MIG])
+if test -n "$sysheaders"; then
+ OLD_CPPFLAGS=$CPPFLAGS
+ CPPFLAGS="$CPPFLAGS $SYSINCLUDES"
+fi
+
### Sanity checks for Mach header installation
AC_CHECK_HEADER(mach/mach_types.h,,
[AC_MSG_ERROR([cannot find Mach headers])], -)
@@ -124,3 +129,7 @@ if test $hurd_cv_mig_retcode = yes; then
fi])
hurd_MIG_RETCODE
+
+if test -n "$sysheaders"; then
+ CPPFLAGS=$OLD_CPPFLAGS
+fi
@@ -3,6 +3,11 @@
$as_echo "#define NO_HIDDEN 1" >>confdefs.h
+if test -n "$sysheaders"; then
+ OLD_CPPFLAGS=$CPPFLAGS
+ CPPFLAGS="$CPPFLAGS $SYSINCLUDES"
+fi
+
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking Hurd header version" >&5
$as_echo_n "checking Hurd header version... " >&6; }
@@ -36,3 +41,7 @@ $as_echo "$libc_cv_hurd_version" >&6; }
if test "x$libc_cv_hurd_version" != xok; then
as_fn_error $? "Hurd headers not installed or too old" "$LINENO" 5
fi
+
+if test -n "$sysheaders"; then
+ CPPFLAGS=$OLD_CPPFLAGS
+fi
@@ -3,6 +3,11 @@ GLIBC_PROVIDES dnl See aclocal.m4 in the top level source directory.
dnl We need this setting because of the need for PLT calls in ld.so.
AC_DEFINE([NO_HIDDEN])
+if test -n "$sysheaders"; then
+ OLD_CPPFLAGS=$CPPFLAGS
+ CPPFLAGS="$CPPFLAGS $SYSINCLUDES"
+fi
+
AC_CACHE_CHECK(Hurd header version, libc_cv_hurd_version, [dnl
AC_TRY_COMPILE(dnl
[#include <hurd/version.h>], [
@@ -15,3 +20,7 @@ AC_TRY_COMPILE(dnl
if test "x$libc_cv_hurd_version" != xok; then
AC_MSG_ERROR(Hurd headers not installed or too old)
fi
+
+if test -n "$sysheaders"; then
+ CPPFLAGS=$OLD_CPPFLAGS
+fi
--
2.5.1