Don't use header files in glibc configure
This commit is contained in:
H.J. Lu
parent
7b44a2df27
commit
918b56067a
@ -1,3 +1,8 @@
|
|||||||
|
2012-05-25 H.J. Lu <hongjiu.lu@intel.com>
|
||||||
|
|
||||||
|
* configure.in: Define the default includes to being none.
|
||||||
|
* configure: Regenerated.
|
||||||
|
|
||||||
2012-05-25 Roland McGrath <roland@hack.frob.com>
|
2012-05-25 Roland McGrath <roland@hack.frob.com>
|
||||||
|
|
||||||
* sysdeps/x86_64/__longjmp.S: Add a static probe here.
|
* sysdeps/x86_64/__longjmp.S: Add a static probe here.
|
||||||
|
|||||||
332
configure
vendored
332
configure
vendored
@ -567,42 +567,7 @@ PACKAGE_URL='http://www.gnu.org/software/glibc/'
|
|||||||
|
|
||||||
ac_unique_file="include/features.h"
|
ac_unique_file="include/features.h"
|
||||||
enable_option_checking=no
|
enable_option_checking=no
|
||||||
# Factoring default headers for most tests.
|
ac_includes_default='/* none */'
|
||||||
ac_includes_default="\
|
|
||||||
#include <stdio.h>
|
|
||||||
#ifdef HAVE_SYS_TYPES_H
|
|
||||||
# include <sys/types.h>
|
|
||||||
#endif
|
|
||||||
#ifdef HAVE_SYS_STAT_H
|
|
||||||
# include <sys/stat.h>
|
|
||||||
#endif
|
|
||||||
#ifdef STDC_HEADERS
|
|
||||||
# include <stdlib.h>
|
|
||||||
# include <stddef.h>
|
|
||||||
#else
|
|
||||||
# ifdef HAVE_STDLIB_H
|
|
||||||
# include <stdlib.h>
|
|
||||||
# endif
|
|
||||||
#endif
|
|
||||||
#ifdef HAVE_STRING_H
|
|
||||||
# if !defined STDC_HEADERS && defined HAVE_MEMORY_H
|
|
||||||
# include <memory.h>
|
|
||||||
# endif
|
|
||||||
# include <string.h>
|
|
||||||
#endif
|
|
||||||
#ifdef HAVE_STRINGS_H
|
|
||||||
# include <strings.h>
|
|
||||||
#endif
|
|
||||||
#ifdef HAVE_INTTYPES_H
|
|
||||||
# include <inttypes.h>
|
|
||||||
#endif
|
|
||||||
#ifdef HAVE_STDINT_H
|
|
||||||
# include <stdint.h>
|
|
||||||
#endif
|
|
||||||
#ifdef HAVE_UNISTD_H
|
|
||||||
# include <unistd.h>
|
|
||||||
#endif"
|
|
||||||
|
|
||||||
ac_subst_vars='LTLIBOBJS
|
ac_subst_vars='LTLIBOBJS
|
||||||
LIBOBJS
|
LIBOBJS
|
||||||
RELEASE
|
RELEASE
|
||||||
@ -635,8 +600,6 @@ libc_cv_gcc_unwind_find_fde
|
|||||||
libc_extra_cflags
|
libc_extra_cflags
|
||||||
CPPUNDEFS
|
CPPUNDEFS
|
||||||
sizeof_long_double
|
sizeof_long_double
|
||||||
EGREP
|
|
||||||
GREP
|
|
||||||
have_selinux
|
have_selinux
|
||||||
have_libcap
|
have_libcap
|
||||||
have_libaudit
|
have_libaudit
|
||||||
@ -1930,37 +1893,6 @@ rm -f conftest.val
|
|||||||
as_fn_set_status $ac_retval
|
as_fn_set_status $ac_retval
|
||||||
|
|
||||||
} # ac_fn_c_compute_int
|
} # ac_fn_c_compute_int
|
||||||
|
|
||||||
# ac_fn_c_check_header_compile LINENO HEADER VAR INCLUDES
|
|
||||||
# -------------------------------------------------------
|
|
||||||
# Tests whether HEADER exists and can be compiled using the include files in
|
|
||||||
# INCLUDES, setting the cache variable VAR accordingly.
|
|
||||||
ac_fn_c_check_header_compile ()
|
|
||||||
{
|
|
||||||
as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
|
|
||||||
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
|
|
||||||
$as_echo_n "checking for $2... " >&6; }
|
|
||||||
if eval \${$3+:} false; then :
|
|
||||||
$as_echo_n "(cached) " >&6
|
|
||||||
else
|
|
||||||
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
|
|
||||||
/* end confdefs.h. */
|
|
||||||
$4
|
|
||||||
#include <$2>
|
|
||||||
_ACEOF
|
|
||||||
if ac_fn_c_try_compile "$LINENO"; then :
|
|
||||||
eval "$3=yes"
|
|
||||||
else
|
|
||||||
eval "$3=no"
|
|
||||||
fi
|
|
||||||
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
|
|
||||||
fi
|
|
||||||
eval ac_res=\$$3
|
|
||||||
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
|
|
||||||
$as_echo "$ac_res" >&6; }
|
|
||||||
eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
|
|
||||||
|
|
||||||
} # ac_fn_c_check_header_compile
|
|
||||||
cat >config.log <<_ACEOF
|
cat >config.log <<_ACEOF
|
||||||
This file contains any messages produced by compilers while
|
This file contains any messages produced by compilers while
|
||||||
running configure, to aid debugging if configure makes a mistake.
|
running configure, to aid debugging if configure makes a mistake.
|
||||||
@ -2346,6 +2278,9 @@ ac_configure="$SHELL $ac_aux_dir/configure" # Please don't use this var.
|
|||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
# Glibc should not depend on any header files
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
subdirs="$subdirs "
|
subdirs="$subdirs "
|
||||||
@ -7390,265 +7325,6 @@ fi
|
|||||||
|
|
||||||
|
|
||||||
|
|
||||||
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for grep that handles long lines and -e" >&5
|
|
||||||
$as_echo_n "checking for grep that handles long lines and -e... " >&6; }
|
|
||||||
if ${ac_cv_path_GREP+:} false; then :
|
|
||||||
$as_echo_n "(cached) " >&6
|
|
||||||
else
|
|
||||||
if test -z "$GREP"; then
|
|
||||||
ac_path_GREP_found=false
|
|
||||||
# Loop through the user's path and test for each of PROGNAME-LIST
|
|
||||||
as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
|
|
||||||
for as_dir in $PATH$PATH_SEPARATOR/usr/xpg4/bin
|
|
||||||
do
|
|
||||||
IFS=$as_save_IFS
|
|
||||||
test -z "$as_dir" && as_dir=.
|
|
||||||
for ac_prog in grep ggrep; do
|
|
||||||
for ac_exec_ext in '' $ac_executable_extensions; do
|
|
||||||
ac_path_GREP="$as_dir/$ac_prog$ac_exec_ext"
|
|
||||||
{ test -f "$ac_path_GREP" && $as_test_x "$ac_path_GREP"; } || continue
|
|
||||||
# Check for GNU ac_path_GREP and select it if it is found.
|
|
||||||
# Check for GNU $ac_path_GREP
|
|
||||||
case `"$ac_path_GREP" --version 2>&1` in
|
|
||||||
*GNU*)
|
|
||||||
ac_cv_path_GREP="$ac_path_GREP" ac_path_GREP_found=:;;
|
|
||||||
*)
|
|
||||||
ac_count=0
|
|
||||||
$as_echo_n 0123456789 >"conftest.in"
|
|
||||||
while :
|
|
||||||
do
|
|
||||||
cat "conftest.in" "conftest.in" >"conftest.tmp"
|
|
||||||
mv "conftest.tmp" "conftest.in"
|
|
||||||
cp "conftest.in" "conftest.nl"
|
|
||||||
$as_echo 'GREP' >> "conftest.nl"
|
|
||||||
"$ac_path_GREP" -e 'GREP$' -e '-(cannot match)-' < "conftest.nl" >"conftest.out" 2>/dev/null || break
|
|
||||||
diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break
|
|
||||||
as_fn_arith $ac_count + 1 && ac_count=$as_val
|
|
||||||
if test $ac_count -gt ${ac_path_GREP_max-0}; then
|
|
||||||
# Best one so far, save it but keep looking for a better one
|
|
||||||
ac_cv_path_GREP="$ac_path_GREP"
|
|
||||||
ac_path_GREP_max=$ac_count
|
|
||||||
fi
|
|
||||||
# 10*(2^10) chars as input seems more than enough
|
|
||||||
test $ac_count -gt 10 && break
|
|
||||||
done
|
|
||||||
rm -f conftest.in conftest.tmp conftest.nl conftest.out;;
|
|
||||||
esac
|
|
||||||
|
|
||||||
$ac_path_GREP_found && break 3
|
|
||||||
done
|
|
||||||
done
|
|
||||||
done
|
|
||||||
IFS=$as_save_IFS
|
|
||||||
if test -z "$ac_cv_path_GREP"; then
|
|
||||||
as_fn_error $? "no acceptable grep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5
|
|
||||||
fi
|
|
||||||
else
|
|
||||||
ac_cv_path_GREP=$GREP
|
|
||||||
fi
|
|
||||||
|
|
||||||
fi
|
|
||||||
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_GREP" >&5
|
|
||||||
$as_echo "$ac_cv_path_GREP" >&6; }
|
|
||||||
GREP="$ac_cv_path_GREP"
|
|
||||||
|
|
||||||
|
|
||||||
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for egrep" >&5
|
|
||||||
$as_echo_n "checking for egrep... " >&6; }
|
|
||||||
if ${ac_cv_path_EGREP+:} false; then :
|
|
||||||
$as_echo_n "(cached) " >&6
|
|
||||||
else
|
|
||||||
if echo a | $GREP -E '(a|b)' >/dev/null 2>&1
|
|
||||||
then ac_cv_path_EGREP="$GREP -E"
|
|
||||||
else
|
|
||||||
if test -z "$EGREP"; then
|
|
||||||
ac_path_EGREP_found=false
|
|
||||||
# Loop through the user's path and test for each of PROGNAME-LIST
|
|
||||||
as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
|
|
||||||
for as_dir in $PATH$PATH_SEPARATOR/usr/xpg4/bin
|
|
||||||
do
|
|
||||||
IFS=$as_save_IFS
|
|
||||||
test -z "$as_dir" && as_dir=.
|
|
||||||
for ac_prog in egrep; do
|
|
||||||
for ac_exec_ext in '' $ac_executable_extensions; do
|
|
||||||
ac_path_EGREP="$as_dir/$ac_prog$ac_exec_ext"
|
|
||||||
{ test -f "$ac_path_EGREP" && $as_test_x "$ac_path_EGREP"; } || continue
|
|
||||||
# Check for GNU ac_path_EGREP and select it if it is found.
|
|
||||||
# Check for GNU $ac_path_EGREP
|
|
||||||
case `"$ac_path_EGREP" --version 2>&1` in
|
|
||||||
*GNU*)
|
|
||||||
ac_cv_path_EGREP="$ac_path_EGREP" ac_path_EGREP_found=:;;
|
|
||||||
*)
|
|
||||||
ac_count=0
|
|
||||||
$as_echo_n 0123456789 >"conftest.in"
|
|
||||||
while :
|
|
||||||
do
|
|
||||||
cat "conftest.in" "conftest.in" >"conftest.tmp"
|
|
||||||
mv "conftest.tmp" "conftest.in"
|
|
||||||
cp "conftest.in" "conftest.nl"
|
|
||||||
$as_echo 'EGREP' >> "conftest.nl"
|
|
||||||
"$ac_path_EGREP" 'EGREP$' < "conftest.nl" >"conftest.out" 2>/dev/null || break
|
|
||||||
diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break
|
|
||||||
as_fn_arith $ac_count + 1 && ac_count=$as_val
|
|
||||||
if test $ac_count -gt ${ac_path_EGREP_max-0}; then
|
|
||||||
# Best one so far, save it but keep looking for a better one
|
|
||||||
ac_cv_path_EGREP="$ac_path_EGREP"
|
|
||||||
ac_path_EGREP_max=$ac_count
|
|
||||||
fi
|
|
||||||
# 10*(2^10) chars as input seems more than enough
|
|
||||||
test $ac_count -gt 10 && break
|
|
||||||
done
|
|
||||||
rm -f conftest.in conftest.tmp conftest.nl conftest.out;;
|
|
||||||
esac
|
|
||||||
|
|
||||||
$ac_path_EGREP_found && break 3
|
|
||||||
done
|
|
||||||
done
|
|
||||||
done
|
|
||||||
IFS=$as_save_IFS
|
|
||||||
if test -z "$ac_cv_path_EGREP"; then
|
|
||||||
as_fn_error $? "no acceptable egrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5
|
|
||||||
fi
|
|
||||||
else
|
|
||||||
ac_cv_path_EGREP=$EGREP
|
|
||||||
fi
|
|
||||||
|
|
||||||
fi
|
|
||||||
fi
|
|
||||||
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_EGREP" >&5
|
|
||||||
$as_echo "$ac_cv_path_EGREP" >&6; }
|
|
||||||
EGREP="$ac_cv_path_EGREP"
|
|
||||||
|
|
||||||
|
|
||||||
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ANSI C header files" >&5
|
|
||||||
$as_echo_n "checking for ANSI C header files... " >&6; }
|
|
||||||
if ${ac_cv_header_stdc+:} false; then :
|
|
||||||
$as_echo_n "(cached) " >&6
|
|
||||||
else
|
|
||||||
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
|
|
||||||
/* end confdefs.h. */
|
|
||||||
#include <stdlib.h>
|
|
||||||
#include <stdarg.h>
|
|
||||||
#include <string.h>
|
|
||||||
#include <float.h>
|
|
||||||
|
|
||||||
int
|
|
||||||
main ()
|
|
||||||
{
|
|
||||||
|
|
||||||
;
|
|
||||||
return 0;
|
|
||||||
}
|
|
||||||
_ACEOF
|
|
||||||
if ac_fn_c_try_compile "$LINENO"; then :
|
|
||||||
ac_cv_header_stdc=yes
|
|
||||||
else
|
|
||||||
ac_cv_header_stdc=no
|
|
||||||
fi
|
|
||||||
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
|
|
||||||
|
|
||||||
if test $ac_cv_header_stdc = yes; then
|
|
||||||
# SunOS 4.x string.h does not declare mem*, contrary to ANSI.
|
|
||||||
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
|
|
||||||
/* end confdefs.h. */
|
|
||||||
#include <string.h>
|
|
||||||
|
|
||||||
_ACEOF
|
|
||||||
if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
|
|
||||||
$EGREP "memchr" >/dev/null 2>&1; then :
|
|
||||||
|
|
||||||
else
|
|
||||||
ac_cv_header_stdc=no
|
|
||||||
fi
|
|
||||||
rm -f conftest*
|
|
||||||
|
|
||||||
fi
|
|
||||||
|
|
||||||
if test $ac_cv_header_stdc = yes; then
|
|
||||||
# ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI.
|
|
||||||
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
|
|
||||||
/* end confdefs.h. */
|
|
||||||
#include <stdlib.h>
|
|
||||||
|
|
||||||
_ACEOF
|
|
||||||
if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
|
|
||||||
$EGREP "free" >/dev/null 2>&1; then :
|
|
||||||
|
|
||||||
else
|
|
||||||
ac_cv_header_stdc=no
|
|
||||||
fi
|
|
||||||
rm -f conftest*
|
|
||||||
|
|
||||||
fi
|
|
||||||
|
|
||||||
if test $ac_cv_header_stdc = yes; then
|
|
||||||
# /bin/cc in Irix-4.0.5 gets non-ANSI ctype macros unless using -ansi.
|
|
||||||
if test "$cross_compiling" = yes; then :
|
|
||||||
:
|
|
||||||
else
|
|
||||||
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
|
|
||||||
/* end confdefs.h. */
|
|
||||||
#include <ctype.h>
|
|
||||||
#include <stdlib.h>
|
|
||||||
#if ((' ' & 0x0FF) == 0x020)
|
|
||||||
# define ISLOWER(c) ('a' <= (c) && (c) <= 'z')
|
|
||||||
# define TOUPPER(c) (ISLOWER(c) ? 'A' + ((c) - 'a') : (c))
|
|
||||||
#else
|
|
||||||
# define ISLOWER(c) \
|
|
||||||
(('a' <= (c) && (c) <= 'i') \
|
|
||||||
|| ('j' <= (c) && (c) <= 'r') \
|
|
||||||
|| ('s' <= (c) && (c) <= 'z'))
|
|
||||||
# define TOUPPER(c) (ISLOWER(c) ? ((c) | 0x40) : (c))
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#define XOR(e, f) (((e) && !(f)) || (!(e) && (f)))
|
|
||||||
int
|
|
||||||
main ()
|
|
||||||
{
|
|
||||||
int i;
|
|
||||||
for (i = 0; i < 256; i++)
|
|
||||||
if (XOR (islower (i), ISLOWER (i))
|
|
||||||
|| toupper (i) != TOUPPER (i))
|
|
||||||
return 2;
|
|
||||||
return 0;
|
|
||||||
}
|
|
||||||
_ACEOF
|
|
||||||
if ac_fn_c_try_run "$LINENO"; then :
|
|
||||||
|
|
||||||
else
|
|
||||||
ac_cv_header_stdc=no
|
|
||||||
fi
|
|
||||||
rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
|
|
||||||
conftest.$ac_objext conftest.beam conftest.$ac_ext
|
|
||||||
fi
|
|
||||||
|
|
||||||
fi
|
|
||||||
fi
|
|
||||||
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_header_stdc" >&5
|
|
||||||
$as_echo "$ac_cv_header_stdc" >&6; }
|
|
||||||
if test $ac_cv_header_stdc = yes; then
|
|
||||||
|
|
||||||
$as_echo "#define STDC_HEADERS 1" >>confdefs.h
|
|
||||||
|
|
||||||
fi
|
|
||||||
|
|
||||||
# On IRIX 5.3, sys/types and inttypes.h are conflicting.
|
|
||||||
for ac_header in sys/types.h sys/stat.h stdlib.h string.h memory.h strings.h \
|
|
||||||
inttypes.h stdint.h unistd.h
|
|
||||||
do :
|
|
||||||
as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
|
|
||||||
ac_fn_c_check_header_compile "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default
|
|
||||||
"
|
|
||||||
if eval test \"x\$"$as_ac_Header"\" = x"yes"; then :
|
|
||||||
cat >>confdefs.h <<_ACEOF
|
|
||||||
#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
|
|
||||||
_ACEOF
|
|
||||||
|
|
||||||
fi
|
|
||||||
|
|
||||||
done
|
|
||||||
|
|
||||||
|
|
||||||
# The cast to long int works around a bug in the HP C Compiler
|
# The cast to long int works around a bug in the HP C Compiler
|
||||||
# version HP92453-01 B.11.11.23709.GP, which incorrectly rejects
|
# version HP92453-01 B.11.11.23709.GP, which incorrectly rejects
|
||||||
# declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'.
|
# declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'.
|
||||||
|
|||||||
@ -5,6 +5,11 @@ AC_CONFIG_SRCDIR([include/features.h])
|
|||||||
AC_CONFIG_HEADERS([config.h])
|
AC_CONFIG_HEADERS([config.h])
|
||||||
AC_CONFIG_AUX_DIR([scripts])
|
AC_CONFIG_AUX_DIR([scripts])
|
||||||
|
|
||||||
|
# Glibc should not depend on any header files
|
||||||
|
AC_DEFUN([_AC_INCLUDES_DEFAULT_REQUIREMENTS],
|
||||||
|
[m4_divert_text([DEFAULTS],
|
||||||
|
[ac_includes_default='/* none */'])])
|
||||||
|
|
||||||
dnl This is here so we can set $subdirs directly based on configure fragments.
|
dnl This is here so we can set $subdirs directly based on configure fragments.
|
||||||
AC_CONFIG_SUBDIRS()
|
AC_CONFIG_SUBDIRS()
|
||||||
|
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user