mirror of https://github.com/python/cpython
bpo-45723: Prepare support for autoconf 2.71 (GH-29441)
This commit is contained in:
Christian Heimes
GitHub
parent
9bd0cf5970
commit
cbab997efb
|
|
@ -216,17 +216,10 @@ typedef Py_ssize_t Py_ssize_clean_t;
|
||||||
* WRAPPER FOR <time.h> and/or <sys/time.h> *
|
* WRAPPER FOR <time.h> and/or <sys/time.h> *
|
||||||
********************************************/
|
********************************************/
|
||||||
|
|
||||||
#ifdef TIME_WITH_SYS_TIME
|
|
||||||
#include <sys/time.h>
|
|
||||||
#include <time.h>
|
|
||||||
#else /* !TIME_WITH_SYS_TIME */
|
|
||||||
#ifdef HAVE_SYS_TIME_H
|
#ifdef HAVE_SYS_TIME_H
|
||||||
#include <sys/time.h>
|
#include <sys/time.h>
|
||||||
#else /* !HAVE_SYS_TIME_H */
|
#endif
|
||||||
#include <time.h>
|
#include <time.h>
|
||||||
#endif /* !HAVE_SYS_TIME_H */
|
|
||||||
#endif /* !TIME_WITH_SYS_TIME */
|
|
||||||
|
|
||||||
|
|
||||||
/******************************
|
/******************************
|
||||||
* WRAPPER FOR <sys/select.h> *
|
* WRAPPER FOR <sys/select.h> *
|
||||||
|
|
|
||||||
|
|
@ -0,0 +1,2 @@
|
||||||
|
``configure.ac`` is now compatible with autoconf 2.71. Deprecated checks
|
||||||
|
``STDC_HEADERS`` and ``AC_HEADER_TIME`` have been removed.
|
||||||
|
|
@ -2,12 +2,7 @@
|
||||||
#include "pycore_call.h" // _PyObject_CallNoArgs()
|
#include "pycore_call.h" // _PyObject_CallNoArgs()
|
||||||
#include "pycore_long.h" // _PyLong_GetZero()
|
#include "pycore_long.h" // _PyLong_GetZero()
|
||||||
#include "structmember.h" // PyMemberDef
|
#include "structmember.h" // PyMemberDef
|
||||||
|
|
||||||
#ifdef STDC_HEADERS
|
|
||||||
#include <stddef.h>
|
#include <stddef.h>
|
||||||
#else
|
|
||||||
#include <sys/types.h> // size_t
|
|
||||||
#endif
|
|
||||||
|
|
||||||
/*[clinic input]
|
/*[clinic input]
|
||||||
module _collections
|
module _collections
|
||||||
|
|
|
||||||
|
|
@ -13,14 +13,7 @@
|
||||||
#include "pycore_moduleobject.h" // _PyModule_GetState()
|
#include "pycore_moduleobject.h" // _PyModule_GetState()
|
||||||
#include "structmember.h" // PyMemberDef
|
#include "structmember.h" // PyMemberDef
|
||||||
#include <stddef.h> // offsetof()
|
#include <stddef.h> // offsetof()
|
||||||
|
|
||||||
#ifdef STDC_HEADERS
|
|
||||||
#include <stddef.h>
|
#include <stddef.h>
|
||||||
#else /* !STDC_HEADERS */
|
|
||||||
#ifdef HAVE_SYS_TYPES_H
|
|
||||||
#include <sys/types.h> /* For size_t */
|
|
||||||
#endif /* HAVE_SYS_TYPES_H */
|
|
||||||
#endif /* !STDC_HEADERS */
|
|
||||||
|
|
||||||
/*[clinic input]
|
/*[clinic input]
|
||||||
module array
|
module array
|
||||||
|
|
|
||||||
|
|
@ -5,12 +5,7 @@
|
||||||
#include "pycore_interp.h" // PyInterpreterState.list
|
#include "pycore_interp.h" // PyInterpreterState.list
|
||||||
#include "pycore_object.h" // _PyObject_GC_TRACK()
|
#include "pycore_object.h" // _PyObject_GC_TRACK()
|
||||||
#include "pycore_tuple.h" // _PyTuple_FromArray()
|
#include "pycore_tuple.h" // _PyTuple_FromArray()
|
||||||
|
|
||||||
#ifdef STDC_HEADERS
|
|
||||||
#include <stddef.h>
|
#include <stddef.h>
|
||||||
#else
|
|
||||||
#include <sys/types.h> /* For size_t */
|
|
||||||
#endif
|
|
||||||
|
|
||||||
/*[clinic input]
|
/*[clinic input]
|
||||||
class list "PyListObject *" "&PyList_Type"
|
class list "PyListObject *" "&PyList_Type"
|
||||||
|
|
|
||||||
|
|
@ -718,7 +718,6 @@ DLLLIBRARY
|
||||||
LDLIBRARY
|
LDLIBRARY
|
||||||
LIBRARY
|
LIBRARY
|
||||||
BUILDEXEEXT
|
BUILDEXEEXT
|
||||||
EGREP
|
|
||||||
NO_AS_NEEDED
|
NO_AS_NEEDED
|
||||||
MULTIARCH_CPPFLAGS
|
MULTIARCH_CPPFLAGS
|
||||||
PLATFORM_TRIPLET
|
PLATFORM_TRIPLET
|
||||||
|
|
@ -726,6 +725,7 @@ MULTIARCH
|
||||||
ac_ct_CXX
|
ac_ct_CXX
|
||||||
MAINCC
|
MAINCC
|
||||||
CXX
|
CXX
|
||||||
|
EGREP
|
||||||
SED
|
SED
|
||||||
GREP
|
GREP
|
||||||
CPP
|
CPP
|
||||||
|
|
@ -1806,52 +1806,6 @@ fi
|
||||||
|
|
||||||
} # ac_fn_c_try_cpp
|
} # ac_fn_c_try_cpp
|
||||||
|
|
||||||
# ac_fn_c_try_link LINENO
|
|
||||||
# -----------------------
|
|
||||||
# Try to link conftest.$ac_ext, and return whether this succeeded.
|
|
||||||
ac_fn_c_try_link ()
|
|
||||||
{
|
|
||||||
as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
|
|
||||||
rm -f conftest.$ac_objext conftest$ac_exeext
|
|
||||||
if { { ac_try="$ac_link"
|
|
||||||
case "(($ac_try" in
|
|
||||||
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
|
|
||||||
*) ac_try_echo=$ac_try;;
|
|
||||||
esac
|
|
||||||
eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
|
|
||||||
$as_echo "$ac_try_echo"; } >&5
|
|
||||||
(eval "$ac_link") 2>conftest.err
|
|
||||||
ac_status=$?
|
|
||||||
if test -s conftest.err; then
|
|
||||||
grep -v '^ *+' conftest.err >conftest.er1
|
|
||||||
cat conftest.er1 >&5
|
|
||||||
mv -f conftest.er1 conftest.err
|
|
||||||
fi
|
|
||||||
$as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
|
|
||||||
test $ac_status = 0; } && {
|
|
||||||
test -z "$ac_c_werror_flag" ||
|
|
||||||
test ! -s conftest.err
|
|
||||||
} && test -s conftest$ac_exeext && {
|
|
||||||
test "$cross_compiling" = yes ||
|
|
||||||
test -x conftest$ac_exeext
|
|
||||||
}; then :
|
|
||||||
ac_retval=0
|
|
||||||
else
|
|
||||||
$as_echo "$as_me: failed program was:" >&5
|
|
||||||
sed 's/^/| /' conftest.$ac_ext >&5
|
|
||||||
|
|
||||||
ac_retval=1
|
|
||||||
fi
|
|
||||||
# Delete the IPA/IPO (Inter Procedural Analysis/Optimization) information
|
|
||||||
# created by the PGI compiler (conftest_ipa8_conftest.oo), as it would
|
|
||||||
# interfere with the next link command; also delete a directory that is
|
|
||||||
# left behind by Apple's compiler. We do this before executing the actions.
|
|
||||||
rm -rf conftest.dSYM conftest_ipa8_conftest.oo
|
|
||||||
eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
|
|
||||||
as_fn_set_status $ac_retval
|
|
||||||
|
|
||||||
} # ac_fn_c_try_link
|
|
||||||
|
|
||||||
# ac_fn_c_check_header_mongrel LINENO HEADER VAR INCLUDES
|
# ac_fn_c_check_header_mongrel LINENO HEADER VAR INCLUDES
|
||||||
# -------------------------------------------------------
|
# -------------------------------------------------------
|
||||||
# Tests whether HEADER exists, giving a warning if it cannot be compiled using
|
# Tests whether HEADER exists, giving a warning if it cannot be compiled using
|
||||||
|
|
@ -2016,6 +1970,52 @@ $as_echo "$ac_res" >&6; }
|
||||||
|
|
||||||
} # ac_fn_c_check_header_compile
|
} # ac_fn_c_check_header_compile
|
||||||
|
|
||||||
|
# ac_fn_c_try_link LINENO
|
||||||
|
# -----------------------
|
||||||
|
# Try to link conftest.$ac_ext, and return whether this succeeded.
|
||||||
|
ac_fn_c_try_link ()
|
||||||
|
{
|
||||||
|
as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
|
||||||
|
rm -f conftest.$ac_objext conftest$ac_exeext
|
||||||
|
if { { ac_try="$ac_link"
|
||||||
|
case "(($ac_try" in
|
||||||
|
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
|
||||||
|
*) ac_try_echo=$ac_try;;
|
||||||
|
esac
|
||||||
|
eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
|
||||||
|
$as_echo "$ac_try_echo"; } >&5
|
||||||
|
(eval "$ac_link") 2>conftest.err
|
||||||
|
ac_status=$?
|
||||||
|
if test -s conftest.err; then
|
||||||
|
grep -v '^ *+' conftest.err >conftest.er1
|
||||||
|
cat conftest.er1 >&5
|
||||||
|
mv -f conftest.er1 conftest.err
|
||||||
|
fi
|
||||||
|
$as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
|
||||||
|
test $ac_status = 0; } && {
|
||||||
|
test -z "$ac_c_werror_flag" ||
|
||||||
|
test ! -s conftest.err
|
||||||
|
} && test -s conftest$ac_exeext && {
|
||||||
|
test "$cross_compiling" = yes ||
|
||||||
|
test -x conftest$ac_exeext
|
||||||
|
}; then :
|
||||||
|
ac_retval=0
|
||||||
|
else
|
||||||
|
$as_echo "$as_me: failed program was:" >&5
|
||||||
|
sed 's/^/| /' conftest.$ac_ext >&5
|
||||||
|
|
||||||
|
ac_retval=1
|
||||||
|
fi
|
||||||
|
# Delete the IPA/IPO (Inter Procedural Analysis/Optimization) information
|
||||||
|
# created by the PGI compiler (conftest_ipa8_conftest.oo), as it would
|
||||||
|
# interfere with the next link command; also delete a directory that is
|
||||||
|
# left behind by Apple's compiler. We do this before executing the actions.
|
||||||
|
rm -rf conftest.dSYM conftest_ipa8_conftest.oo
|
||||||
|
eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
|
||||||
|
as_fn_set_status $ac_retval
|
||||||
|
|
||||||
|
} # ac_fn_c_try_link
|
||||||
|
|
||||||
# ac_fn_c_check_type LINENO TYPE VAR INCLUDES
|
# ac_fn_c_check_type LINENO TYPE VAR INCLUDES
|
||||||
# -------------------------------------------
|
# -------------------------------------------
|
||||||
# Tests whether TYPE exists after having included INCLUDES, setting cache
|
# Tests whether TYPE exists after having included INCLUDES, setting cache
|
||||||
|
|
@ -3051,12 +3051,6 @@ VERSION=3.11
|
||||||
|
|
||||||
SOVERSION=1.0
|
SOVERSION=1.0
|
||||||
|
|
||||||
# The later definition of _XOPEN_SOURCE disables certain features
|
|
||||||
# on Linux, so we need _GNU_SOURCE to re-enable them (makedev, tm_zone).
|
|
||||||
|
|
||||||
$as_echo "#define _GNU_SOURCE 1" >>confdefs.h
|
|
||||||
|
|
||||||
|
|
||||||
# The later definition of _XOPEN_SOURCE and _POSIX_C_SOURCE disables
|
# The later definition of _XOPEN_SOURCE and _POSIX_C_SOURCE disables
|
||||||
# certain features on NetBSD, so we need _NETBSD_SOURCE to re-enable
|
# certain features on NetBSD, so we need _NETBSD_SOURCE to re-enable
|
||||||
# them.
|
# them.
|
||||||
|
|
@ -4672,6 +4666,269 @@ $as_echo "$ac_cv_path_SED" >&6; }
|
||||||
SED="$ac_cv_path_SED"
|
SED="$ac_cv_path_SED"
|
||||||
rm -f conftest.sed
|
rm -f conftest.sed
|
||||||
|
|
||||||
|
{ $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"
|
||||||
|
as_fn_executable_p "$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"
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
# checks for UNIX variants that set C preprocessor variables
|
||||||
|
# may set _GNU_SOURCE, __EXTENSIONS__, _POSIX_PTHREAD_SEMANTICS,
|
||||||
|
# _POSIX_SOURCE, _POSIX_1_SOURCE, and more
|
||||||
|
|
||||||
|
|
||||||
|
{ $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
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
ac_fn_c_check_header_mongrel "$LINENO" "minix/config.h" "ac_cv_header_minix_config_h" "$ac_includes_default"
|
||||||
|
if test "x$ac_cv_header_minix_config_h" = xyes; then :
|
||||||
|
MINIX=yes
|
||||||
|
else
|
||||||
|
MINIX=
|
||||||
|
fi
|
||||||
|
|
||||||
|
|
||||||
|
if test "$MINIX" = yes; then
|
||||||
|
|
||||||
|
$as_echo "#define _POSIX_SOURCE 1" >>confdefs.h
|
||||||
|
|
||||||
|
|
||||||
|
$as_echo "#define _POSIX_1_SOURCE 2" >>confdefs.h
|
||||||
|
|
||||||
|
|
||||||
|
$as_echo "#define _MINIX 1" >>confdefs.h
|
||||||
|
|
||||||
|
fi
|
||||||
|
|
||||||
|
|
||||||
|
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether it is safe to define __EXTENSIONS__" >&5
|
||||||
|
$as_echo_n "checking whether it is safe to define __EXTENSIONS__... " >&6; }
|
||||||
|
if ${ac_cv_safe_to_define___extensions__+:} false; then :
|
||||||
|
$as_echo_n "(cached) " >&6
|
||||||
|
else
|
||||||
|
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
|
||||||
|
/* end confdefs.h. */
|
||||||
|
|
||||||
|
# define __EXTENSIONS__ 1
|
||||||
|
$ac_includes_default
|
||||||
|
int
|
||||||
|
main ()
|
||||||
|
{
|
||||||
|
|
||||||
|
;
|
||||||
|
return 0;
|
||||||
|
}
|
||||||
|
_ACEOF
|
||||||
|
if ac_fn_c_try_compile "$LINENO"; then :
|
||||||
|
ac_cv_safe_to_define___extensions__=yes
|
||||||
|
else
|
||||||
|
ac_cv_safe_to_define___extensions__=no
|
||||||
|
fi
|
||||||
|
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
|
||||||
|
fi
|
||||||
|
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_safe_to_define___extensions__" >&5
|
||||||
|
$as_echo "$ac_cv_safe_to_define___extensions__" >&6; }
|
||||||
|
test $ac_cv_safe_to_define___extensions__ = yes &&
|
||||||
|
$as_echo "#define __EXTENSIONS__ 1" >>confdefs.h
|
||||||
|
|
||||||
|
$as_echo "#define _ALL_SOURCE 1" >>confdefs.h
|
||||||
|
|
||||||
|
$as_echo "#define _GNU_SOURCE 1" >>confdefs.h
|
||||||
|
|
||||||
|
$as_echo "#define _POSIX_PTHREAD_SEMANTICS 1" >>confdefs.h
|
||||||
|
|
||||||
|
$as_echo "#define _TANDEM_SOURCE 1" >>confdefs.h
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
@ -5408,7 +5665,6 @@ fi
|
||||||
$as_echo_n "checking for -Wl,--no-as-needed... " >&6; }
|
$as_echo_n "checking for -Wl,--no-as-needed... " >&6; }
|
||||||
save_LDFLAGS="$LDFLAGS"
|
save_LDFLAGS="$LDFLAGS"
|
||||||
LDFLAGS="$LDFLAGS -Wl,--no-as-needed"
|
LDFLAGS="$LDFLAGS -Wl,--no-as-needed"
|
||||||
|
|
||||||
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
|
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
|
||||||
/* end confdefs.h. */
|
/* end confdefs.h. */
|
||||||
|
|
||||||
|
|
@ -5434,267 +5690,6 @@ rm -f core conftest.err conftest.$ac_objext \
|
||||||
LDFLAGS="$save_LDFLAGS"
|
LDFLAGS="$save_LDFLAGS"
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
# checks for UNIX variants that set C preprocessor variables
|
|
||||||
|
|
||||||
{ $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"
|
|
||||||
as_fn_executable_p "$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
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
ac_fn_c_check_header_mongrel "$LINENO" "minix/config.h" "ac_cv_header_minix_config_h" "$ac_includes_default"
|
|
||||||
if test "x$ac_cv_header_minix_config_h" = xyes; then :
|
|
||||||
MINIX=yes
|
|
||||||
else
|
|
||||||
MINIX=
|
|
||||||
fi
|
|
||||||
|
|
||||||
|
|
||||||
if test "$MINIX" = yes; then
|
|
||||||
|
|
||||||
$as_echo "#define _POSIX_SOURCE 1" >>confdefs.h
|
|
||||||
|
|
||||||
|
|
||||||
$as_echo "#define _POSIX_1_SOURCE 2" >>confdefs.h
|
|
||||||
|
|
||||||
|
|
||||||
$as_echo "#define _MINIX 1" >>confdefs.h
|
|
||||||
|
|
||||||
fi
|
|
||||||
|
|
||||||
|
|
||||||
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether it is safe to define __EXTENSIONS__" >&5
|
|
||||||
$as_echo_n "checking whether it is safe to define __EXTENSIONS__... " >&6; }
|
|
||||||
if ${ac_cv_safe_to_define___extensions__+:} false; then :
|
|
||||||
$as_echo_n "(cached) " >&6
|
|
||||||
else
|
|
||||||
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
|
|
||||||
/* end confdefs.h. */
|
|
||||||
|
|
||||||
# define __EXTENSIONS__ 1
|
|
||||||
$ac_includes_default
|
|
||||||
int
|
|
||||||
main ()
|
|
||||||
{
|
|
||||||
|
|
||||||
;
|
|
||||||
return 0;
|
|
||||||
}
|
|
||||||
_ACEOF
|
|
||||||
if ac_fn_c_try_compile "$LINENO"; then :
|
|
||||||
ac_cv_safe_to_define___extensions__=yes
|
|
||||||
else
|
|
||||||
ac_cv_safe_to_define___extensions__=no
|
|
||||||
fi
|
|
||||||
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
|
|
||||||
fi
|
|
||||||
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_safe_to_define___extensions__" >&5
|
|
||||||
$as_echo "$ac_cv_safe_to_define___extensions__" >&6; }
|
|
||||||
test $ac_cv_safe_to_define___extensions__ = yes &&
|
|
||||||
$as_echo "#define __EXTENSIONS__ 1" >>confdefs.h
|
|
||||||
|
|
||||||
$as_echo "#define _ALL_SOURCE 1" >>confdefs.h
|
|
||||||
|
|
||||||
$as_echo "#define _GNU_SOURCE 1" >>confdefs.h
|
|
||||||
|
|
||||||
$as_echo "#define _POSIX_PTHREAD_SEMANTICS 1" >>confdefs.h
|
|
||||||
|
|
||||||
$as_echo "#define _TANDEM_SOURCE 1" >>confdefs.h
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for the Android API level" >&5
|
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for the Android API level" >&5
|
||||||
$as_echo_n "checking for the Android API level... " >&6; }
|
$as_echo_n "checking for the Android API level... " >&6; }
|
||||||
cat >> conftest.c <<EOF
|
cat >> conftest.c <<EOF
|
||||||
|
|
@ -7973,119 +7968,11 @@ fi
|
||||||
CXX="$ac_save_cxx"
|
CXX="$ac_save_cxx"
|
||||||
|
|
||||||
|
|
||||||
# checks for header files
|
|
||||||
{ $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
|
$as_echo "#define STDC_HEADERS 1" >>confdefs.h
|
||||||
|
|
||||||
fi
|
|
||||||
|
|
||||||
|
# checks for header files
|
||||||
for ac_header in asm/types.h crypt.h conio.h direct.h dlfcn.h errno.h \
|
for ac_header in asm/types.h crypt.h conio.h direct.h dlfcn.h errno.h \
|
||||||
fcntl.h grp.h \
|
fcntl.h grp.h \
|
||||||
ieeefp.h io.h langinfo.h libintl.h process.h pthread.h \
|
ieeefp.h io.h langinfo.h libintl.h process.h pthread.h \
|
||||||
|
|
@ -8344,14 +8231,8 @@ CFLAGS=$SAVE_CFLAGS
|
||||||
for ac_header in net/if.h
|
for ac_header in net/if.h
|
||||||
do :
|
do :
|
||||||
ac_fn_c_check_header_compile "$LINENO" "net/if.h" "ac_cv_header_net_if_h" "#include <stdio.h>
|
ac_fn_c_check_header_compile "$LINENO" "net/if.h" "ac_cv_header_net_if_h" "#include <stdio.h>
|
||||||
#ifdef STDC_HEADERS
|
#include <stdlib.h>
|
||||||
# include <stdlib.h>
|
#include <stddef.h>
|
||||||
# include <stddef.h>
|
|
||||||
#else
|
|
||||||
# ifdef HAVE_STDLIB_H
|
|
||||||
# include <stdlib.h>
|
|
||||||
# endif
|
|
||||||
#endif
|
|
||||||
#ifdef HAVE_SYS_SOCKET_H
|
#ifdef HAVE_SYS_SOCKET_H
|
||||||
# include <sys/socket.h>
|
# include <sys/socket.h>
|
||||||
#endif
|
#endif
|
||||||
|
|
@ -13514,62 +13395,6 @@ done
|
||||||
# This gets us our -lcrypt in LIBS when required on the target platform.
|
# This gets us our -lcrypt in LIBS when required on the target platform.
|
||||||
# Save/restore LIBS to avoid linking libpython with libcrypt.
|
# Save/restore LIBS to avoid linking libpython with libcrypt.
|
||||||
LIBS_SAVE=$LIBS
|
LIBS_SAVE=$LIBS
|
||||||
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing crypt" >&5
|
|
||||||
$as_echo_n "checking for library containing crypt... " >&6; }
|
|
||||||
if ${ac_cv_search_crypt+:} false; then :
|
|
||||||
$as_echo_n "(cached) " >&6
|
|
||||||
else
|
|
||||||
ac_func_search_save_LIBS=$LIBS
|
|
||||||
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
|
|
||||||
/* end confdefs.h. */
|
|
||||||
|
|
||||||
/* Override any GCC internal prototype to avoid an error.
|
|
||||||
Use char because int might match the return type of a GCC
|
|
||||||
builtin and then its argument prototype would still apply. */
|
|
||||||
#ifdef __cplusplus
|
|
||||||
extern "C"
|
|
||||||
#endif
|
|
||||||
char crypt ();
|
|
||||||
int
|
|
||||||
main ()
|
|
||||||
{
|
|
||||||
return crypt ();
|
|
||||||
;
|
|
||||||
return 0;
|
|
||||||
}
|
|
||||||
_ACEOF
|
|
||||||
for ac_lib in '' crypt; do
|
|
||||||
if test -z "$ac_lib"; then
|
|
||||||
ac_res="none required"
|
|
||||||
else
|
|
||||||
ac_res=-l$ac_lib
|
|
||||||
LIBS="-l$ac_lib $ac_func_search_save_LIBS"
|
|
||||||
fi
|
|
||||||
if ac_fn_c_try_link "$LINENO"; then :
|
|
||||||
ac_cv_search_crypt=$ac_res
|
|
||||||
fi
|
|
||||||
rm -f core conftest.err conftest.$ac_objext \
|
|
||||||
conftest$ac_exeext
|
|
||||||
if ${ac_cv_search_crypt+:} false; then :
|
|
||||||
break
|
|
||||||
fi
|
|
||||||
done
|
|
||||||
if ${ac_cv_search_crypt+:} false; then :
|
|
||||||
|
|
||||||
else
|
|
||||||
ac_cv_search_crypt=no
|
|
||||||
fi
|
|
||||||
rm conftest.$ac_ext
|
|
||||||
LIBS=$ac_func_search_save_LIBS
|
|
||||||
fi
|
|
||||||
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_crypt" >&5
|
|
||||||
$as_echo "$ac_cv_search_crypt" >&6; }
|
|
||||||
ac_res=$ac_cv_search_crypt
|
|
||||||
if test "$ac_res" != no; then :
|
|
||||||
test "$ac_res" = "none required" || LIBS="$ac_res $LIBS"
|
|
||||||
|
|
||||||
fi
|
|
||||||
|
|
||||||
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing crypt_r" >&5
|
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing crypt_r" >&5
|
||||||
$as_echo_n "checking for library containing crypt_r... " >&6; }
|
$as_echo_n "checking for library containing crypt_r... " >&6; }
|
||||||
if ${ac_cv_search_crypt_r+:} false; then :
|
if ${ac_cv_search_crypt_r+:} false; then :
|
||||||
|
|
@ -13626,13 +13451,69 @@ if test "$ac_res" != no; then :
|
||||||
|
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
LIBS="$LIBS_SAVE"
|
||||||
|
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing crypt" >&5
|
||||||
|
$as_echo_n "checking for library containing crypt... " >&6; }
|
||||||
|
if ${ac_cv_search_crypt+:} false; then :
|
||||||
|
$as_echo_n "(cached) " >&6
|
||||||
|
else
|
||||||
|
ac_func_search_save_LIBS=$LIBS
|
||||||
|
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
|
||||||
|
/* end confdefs.h. */
|
||||||
|
|
||||||
|
/* Override any GCC internal prototype to avoid an error.
|
||||||
|
Use char because int might match the return type of a GCC
|
||||||
|
builtin and then its argument prototype would still apply. */
|
||||||
|
#ifdef __cplusplus
|
||||||
|
extern "C"
|
||||||
|
#endif
|
||||||
|
char crypt ();
|
||||||
|
int
|
||||||
|
main ()
|
||||||
|
{
|
||||||
|
return crypt ();
|
||||||
|
;
|
||||||
|
return 0;
|
||||||
|
}
|
||||||
|
_ACEOF
|
||||||
|
for ac_lib in '' crypt; do
|
||||||
|
if test -z "$ac_lib"; then
|
||||||
|
ac_res="none required"
|
||||||
|
else
|
||||||
|
ac_res=-l$ac_lib
|
||||||
|
LIBS="-l$ac_lib $ac_func_search_save_LIBS"
|
||||||
|
fi
|
||||||
|
if ac_fn_c_try_link "$LINENO"; then :
|
||||||
|
ac_cv_search_crypt=$ac_res
|
||||||
|
fi
|
||||||
|
rm -f core conftest.err conftest.$ac_objext \
|
||||||
|
conftest$ac_exeext
|
||||||
|
if ${ac_cv_search_crypt+:} false; then :
|
||||||
|
break
|
||||||
|
fi
|
||||||
|
done
|
||||||
|
if ${ac_cv_search_crypt+:} false; then :
|
||||||
|
|
||||||
|
else
|
||||||
|
ac_cv_search_crypt=no
|
||||||
|
fi
|
||||||
|
rm conftest.$ac_ext
|
||||||
|
LIBS=$ac_func_search_save_LIBS
|
||||||
|
fi
|
||||||
|
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_crypt" >&5
|
||||||
|
$as_echo "$ac_cv_search_crypt" >&6; }
|
||||||
|
ac_res=$ac_cv_search_crypt
|
||||||
|
if test "$ac_res" != no; then :
|
||||||
|
test "$ac_res" = "none required" || LIBS="$ac_res $LIBS"
|
||||||
|
|
||||||
|
fi
|
||||||
|
|
||||||
|
|
||||||
ac_fn_c_check_func "$LINENO" "crypt_r" "ac_cv_func_crypt_r"
|
ac_fn_c_check_func "$LINENO" "crypt_r" "ac_cv_func_crypt_r"
|
||||||
if test "x$ac_cv_func_crypt_r" = xyes; then :
|
if test "x$ac_cv_func_crypt_r" = xyes; then :
|
||||||
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
|
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
|
||||||
/* end confdefs.h. */
|
/* end confdefs.h. */
|
||||||
|
|
||||||
#define _GNU_SOURCE /* Required for crypt_r()'s prototype in glibc. */
|
|
||||||
#include <crypt.h>
|
#include <crypt.h>
|
||||||
|
|
||||||
int
|
int
|
||||||
|
|
@ -14189,42 +14070,15 @@ fi
|
||||||
done
|
done
|
||||||
|
|
||||||
|
|
||||||
# checks for structures
|
if test "x$ac_cv_header_sys_time_h" = xyes; then :
|
||||||
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether time.h and sys/time.h may both be included" >&5
|
|
||||||
$as_echo_n "checking whether time.h and sys/time.h may both be included... " >&6; }
|
|
||||||
if ${ac_cv_header_time+:} false; then :
|
|
||||||
$as_echo_n "(cached) " >&6
|
|
||||||
else
|
|
||||||
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
|
|
||||||
/* end confdefs.h. */
|
|
||||||
#include <sys/types.h>
|
|
||||||
#include <sys/time.h>
|
|
||||||
#include <time.h>
|
|
||||||
|
|
||||||
int
|
|
||||||
main ()
|
|
||||||
{
|
|
||||||
if ((struct tm *) 0)
|
|
||||||
return 0;
|
|
||||||
;
|
|
||||||
return 0;
|
|
||||||
}
|
|
||||||
_ACEOF
|
|
||||||
if ac_fn_c_try_compile "$LINENO"; then :
|
|
||||||
ac_cv_header_time=yes
|
|
||||||
else
|
|
||||||
ac_cv_header_time=no
|
|
||||||
fi
|
|
||||||
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
|
|
||||||
fi
|
|
||||||
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_header_time" >&5
|
|
||||||
$as_echo "$ac_cv_header_time" >&6; }
|
|
||||||
if test $ac_cv_header_time = yes; then
|
|
||||||
|
|
||||||
$as_echo "#define TIME_WITH_SYS_TIME 1" >>confdefs.h
|
$as_echo "#define TIME_WITH_SYS_TIME 1" >>confdefs.h
|
||||||
|
|
||||||
|
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
# checks for structures
|
||||||
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether struct tm is in sys/time.h or time.h" >&5
|
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether struct tm is in sys/time.h or time.h" >&5
|
||||||
$as_echo_n "checking whether struct tm is in sys/time.h or time.h... " >&6; }
|
$as_echo_n "checking whether struct tm is in sys/time.h or time.h... " >&6; }
|
||||||
if ${ac_cv_struct_tm+:} false; then :
|
if ${ac_cv_struct_tm+:} false; then :
|
||||||
|
|
|
||||||
42
configure.ac
42
configure.ac
|
|
@ -61,7 +61,7 @@ else
|
||||||
fi
|
fi
|
||||||
|
|
||||||
AC_CONFIG_SRCDIR([Include/object.h])
|
AC_CONFIG_SRCDIR([Include/object.h])
|
||||||
AC_CONFIG_HEADER(pyconfig.h)
|
AC_CONFIG_HEADERS([pyconfig.h])
|
||||||
|
|
||||||
AC_CANONICAL_HOST
|
AC_CANONICAL_HOST
|
||||||
AC_SUBST(build)
|
AC_SUBST(build)
|
||||||
|
|
@ -133,10 +133,6 @@ VERSION=PYTHON_VERSION
|
||||||
AC_SUBST(SOVERSION)
|
AC_SUBST(SOVERSION)
|
||||||
SOVERSION=1.0
|
SOVERSION=1.0
|
||||||
|
|
||||||
# The later definition of _XOPEN_SOURCE disables certain features
|
|
||||||
# on Linux, so we need _GNU_SOURCE to re-enable them (makedev, tm_zone).
|
|
||||||
AC_DEFINE(_GNU_SOURCE, 1, [Define on Linux to activate all library features])
|
|
||||||
|
|
||||||
# The later definition of _XOPEN_SOURCE and _POSIX_C_SOURCE disables
|
# The later definition of _XOPEN_SOURCE and _POSIX_C_SOURCE disables
|
||||||
# certain features on NetBSD, so we need _NETBSD_SOURCE to re-enable
|
# certain features on NetBSD, so we need _NETBSD_SOURCE to re-enable
|
||||||
# them.
|
# them.
|
||||||
|
|
@ -664,6 +660,12 @@ AC_PROG_CC
|
||||||
AC_PROG_CPP
|
AC_PROG_CPP
|
||||||
AC_PROG_GREP
|
AC_PROG_GREP
|
||||||
AC_PROG_SED
|
AC_PROG_SED
|
||||||
|
AC_PROG_EGREP
|
||||||
|
|
||||||
|
# checks for UNIX variants that set C preprocessor variables
|
||||||
|
# may set _GNU_SOURCE, __EXTENSIONS__, _POSIX_PTHREAD_SEMANTICS,
|
||||||
|
# _POSIX_SOURCE, _POSIX_1_SOURCE, and more
|
||||||
|
AC_USE_SYSTEM_EXTENSIONS
|
||||||
|
|
||||||
AC_SUBST(CXX)
|
AC_SUBST(CXX)
|
||||||
AC_SUBST(MAINCC)
|
AC_SUBST(MAINCC)
|
||||||
|
|
@ -906,10 +908,6 @@ AC_LINK_IFELSE([AC_LANG_PROGRAM([[]], [[]])],
|
||||||
LDFLAGS="$save_LDFLAGS"
|
LDFLAGS="$save_LDFLAGS"
|
||||||
AC_SUBST(NO_AS_NEEDED)
|
AC_SUBST(NO_AS_NEEDED)
|
||||||
|
|
||||||
|
|
||||||
# checks for UNIX variants that set C preprocessor variables
|
|
||||||
AC_USE_SYSTEM_EXTENSIONS
|
|
||||||
|
|
||||||
AC_MSG_CHECKING([for the Android API level])
|
AC_MSG_CHECKING([for the Android API level])
|
||||||
cat >> conftest.c <<EOF
|
cat >> conftest.c <<EOF
|
||||||
#ifdef __ANDROID__
|
#ifdef __ANDROID__
|
||||||
|
|
@ -2135,8 +2133,11 @@ dnl struct {char *name; int *addr; char *doc;} desc = spam(foo, "something");
|
||||||
dnl ]], [[;]])],[cpp_type=ansi],[AC_DEFINE(HAVE_OLD_CPP) cpp_type=traditional])
|
dnl ]], [[;]])],[cpp_type=ansi],[AC_DEFINE(HAVE_OLD_CPP) cpp_type=traditional])
|
||||||
dnl AC_MSG_RESULT($cpp_type)
|
dnl AC_MSG_RESULT($cpp_type)
|
||||||
|
|
||||||
|
dnl autoconf 2.71 deprecates STDC_HEADERS, keep for backwards compatibility
|
||||||
|
dnl assume C99 compilers provide ANSI C headers
|
||||||
|
AC_DEFINE(STDC_HEADERS, 1, [Define to 1 if you have the ANSI C header files.])
|
||||||
|
|
||||||
# checks for header files
|
# checks for header files
|
||||||
AC_HEADER_STDC
|
|
||||||
AC_CHECK_HEADERS(asm/types.h crypt.h conio.h direct.h dlfcn.h errno.h \
|
AC_CHECK_HEADERS(asm/types.h crypt.h conio.h direct.h dlfcn.h errno.h \
|
||||||
fcntl.h grp.h \
|
fcntl.h grp.h \
|
||||||
ieeefp.h io.h langinfo.h libintl.h process.h pthread.h \
|
ieeefp.h io.h langinfo.h libintl.h process.h pthread.h \
|
||||||
|
|
@ -2165,14 +2166,8 @@ CFLAGS=$SAVE_CFLAGS
|
||||||
# On Darwin (OS X) net/if.h requires sys/socket.h to be imported first.
|
# On Darwin (OS X) net/if.h requires sys/socket.h to be imported first.
|
||||||
AC_CHECK_HEADERS([net/if.h], [], [],
|
AC_CHECK_HEADERS([net/if.h], [], [],
|
||||||
[#include <stdio.h>
|
[#include <stdio.h>
|
||||||
#ifdef STDC_HEADERS
|
#include <stdlib.h>
|
||||||
# include <stdlib.h>
|
#include <stddef.h>
|
||||||
# include <stddef.h>
|
|
||||||
#else
|
|
||||||
# ifdef HAVE_STDLIB_H
|
|
||||||
# include <stdlib.h>
|
|
||||||
# endif
|
|
||||||
#endif
|
|
||||||
#ifdef HAVE_SYS_SOCKET_H
|
#ifdef HAVE_SYS_SOCKET_H
|
||||||
# include <sys/socket.h>
|
# include <sys/socket.h>
|
||||||
#endif
|
#endif
|
||||||
|
|
@ -3924,12 +3919,12 @@ AC_CHECK_FUNCS(setpgrp,
|
||||||
# This gets us our -lcrypt in LIBS when required on the target platform.
|
# This gets us our -lcrypt in LIBS when required on the target platform.
|
||||||
# Save/restore LIBS to avoid linking libpython with libcrypt.
|
# Save/restore LIBS to avoid linking libpython with libcrypt.
|
||||||
LIBS_SAVE=$LIBS
|
LIBS_SAVE=$LIBS
|
||||||
AC_SEARCH_LIBS(crypt, crypt)
|
|
||||||
AC_SEARCH_LIBS(crypt_r, crypt)
|
AC_SEARCH_LIBS(crypt_r, crypt)
|
||||||
|
LIBS="$LIBS_SAVE"
|
||||||
|
AC_SEARCH_LIBS(crypt, crypt)
|
||||||
|
|
||||||
AC_CHECK_FUNC(crypt_r,
|
AC_CHECK_FUNC(crypt_r,
|
||||||
AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[
|
AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[
|
||||||
#define _GNU_SOURCE /* Required for crypt_r()'s prototype in glibc. */
|
|
||||||
#include <crypt.h>
|
#include <crypt.h>
|
||||||
]], [[
|
]], [[
|
||||||
struct crypt_data d;
|
struct crypt_data d;
|
||||||
|
|
@ -4130,8 +4125,13 @@ fi
|
||||||
|
|
||||||
AC_CHECK_FUNCS(getnameinfo)
|
AC_CHECK_FUNCS(getnameinfo)
|
||||||
|
|
||||||
|
dnl autoconf 2.71 deprecates AC_HEADER_TIME, keep for backwards compatibility
|
||||||
|
dnl TIME_WITH_SYS_TIME works on all supported systems that have sys/time.h
|
||||||
|
AS_VAR_IF([ac_cv_header_sys_time_h], [yes], [
|
||||||
|
AC_DEFINE([TIME_WITH_SYS_TIME], 1, [Define to 1 if you can safely include both <sys/time.h> and <time.h>.])
|
||||||
|
])
|
||||||
|
|
||||||
# checks for structures
|
# checks for structures
|
||||||
AC_HEADER_TIME
|
|
||||||
AC_STRUCT_TM
|
AC_STRUCT_TM
|
||||||
AC_STRUCT_TIMEZONE
|
AC_STRUCT_TIMEZONE
|
||||||
AC_CHECK_MEMBERS([struct stat.st_rdev])
|
AC_CHECK_MEMBERS([struct stat.st_rdev])
|
||||||
|
|
|
||||||
|
|
@ -1589,9 +1589,6 @@
|
||||||
/* This must be set to 64 on some systems to enable large file support. */
|
/* This must be set to 64 on some systems to enable large file support. */
|
||||||
#undef _FILE_OFFSET_BITS
|
#undef _FILE_OFFSET_BITS
|
||||||
|
|
||||||
/* Define on Linux to activate all library features */
|
|
||||||
#undef _GNU_SOURCE
|
|
||||||
|
|
||||||
/* Define to include mbstate_t for mbrtowc */
|
/* Define to include mbstate_t for mbrtowc */
|
||||||
#undef _INCLUDE__STDC_A1_SOURCE
|
#undef _INCLUDE__STDC_A1_SOURCE
|
||||||
|
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue