configure (apr-1.6.5.tar.bz2) | : | configure (apr-1.7.0.tar.bz2) | ||
---|---|---|---|---|
skipping to change at line 651 | skipping to change at line 651 | |||
EXTRA_INCLUDES | EXTRA_INCLUDES | |||
EXTRA_LIBS | EXTRA_LIBS | |||
EXTRA_LDFLAGS | EXTRA_LDFLAGS | |||
EXTRA_CFLAGS | EXTRA_CFLAGS | |||
EXTRA_CPPFLAGS | EXTRA_CPPFLAGS | |||
apr_has_user | apr_has_user | |||
apr_thread_func | apr_thread_func | |||
apr_procattr_user_set_requires_password | apr_procattr_user_set_requires_password | |||
apr_has_xthread_files | apr_has_xthread_files | |||
have_unicode_fs | have_unicode_fs | |||
apr_has_timedlocks | ||||
have_ipv6 | have_ipv6 | |||
have_sockaddr_un | have_sockaddr_un | |||
have_sa_storage | have_sa_storage | |||
have_sctp | have_sctp | |||
acceptfilter | acceptfilter | |||
have_corkable_tcp | have_corkable_tcp | |||
apr_tcp_nopush_flag | apr_tcp_nopush_flag | |||
file_as_socket | file_as_socket | |||
have_in_addr | have_in_addr | |||
osuuid | osuuid | |||
skipping to change at line 674 | skipping to change at line 675 | |||
procpthreadser | procpthreadser | |||
fcntlser | fcntlser | |||
posixser | posixser | |||
sysvser | sysvser | |||
flockser | flockser | |||
hasprocpthreadser | hasprocpthreadser | |||
hasfcntlser | hasfcntlser | |||
hasposixser | hasposixser | |||
hassysvser | hassysvser | |||
hasflockser | hasflockser | |||
have_pthread_condattr_setpshared | ||||
have_pthread_mutex_timedlock | ||||
have_union_semun | have_union_semun | |||
struct_rlimit | struct_rlimit | |||
have_proc_invoked | have_proc_invoked | |||
oc | oc | |||
aprdso | aprdso | |||
have_memchr | have_memchr | |||
have_strstr | have_strstr | |||
have_strdup | have_strdup | |||
have_strcasecmp | have_strcasecmp | |||
have_stricmp | have_stricmp | |||
skipping to change at line 704 | skipping to change at line 707 | |||
off_t_fmt | off_t_fmt | |||
size_t_fmt | size_t_fmt | |||
ssize_t_fmt | ssize_t_fmt | |||
uint64_t_hex_fmt | uint64_t_hex_fmt | |||
uint64_t_fmt | uint64_t_fmt | |||
int64_t_fmt | int64_t_fmt | |||
socklen_t_value | socklen_t_value | |||
ssize_t_value | ssize_t_value | |||
size_t_value | size_t_value | |||
off_t_value | off_t_value | |||
uint64_value | ||||
int64_value | int64_value | |||
long_value | ||||
int_value | int_value | |||
short_value | short_value | |||
voidp_size | voidp_size | |||
winsock2h | winsock2h | |||
windowsh | windowsh | |||
semaphoreh | semaphoreh | |||
pthreadh | pthreadh | |||
processh | processh | |||
sys_waith | sys_waith | |||
signalh | signalh | |||
skipping to change at line 740 | skipping to change at line 743 | |||
stdioh | stdioh | |||
stdargh | stdargh | |||
netinet_tcph | netinet_tcph | |||
netinet_sctp_uioh | netinet_sctp_uioh | |||
netinet_sctph | netinet_sctph | |||
netinet_inh | netinet_inh | |||
sys_syslimitsh | sys_syslimitsh | |||
netdbh | netdbh | |||
limitsh | limitsh | |||
ioh | ioh | |||
inttypesh | ||||
fcntlh | fcntlh | |||
direnth | direnth | |||
errnoh | errnoh | |||
crypth | crypth | |||
ctypeh | ctypeh | |||
conioh | conioh | |||
arpa_ineth | arpa_ineth | |||
have_memmove | have_memmove | |||
mmap | mmap | |||
have_getrlimit | have_getrlimit | |||
skipping to change at line 930 | skipping to change at line 934 | |||
enable_posix_shm | enable_posix_shm | |||
with_sendfile | with_sendfile | |||
enable_allocator_uses_mmap | enable_allocator_uses_mmap | |||
enable_allocator_guard_pages | enable_allocator_guard_pages | |||
enable_pool_concurrency_check | enable_pool_concurrency_check | |||
enable_dso | enable_dso | |||
enable_other_child | enable_other_child | |||
with_egd | with_egd | |||
with_devrandom | with_devrandom | |||
enable_ipv6 | enable_ipv6 | |||
enable_timedlocks | ||||
' | ' | |||
ac_precious_vars='build_alias | ac_precious_vars='build_alias | |||
host_alias | host_alias | |||
target_alias | target_alias | |||
CC | CC | |||
CFLAGS | CFLAGS | |||
LDFLAGS | LDFLAGS | |||
LIBS | LIBS | |||
CPPFLAGS | CPPFLAGS | |||
CPP | CPP | |||
skipping to change at line 1573 | skipping to change at line 1578 | |||
--enable-nonportable-atomics Use optimized atomic code which may produce nonp ortable binaries | --enable-nonportable-atomics Use optimized atomic code which may produce nonp ortable binaries | |||
--enable-threads Enable threading support in APR. | --enable-threads Enable threading support in APR. | |||
--enable-posix-shm Use POSIX shared memory (shm_open) if available | --enable-posix-shm Use POSIX shared memory (shm_open) if available | |||
--enable-allocator-uses-mmap Use mmap in apr_allocator instead of malloc | --enable-allocator-uses-mmap Use mmap in apr_allocator instead of malloc | |||
--enable-allocator-guard-pages Use guard pages in apr_allocator | --enable-allocator-guard-pages Use guard pages in apr_allocator | |||
(implies --enable-allocator-uses-mmap) | (implies --enable-allocator-uses-mmap) | |||
--enable-pool-concurrency-check Check for concurrent usage of memory pools | --enable-pool-concurrency-check Check for concurrent usage of memory pools | |||
--disable-dso Disable DSO support | --disable-dso Disable DSO support | |||
--enable-other-child Enable reliable child processes | --enable-other-child Enable reliable child processes | |||
--disable-ipv6 Disable IPv6 support in APR. | --disable-ipv6 Disable IPv6 support in APR. | |||
--disable-timedlocks Disable timed locks | ||||
Optional Packages: | Optional Packages: | |||
--with-PACKAGE[=ARG] use PACKAGE [ARG=yes] | --with-PACKAGE[=ARG] use PACKAGE [ARG=yes] | |||
--without-PACKAGE do not use PACKAGE (same as --with-PACKAGE=no) | --without-PACKAGE do not use PACKAGE (same as --with-PACKAGE=no) | |||
--with-pic[=PKGS] try to use only PIC/non-PIC objects [default=use | --with-pic[=PKGS] try to use only PIC/non-PIC objects [default=use | |||
both] | both] | |||
--with-aix-soname=aix|svr4|both | --with-aix-soname=aix|svr4|both | |||
shared library versioning (aka "SONAME") variant to | shared library versioning (aka "SONAME") variant to | |||
provide on AIX, [default=aix]. | provide on AIX, [default=aix]. | |||
--with-gnu-ld assume the C compiler uses GNU ld [default=no] | --with-gnu-ld assume the C compiler uses GNU ld [default=no] | |||
skipping to change at line 6679 | skipping to change at line 6685 | |||
break | break | |||
fi | fi | |||
done | done | |||
if test $apr_addto_duplicate = "0"; then | if test $apr_addto_duplicate = "0"; then | |||
test "x$silent" != "xyes" && echo " adding \"$i\" to CPPFLAGS" | test "x$silent" != "xyes" && echo " adding \"$i\" to CPPFLAGS" | |||
CPPFLAGS="$CPPFLAGS $i" | CPPFLAGS="$CPPFLAGS $i" | |||
fi | fi | |||
done | done | |||
fi | fi | |||
if test $PLATOSVERS -eq 10; then | ||||
# pthread_mutex_timedlock is broken on Solaris 10. | ||||
# It can block without timeout in case of EDEADLK. | ||||
if test -z "$ac_cv_func_pthread_mutex_timedlock"; then | ||||
test "x$silent" != "xyes" && echo " setting ac_cv_func_pthread_mutex_timedl | ||||
ock to \"no\"" | ||||
ac_cv_func_pthread_mutex_timedlock="no" | ||||
fi | ||||
fi | ||||
if test $PLATOSVERS -ge 10; then | if test $PLATOSVERS -ge 10; then | |||
if test -z "$apr_lock_method"; then | if test -z "$apr_lock_method"; then | |||
test "x$silent" != "xyes" && echo " setting apr_lock_method to \"USE_PROC_P THREAD_SERIALIZE\"" | test "x$silent" != "xyes" && echo " setting apr_lock_method to \"USE_PROC_P THREAD_SERIALIZE\"" | |||
apr_lock_method="USE_PROC_PTHREAD_SERIALIZE" | apr_lock_method="USE_PROC_PTHREAD_SERIALIZE" | |||
fi | fi | |||
else | else | |||
if test -z "$apr_lock_method"; then | if test -z "$apr_lock_method"; then | |||
skipping to change at line 16793 | skipping to change at line 16809 | |||
ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $ LIBS >&5' | ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $ LIBS >&5' | |||
ac_compiler_gnu=$ac_cv_c_compiler_gnu | ac_compiler_gnu=$ac_cv_c_compiler_gnu | |||
CC=$lt_save_CC | CC=$lt_save_CC | |||
ac_config_commands="$ac_config_commands libtool" | ac_config_commands="$ac_config_commands libtool" | |||
# Only expand once: | # Only expand once: | |||
# get libtool's setting of shlibpath_var | # get libtool's setting of shlibpath_var | |||
eval `grep "^shlibpath_var=[A-Z_]*$" $apr_builddir/libtool` | ||||
if test "x$shlibpath_var" = "x"; then | if test "x$shlibpath_var" = "x"; then | |||
eval `grep "^shlibpath_var=[A-Z_]*$" $apr_builddir/libtool` | ||||
fi | ||||
if test "x$shlibpath_var" = "x"; then | ||||
{ $as_echo "$as_me:${as_lineno-$LINENO}: SHLIBPATH variable could no | ||||
t be determined" >&5 | ||||
$as_echo "$as_me: SHLIBPATH variable could not be determined" >&6;} | ||||
shlibpath_var=REPLACE_WITH_YOUR_SHLIBPATH_VAR | shlibpath_var=REPLACE_WITH_YOUR_SHLIBPATH_VAR | |||
fi | fi | |||
fi | fi | |||
;; | ;; | |||
esac | esac | |||
# Check whether --with-installbuilddir was given. | # Check whether --with-installbuilddir was given. | |||
if test "${with_installbuilddir+set}" = set; then : | if test "${with_installbuilddir+set}" = set; then : | |||
withval=$with_installbuilddir; installbuilddir=$withval | withval=$with_installbuilddir; installbuilddir=$withval | |||
fi | fi | |||
skipping to change at line 18996 | skipping to change at line 19016 | |||
#define HAVE_SCHED_YIELD 1 | #define HAVE_SCHED_YIELD 1 | |||
_ACEOF | _ACEOF | |||
fi | fi | |||
done | done | |||
fi | fi | |||
fi | fi | |||
fi | fi | |||
ac_cv_define_READDIR_IS_THREAD_SAFE=no | ac_cv_define_READDIR_IS_THREAD_SAFE=yes | |||
ac_cv_define_GETHOSTBYNAME_IS_THREAD_SAFE=no | ac_cv_define_GETHOSTBYNAME_IS_THREAD_SAFE=no | |||
ac_cv_define_GETHOSTBYADDR_IS_THREAD_SAFE=no | ac_cv_define_GETHOSTBYADDR_IS_THREAD_SAFE=no | |||
ac_cv_define_GETSERVBYNAME_IS_THREAD_SAFE=no | ac_cv_define_GETSERVBYNAME_IS_THREAD_SAFE=no | |||
if test "$threads" = "1"; then | if test "$threads" = "1"; then | |||
echo "APR will use threads" | echo "APR will use threads" | |||
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for readdir in -lc_r" >&5 | ||||
$as_echo_n "checking for readdir in -lc_r... " >&6; } | ||||
if ${ac_cv_lib_c_r_readdir+:} false; then : | ||||
$as_echo_n "(cached) " >&6 | ||||
else | ||||
ac_check_lib_save_LIBS=$LIBS | ||||
LIBS="-lc_r $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 readdir (); | ||||
int | ||||
main () | ||||
{ | ||||
return readdir (); | ||||
; | ||||
return 0; | ||||
} | ||||
_ACEOF | ||||
if ac_fn_c_try_link "$LINENO"; then : | ||||
ac_cv_lib_c_r_readdir=yes | ||||
else | ||||
ac_cv_lib_c_r_readdir=no | ||||
fi | ||||
rm -f core conftest.err conftest.$ac_objext \ | ||||
conftest$ac_exeext conftest.$ac_ext | ||||
LIBS=$ac_check_lib_save_LIBS | ||||
fi | ||||
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_c_r_readdir" >&5 | ||||
$as_echo "$ac_cv_lib_c_r_readdir" >&6; } | ||||
if test "x$ac_cv_lib_c_r_readdir" = xyes; then : | ||||
$as_echo "#define READDIR_IS_THREAD_SAFE 1" >>confdefs.h | $as_echo "#define READDIR_IS_THREAD_SAFE 1" >>confdefs.h | |||
fi | ||||
if test "x$apr_gethostbyname_is_thread_safe" = "x"; then | if test "x$apr_gethostbyname_is_thread_safe" = "x"; then | |||
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for gethostbyname in - lc_r" >&5 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for gethostbyname in - lc_r" >&5 | |||
$as_echo_n "checking for gethostbyname in -lc_r... " >&6; } | $as_echo_n "checking for gethostbyname in -lc_r... " >&6; } | |||
if ${ac_cv_lib_c_r_gethostbyname+:} false; then : | if ${ac_cv_lib_c_r_gethostbyname+:} false; then : | |||
$as_echo_n "(cached) " >&6 | $as_echo_n "(cached) " >&6 | |||
else | else | |||
ac_check_lib_save_LIBS=$LIBS | ac_check_lib_save_LIBS=$LIBS | |||
LIBS="-lc_r $LIBS" | LIBS="-lc_r $LIBS" | |||
cat confdefs.h - <<_ACEOF >conftest.$ac_ext | cat confdefs.h - <<_ACEOF >conftest.$ac_ext | |||
/* end confdefs.h. */ | /* end confdefs.h. */ | |||
skipping to change at line 21589 | skipping to change at line 21570 | |||
conio.h \ | conio.h \ | |||
crypt.h \ | crypt.h \ | |||
ctype.h \ | ctype.h \ | |||
dir.h \ | dir.h \ | |||
dirent.h \ | dirent.h \ | |||
dl.h \ | dl.h \ | |||
dlfcn.h \ | dlfcn.h \ | |||
errno.h \ | errno.h \ | |||
fcntl.h \ | fcntl.h \ | |||
grp.h \ | grp.h \ | |||
inttypes.h \ | ||||
io.h \ | io.h \ | |||
limits.h \ | limits.h \ | |||
mach-o/dyld.h \ | mach-o/dyld.h \ | |||
malloc.h \ | malloc.h \ | |||
memory.h \ | memory.h \ | |||
netdb.h \ | netdb.h \ | |||
osreldate.h \ | osreldate.h \ | |||
poll.h \ | poll.h \ | |||
process.h \ | process.h \ | |||
pwd.h \ | pwd.h \ | |||
skipping to change at line 21666 | skipping to change at line 21648 | |||
conio.h \ | conio.h \ | |||
crypt.h \ | crypt.h \ | |||
ctype.h \ | ctype.h \ | |||
dir.h \ | dir.h \ | |||
dirent.h \ | dirent.h \ | |||
dl.h \ | dl.h \ | |||
dlfcn.h \ | dlfcn.h \ | |||
errno.h \ | errno.h \ | |||
fcntl.h \ | fcntl.h \ | |||
grp.h \ | grp.h \ | |||
inttypes.h \ | ||||
io.h \ | io.h \ | |||
limits.h \ | limits.h \ | |||
mach-o/dyld.h \ | mach-o/dyld.h \ | |||
malloc.h \ | malloc.h \ | |||
memory.h \ | memory.h \ | |||
netdb.h \ | netdb.h \ | |||
osreldate.h \ | osreldate.h \ | |||
poll.h \ | poll.h \ | |||
process.h \ | process.h \ | |||
pwd.h \ | pwd.h \ | |||
skipping to change at line 22326 | skipping to change at line 22309 | |||
$as_echo "$ac_cv_sizeof_char" >&6; } | $as_echo "$ac_cv_sizeof_char" >&6; } | |||
cat >>confdefs.h <<_ACEOF | cat >>confdefs.h <<_ACEOF | |||
#define SIZEOF_CHAR $ac_cv_sizeof_char | #define SIZEOF_CHAR $ac_cv_sizeof_char | |||
_ACEOF | _ACEOF | |||
# 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]];'. | |||
# This bug is HP SR number 8606223364. | # This bug is HP SR number 8606223364. | |||
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking size of int" >&5 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking size of short" >&5 | |||
$as_echo_n "checking size of int... " >&6; } | $as_echo_n "checking size of short... " >&6; } | |||
if ${ac_cv_sizeof_int+:} false; then : | if ${ac_cv_sizeof_short+:} false; then : | |||
$as_echo_n "(cached) " >&6 | $as_echo_n "(cached) " >&6 | |||
else | else | |||
if ac_fn_c_compute_int "$LINENO" "(long int) (sizeof (int))" "ac_cv_sizeof_int " "$ac_includes_default"; then : | if ac_fn_c_compute_int "$LINENO" "(long int) (sizeof (short))" "ac_cv_sizeof_s hort" "$ac_includes_default"; then : | |||
else | else | |||
if test "$ac_cv_type_int" = yes; then | if test "$ac_cv_type_short" = yes; then | |||
{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 | { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 | |||
$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} | $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} | |||
as_fn_error 77 "cannot compute sizeof (int) | as_fn_error 77 "cannot compute sizeof (short) | |||
See \`config.log' for more details" "$LINENO" 5; } | See \`config.log' for more details" "$LINENO" 5; } | |||
else | else | |||
ac_cv_sizeof_int=0 | ac_cv_sizeof_short=0 | |||
fi | fi | |||
fi | fi | |||
fi | fi | |||
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sizeof_int" >&5 | { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sizeof_short" >&5 | |||
$as_echo "$ac_cv_sizeof_int" >&6; } | $as_echo "$ac_cv_sizeof_short" >&6; } | |||
cat >>confdefs.h <<_ACEOF | cat >>confdefs.h <<_ACEOF | |||
#define SIZEOF_INT $ac_cv_sizeof_int | #define SIZEOF_SHORT $ac_cv_sizeof_short | |||
_ACEOF | _ACEOF | |||
# 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]];'. | |||
# This bug is HP SR number 8606223364. | # This bug is HP SR number 8606223364. | |||
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking size of long" >&5 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking size of int" >&5 | |||
$as_echo_n "checking size of long... " >&6; } | $as_echo_n "checking size of int... " >&6; } | |||
if ${ac_cv_sizeof_long+:} false; then : | if ${ac_cv_sizeof_int+:} false; then : | |||
$as_echo_n "(cached) " >&6 | $as_echo_n "(cached) " >&6 | |||
else | else | |||
if ac_fn_c_compute_int "$LINENO" "(long int) (sizeof (long))" "ac_cv_sizeof_lo ng" "$ac_includes_default"; then : | if ac_fn_c_compute_int "$LINENO" "(long int) (sizeof (int))" "ac_cv_sizeof_int " "$ac_includes_default"; then : | |||
else | else | |||
if test "$ac_cv_type_long" = yes; then | if test "$ac_cv_type_int" = yes; then | |||
{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 | { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 | |||
$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} | $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} | |||
as_fn_error 77 "cannot compute sizeof (long) | as_fn_error 77 "cannot compute sizeof (int) | |||
See \`config.log' for more details" "$LINENO" 5; } | See \`config.log' for more details" "$LINENO" 5; } | |||
else | else | |||
ac_cv_sizeof_long=0 | ac_cv_sizeof_int=0 | |||
fi | fi | |||
fi | fi | |||
fi | fi | |||
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sizeof_long" >&5 | { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sizeof_int" >&5 | |||
$as_echo "$ac_cv_sizeof_long" >&6; } | $as_echo "$ac_cv_sizeof_int" >&6; } | |||
cat >>confdefs.h <<_ACEOF | cat >>confdefs.h <<_ACEOF | |||
#define SIZEOF_LONG $ac_cv_sizeof_long | #define SIZEOF_INT $ac_cv_sizeof_int | |||
_ACEOF | _ACEOF | |||
# 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]];'. | |||
# This bug is HP SR number 8606223364. | # This bug is HP SR number 8606223364. | |||
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking size of short" >&5 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking size of long" >&5 | |||
$as_echo_n "checking size of short... " >&6; } | $as_echo_n "checking size of long... " >&6; } | |||
if ${ac_cv_sizeof_short+:} false; then : | if ${ac_cv_sizeof_long+:} false; then : | |||
$as_echo_n "(cached) " >&6 | $as_echo_n "(cached) " >&6 | |||
else | else | |||
if ac_fn_c_compute_int "$LINENO" "(long int) (sizeof (short))" "ac_cv_sizeof_s hort" "$ac_includes_default"; then : | if ac_fn_c_compute_int "$LINENO" "(long int) (sizeof (long))" "ac_cv_sizeof_lo ng" "$ac_includes_default"; then : | |||
else | else | |||
if test "$ac_cv_type_short" = yes; then | if test "$ac_cv_type_long" = yes; then | |||
{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 | { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 | |||
$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} | $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} | |||
as_fn_error 77 "cannot compute sizeof (short) | as_fn_error 77 "cannot compute sizeof (long) | |||
See \`config.log' for more details" "$LINENO" 5; } | See \`config.log' for more details" "$LINENO" 5; } | |||
else | else | |||
ac_cv_sizeof_short=0 | ac_cv_sizeof_long=0 | |||
fi | fi | |||
fi | fi | |||
fi | fi | |||
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sizeof_short" >&5 | { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sizeof_long" >&5 | |||
$as_echo "$ac_cv_sizeof_short" >&6; } | $as_echo "$ac_cv_sizeof_long" >&6; } | |||
cat >>confdefs.h <<_ACEOF | cat >>confdefs.h <<_ACEOF | |||
#define SIZEOF_SHORT $ac_cv_sizeof_short | #define SIZEOF_LONG $ac_cv_sizeof_long | |||
_ACEOF | _ACEOF | |||
# 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]];'. | |||
# This bug is HP SR number 8606223364. | # This bug is HP SR number 8606223364. | |||
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking size of long long" >&5 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking size of long long" >&5 | |||
$as_echo_n "checking size of long long... " >&6; } | $as_echo_n "checking size of long long... " >&6; } | |||
if ${ac_cv_sizeof_long_long+:} false; then : | if ${ac_cv_sizeof_long_long+:} false; then : | |||
$as_echo_n "(cached) " >&6 | $as_echo_n "(cached) " >&6 | |||
skipping to change at line 22448 | skipping to change at line 22431 | |||
cat >>confdefs.h <<_ACEOF | cat >>confdefs.h <<_ACEOF | |||
#define SIZEOF_LONG_LONG $ac_cv_sizeof_long_long | #define SIZEOF_LONG_LONG $ac_cv_sizeof_long_long | |||
_ACEOF | _ACEOF | |||
if test "$ac_cv_sizeof_short" = "2"; then | if test "$ac_cv_sizeof_short" = "2"; then | |||
short_value=short | short_value=short | |||
fi | fi | |||
if test "$ac_cv_sizeof_int" = "4"; then | if test "$ac_cv_sizeof_int" = "4"; then | |||
int_value=int | int_value=int | |||
fi | fi | |||
# Now we need to find what apr_int64_t (sizeof == 8) will be. | # Now we need to find what apr_int64_t (sizeof == 8) will be. | |||
# The first match is our preference. | # The first match is our preference (use inttypes if available). | |||
if test "$ac_cv_sizeof_int" = "8"; then | ac_rc=yes | |||
for ac_spec in header:stdint.h header:inttypes.h; do | ||||
ac_type=`echo "$ac_spec" | sed -e 's/:.*$//'` | ||||
ac_item=`echo "$ac_spec" | sed -e 's/^.*://'` | ||||
case $ac_type in | ||||
header ) | ||||
ac_item=`echo "$ac_item" | sed 'y%./+-%__p_%'` | ||||
ac_var="ac_cv_header_$ac_item" | ||||
;; | ||||
file ) | ||||
ac_item=`echo "$ac_item" | sed 'y%./+-%__p_%'` | ||||
ac_var="ac_cv_file_$ac_item" | ||||
;; | ||||
func ) ac_var="ac_cv_func_$ac_item" ;; | ||||
struct ) ac_var="ac_cv_struct_$ac_item" ;; | ||||
define ) ac_var="ac_cv_define_$ac_item" ;; | ||||
custom ) ac_var="$ac_item" ;; | ||||
esac | ||||
eval "ac_val=\$$ac_var" | ||||
if test ".$ac_val" != .yes; then | ||||
ac_rc=no | ||||
break | ||||
fi | ||||
done | ||||
if test ".$ac_rc" = .yes; then | ||||
: | ||||
hasinttypes="1" | ||||
else | ||||
: | ||||
hasinttypes="0" | ||||
fi | ||||
if test "$hasinttypes" = "1"; then | ||||
int64_literal='#define APR_INT64_C(val) INT64_C(val)' | ||||
uint64_literal='#define APR_UINT64_C(val) UINT64_C(val)' | ||||
int64_t_fmt='#define APR_INT64_T_FMT PRId64' | ||||
uint64_t_fmt='#define APR_UINT64_T_FMT PRIu64' | ||||
uint64_t_hex_fmt='#define APR_UINT64_T_HEX_FMT PRIx64' | ||||
int64_value="int64_t" | ||||
uint64_value="uint64_t" | ||||
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether int64_t and int use fm | ||||
t %d" >&5 | ||||
$as_echo_n "checking whether int64_t and int use fmt %d... " >&6; } | ||||
if ${apr_cv_typematch_int64_t_int_d+:} false; then : | ||||
$as_echo_n "(cached) " >&6 | ||||
else | ||||
apr_save_CFLAGS=$CFLAGS | ||||
CFLAGS="$CFLAGS $CFLAGS_WARN" | ||||
if test "$ac_cv_c_compiler_gnu" = "yes"; then | ||||
CFLAGS="$CFLAGS -Werror" | ||||
fi | ||||
cat confdefs.h - <<_ACEOF >conftest.$ac_ext | ||||
/* end confdefs.h. */ | ||||
#include "confdefs.h" | ||||
#include <sys/types.h> | ||||
#include <stdio.h> | ||||
#ifdef HAVE_STDINT_H | ||||
#include <stdint.h> | ||||
#endif | ||||
int main(int argc, const char *const *argv) { | ||||
int64_t chk1, *ptr1; | ||||
int chk2, *ptr2 = &chk1; | ||||
ptr1 = &chk2; | ||||
*ptr1 = *ptr2 = 0; | ||||
printf("%d %d", chk1, chk2); | ||||
return 0; } | ||||
_ACEOF | ||||
if ac_fn_c_try_compile "$LINENO"; then : | ||||
CFLAGS=$apr_save_CFLAGS | ||||
apr_cv_typematch_int64_t_int_d=yes | ||||
else | ||||
CFLAGS=$apr_save_CFLAGS | ||||
apr_cv_typematch_int64_t_int_d=no | ||||
fi | ||||
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext | ||||
fi | ||||
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $apr_cv_typematch_int64_t_int_d | ||||
" >&5 | ||||
$as_echo "$apr_cv_typematch_int64_t_int_d" >&6; } | ||||
if test "$apr_cv_typematch_int64_t_int_d" = "yes"; then | ||||
: | ||||
int64_strfn="strtoi" | ||||
else | ||||
: | ||||
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether int64_t and long use f | ||||
mt %ld" >&5 | ||||
$as_echo_n "checking whether int64_t and long use fmt %ld... " >&6; } | ||||
if ${apr_cv_typematch_int64_t_long_ld+:} false; then : | ||||
$as_echo_n "(cached) " >&6 | ||||
else | ||||
apr_save_CFLAGS=$CFLAGS | ||||
CFLAGS="$CFLAGS $CFLAGS_WARN" | ||||
if test "$ac_cv_c_compiler_gnu" = "yes"; then | ||||
CFLAGS="$CFLAGS -Werror" | ||||
fi | ||||
cat confdefs.h - <<_ACEOF >conftest.$ac_ext | ||||
/* end confdefs.h. */ | ||||
#include "confdefs.h" | ||||
#include <sys/types.h> | ||||
#include <stdio.h> | ||||
#ifdef HAVE_STDINT_H | ||||
#include <stdint.h> | ||||
#endif | ||||
int main(int argc, const char *const *argv) { | ||||
int64_t chk1, *ptr1; | ||||
long chk2, *ptr2 = &chk1; | ||||
ptr1 = &chk2; | ||||
*ptr1 = *ptr2 = 0; | ||||
printf("%ld %ld", chk1, chk2); | ||||
return 0; } | ||||
_ACEOF | ||||
if ac_fn_c_try_compile "$LINENO"; then : | ||||
CFLAGS=$apr_save_CFLAGS | ||||
apr_cv_typematch_int64_t_long_ld=yes | ||||
else | ||||
CFLAGS=$apr_save_CFLAGS | ||||
apr_cv_typematch_int64_t_long_ld=no | ||||
fi | ||||
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext | ||||
fi | ||||
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $apr_cv_typematch_int64_t_long_ | ||||
ld" >&5 | ||||
$as_echo "$apr_cv_typematch_int64_t_long_ld" >&6; } | ||||
if test "$apr_cv_typematch_int64_t_long_ld" = "yes"; then | ||||
: | ||||
int64_strfn="strtol" | ||||
else | ||||
: | ||||
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether int64_t and long long | ||||
use fmt %lld" >&5 | ||||
$as_echo_n "checking whether int64_t and long long use fmt %lld... " >&6; } | ||||
if ${apr_cv_typematch_int64_t_long_long_lld+:} false; then : | ||||
$as_echo_n "(cached) " >&6 | ||||
else | ||||
apr_save_CFLAGS=$CFLAGS | ||||
CFLAGS="$CFLAGS $CFLAGS_WARN" | ||||
if test "$ac_cv_c_compiler_gnu" = "yes"; then | ||||
CFLAGS="$CFLAGS -Werror" | ||||
fi | ||||
cat confdefs.h - <<_ACEOF >conftest.$ac_ext | ||||
/* end confdefs.h. */ | ||||
#include "confdefs.h" | ||||
#include <sys/types.h> | ||||
#include <stdio.h> | ||||
#ifdef HAVE_STDINT_H | ||||
#include <stdint.h> | ||||
#endif | ||||
int main(int argc, const char *const *argv) { | ||||
int64_t chk1, *ptr1; | ||||
long long chk2, *ptr2 = &chk1; | ||||
ptr1 = &chk2; | ||||
*ptr1 = *ptr2 = 0; | ||||
printf("%lld %lld", chk1, chk2); | ||||
return 0; } | ||||
_ACEOF | ||||
if ac_fn_c_try_compile "$LINENO"; then : | ||||
CFLAGS=$apr_save_CFLAGS | ||||
apr_cv_typematch_int64_t_long_long_lld=yes | ||||
else | ||||
CFLAGS=$apr_save_CFLAGS | ||||
apr_cv_typematch_int64_t_long_long_lld=no | ||||
fi | ||||
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext | ||||
fi | ||||
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $apr_cv_typematch_int64_t_long_ | ||||
long_lld" >&5 | ||||
$as_echo "$apr_cv_typematch_int64_t_long_long_lld" >&6; } | ||||
if test "$apr_cv_typematch_int64_t_long_long_lld" = "yes"; then | ||||
: | ||||
int64_strfn="strtoll" | ||||
else | ||||
: | ||||
as_fn_error $? "could not determine the string function for int64_t" "$L | ||||
INENO" 5 | ||||
fi | ||||
fi | ||||
fi | ||||
elif test "$ac_cv_sizeof_int" = "8"; then | ||||
int64_literal='#define APR_INT64_C(val) (val)' | int64_literal='#define APR_INT64_C(val) (val)' | |||
uint64_literal='#define APR_UINT64_C(val) (val##U)' | uint64_literal='#define APR_UINT64_C(val) (val##U)' | |||
int64_t_fmt='#define APR_INT64_T_FMT "d"' | int64_t_fmt='#define APR_INT64_T_FMT "d"' | |||
uint64_t_fmt='#define APR_UINT64_T_FMT "u"' | uint64_t_fmt='#define APR_UINT64_T_FMT "u"' | |||
uint64_t_hex_fmt='#define APR_UINT64_T_HEX_FMT "x"' | uint64_t_hex_fmt='#define APR_UINT64_T_HEX_FMT "x"' | |||
int64_value="int" | int64_value="int" | |||
long_value=int | uint64_value="unsigned int" | |||
int64_strfn="strtoi" | int64_strfn="strtoi" | |||
elif test "$ac_cv_sizeof_long" = "8"; then | elif test "$ac_cv_sizeof_long" = "8"; then | |||
int64_literal='#define APR_INT64_C(val) (val##L)' | int64_literal='#define APR_INT64_C(val) (val##L)' | |||
uint64_literal='#define APR_UINT64_C(val) (val##UL)' | uint64_literal='#define APR_UINT64_C(val) (val##UL)' | |||
int64_t_fmt='#define APR_INT64_T_FMT "ld"' | int64_t_fmt='#define APR_INT64_T_FMT "ld"' | |||
uint64_t_fmt='#define APR_UINT64_T_FMT "lu"' | uint64_t_fmt='#define APR_UINT64_T_FMT "lu"' | |||
uint64_t_hex_fmt='#define APR_UINT64_T_HEX_FMT "lx"' | uint64_t_hex_fmt='#define APR_UINT64_T_HEX_FMT "lx"' | |||
int64_value="long" | int64_value="long" | |||
long_value=long | uint64_value="unsigned long" | |||
int64_strfn="strtol" | int64_strfn="strtol" | |||
elif test "$ac_cv_sizeof_long_long" = "8"; then | elif test "$ac_cv_sizeof_long_long" = "8"; then | |||
int64_literal='#define APR_INT64_C(val) (val##LL)' | int64_literal='#define APR_INT64_C(val) (val##LL)' | |||
uint64_literal='#define APR_UINT64_C(val) (val##ULL)' | uint64_literal='#define APR_UINT64_C(val) (val##ULL)' | |||
# Linux, Solaris, FreeBSD all support ll with printf. | # Linux, Solaris, FreeBSD all support ll with printf. | |||
# BSD 4.4 originated 'q'. Solaris is more popular and | # BSD 4.4 originated 'q'. Solaris is more popular and | |||
# doesn't support 'q'. Solaris wins. Exceptions can | # doesn't support 'q'. Solaris wins. Exceptions can | |||
# go to the OS-dependent section. | # go to the OS-dependent section. | |||
int64_t_fmt='#define APR_INT64_T_FMT "lld"' | int64_t_fmt='#define APR_INT64_T_FMT "lld"' | |||
uint64_t_fmt='#define APR_UINT64_T_FMT "llu"' | uint64_t_fmt='#define APR_UINT64_T_FMT "llu"' | |||
uint64_t_hex_fmt='#define APR_UINT64_T_HEX_FMT "llx"' | uint64_t_hex_fmt='#define APR_UINT64_T_HEX_FMT "llx"' | |||
int64_value="long long" | int64_value="long long" | |||
long_value="long long" | uint64_value="unsigned long long" | |||
int64_strfn="strtoll" | int64_strfn="strtoll" | |||
elif test "$ac_cv_sizeof_longlong" = "8"; then | elif test "$ac_cv_sizeof_longlong" = "8"; then | |||
int64_literal='#define APR_INT64_C(val) (val##LL)' | int64_literal='#define APR_INT64_C(val) (val##LL)' | |||
uint64_literal='#define APR_UINT64_C(val) (val##ULL)' | uint64_literal='#define APR_UINT64_C(val) (val##ULL)' | |||
int64_t_fmt='#define APR_INT64_T_FMT "qd"' | int64_t_fmt='#define APR_INT64_T_FMT "qd"' | |||
uint64_t_fmt='#define APR_UINT64_T_FMT "qu"' | uint64_t_fmt='#define APR_UINT64_T_FMT "qu"' | |||
uint64_t_hex_fmt='#define APR_UINT64_T_HEX_FMT "qx"' | uint64_t_hex_fmt='#define APR_UINT64_T_HEX_FMT "qx"' | |||
int64_value="__int64" | int64_value="__int64" | |||
long_value="__int64" | uint64_value="unsigned __int64" | |||
int64_strfn="strtoll" | int64_strfn="strtoll" | |||
else | else | |||
# int64_literal may be overriden if your compiler thinks you have | # int64_literal may be overriden if your compiler thinks you have | |||
# a 64-bit value but APR does not agree. | # a 64-bit value but APR does not agree. | |||
as_fn_error $? "could not detect a 64-bit integer type" "$LINENO" 5 | as_fn_error $? "could not detect a 64-bit integer type" "$LINENO" 5 | |||
fi | fi | |||
# If present, allow the C99 macro INT64_C to override our conversion. | # If present, allow the C99 macro INT64_C to override our conversion. | |||
# | # | |||
# HP-UX's ANSI C compiler provides this without any includes, so we | # HP-UX's ANSI C compiler provides this without any includes, so we | |||
skipping to change at line 22675 | skipping to change at line 22864 | |||
ssize_t_fmt="ld" | ssize_t_fmt="ld" | |||
;; | ;; | |||
esac | esac | |||
size_t_fmt="lu" | size_t_fmt="lu" | |||
;; | ;; | |||
*-mingw*) | *-mingw*) | |||
int64_t_fmt='#define APR_INT64_T_FMT "I64d"' | int64_t_fmt='#define APR_INT64_T_FMT "I64d"' | |||
uint64_t_fmt='#define APR_UINT64_T_FMT "I64u"' | uint64_t_fmt='#define APR_UINT64_T_FMT "I64u"' | |||
uint64_t_hex_fmt='#define APR_UINT64_T_HEX_FMT "I64x"' | uint64_t_hex_fmt='#define APR_UINT64_T_HEX_FMT "I64x"' | |||
int64_value="__int64" | int64_value="__int64" | |||
long_value="__int64" | uint64_value="unsigned __int64" | |||
int64_strfn="_strtoi64" | int64_strfn="_strtoi64" | |||
;; | ;; | |||
esac | esac | |||
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether ssize_t and int are th | { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether ssize_t and long use f | |||
e same" >&5 | mt %ld" >&5 | |||
$as_echo_n "checking whether ssize_t and int are the same... " >&6; } | $as_echo_n "checking whether ssize_t and long use fmt %ld... " >&6; } | |||
if ${apr_cv_typematch_ssize_t_int+:} false; then : | if ${apr_cv_typematch_ssize_t_long_ld+:} false; then : | |||
$as_echo_n "(cached) " >&6 | $as_echo_n "(cached) " >&6 | |||
else | else | |||
cat confdefs.h - <<_ACEOF >conftest.$ac_ext | apr_save_CFLAGS=$CFLAGS | |||
CFLAGS="$CFLAGS $CFLAGS_WARN" | ||||
if test "$ac_cv_c_compiler_gnu" = "yes"; then | ||||
CFLAGS="$CFLAGS -Werror" | ||||
fi | ||||
cat confdefs.h - <<_ACEOF >conftest.$ac_ext | ||||
/* end confdefs.h. */ | /* end confdefs.h. */ | |||
$ac_includes_default | #include "confdefs.h" | |||
int | ||||
main () | ||||
{ | ||||
int foo[0 - !__builtin_types_compatible_p(ssize_t, int)]; | #include <sys/types.h> | |||
#include <stdio.h> | ||||
#ifdef HAVE_STDINT_H | ||||
#include <stdint.h> | ||||
#endif | ||||
; | int main(int argc, const char *const *argv) { | |||
return 0; | ||||
} | ssize_t chk1, *ptr1; | |||
_ACEOF | long chk2, *ptr2 = &chk1; | |||
if ac_fn_c_try_compile "$LINENO"; then : | ptr1 = &chk2; | |||
apr_cv_typematch_ssize_t_int=yes | *ptr1 = *ptr2 = 0; | |||
ssize_t_fmt="d" | printf("%ld %ld", chk1, chk2); | |||
else | ||||
apr_cv_typematch_ssize_t_int=no | return 0; } | |||
_ACEOF | ||||
if ac_fn_c_try_compile "$LINENO"; then : | ||||
CFLAGS=$apr_save_CFLAGS | ||||
apr_cv_typematch_ssize_t_long_ld=yes | ||||
else | ||||
CFLAGS=$apr_save_CFLAGS | ||||
apr_cv_typematch_ssize_t_long_ld=no | ||||
fi | fi | |||
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext | rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext | |||
fi | fi | |||
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $apr_cv_typematch_ssize_t_int" | { $as_echo "$as_me:${as_lineno-$LINENO}: result: $apr_cv_typematch_ssize_t_long_ | |||
>&5 | ld" >&5 | |||
$as_echo "$apr_cv_typematch_ssize_t_int" >&6; } | $as_echo "$apr_cv_typematch_ssize_t_long_ld" >&6; } | |||
if test "$apr_cv_typematch_ssize_t_long_ld" = "yes"; then | ||||
: | ||||
ssize_t_fmt="ld" | ||||
else | ||||
: | ||||
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether ssize_t and long are t | { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether ssize_t and int use fm | |||
he same" >&5 | t %d" >&5 | |||
$as_echo_n "checking whether ssize_t and long are the same... " >&6; } | $as_echo_n "checking whether ssize_t and int use fmt %d... " >&6; } | |||
if ${apr_cv_typematch_ssize_t_long+:} false; then : | if ${apr_cv_typematch_ssize_t_int_d+:} false; then : | |||
$as_echo_n "(cached) " >&6 | $as_echo_n "(cached) " >&6 | |||
else | else | |||
cat confdefs.h - <<_ACEOF >conftest.$ac_ext | apr_save_CFLAGS=$CFLAGS | |||
CFLAGS="$CFLAGS $CFLAGS_WARN" | ||||
if test "$ac_cv_c_compiler_gnu" = "yes"; then | ||||
CFLAGS="$CFLAGS -Werror" | ||||
fi | ||||
cat confdefs.h - <<_ACEOF >conftest.$ac_ext | ||||
/* end confdefs.h. */ | /* end confdefs.h. */ | |||
$ac_includes_default | #include "confdefs.h" | |||
int | ||||
main () | ||||
{ | ||||
int foo[0 - !__builtin_types_compatible_p(ssize_t, long)]; | #include <sys/types.h> | |||
#include <stdio.h> | ||||
#ifdef HAVE_STDINT_H | ||||
#include <stdint.h> | ||||
#endif | ||||
int main(int argc, const char *const *argv) { | ||||
ssize_t chk1, *ptr1; | ||||
int chk2, *ptr2 = &chk1; | ||||
ptr1 = &chk2; | ||||
*ptr1 = *ptr2 = 0; | ||||
printf("%d %d", chk1, chk2); | ||||
return 0; } | ||||
; | ||||
return 0; | ||||
} | ||||
_ACEOF | _ACEOF | |||
if ac_fn_c_try_compile "$LINENO"; then : | if ac_fn_c_try_compile "$LINENO"; then : | |||
apr_cv_typematch_ssize_t_long=yes | CFLAGS=$apr_save_CFLAGS | |||
ssize_t_fmt="ld" | apr_cv_typematch_ssize_t_int_d=yes | |||
else | else | |||
apr_cv_typematch_ssize_t_long=no | CFLAGS=$apr_save_CFLAGS | |||
apr_cv_typematch_ssize_t_int_d=no | ||||
fi | fi | |||
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext | rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext | |||
fi | fi | |||
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $apr_cv_typematch_ssize_t_long" | { $as_echo "$as_me:${as_lineno-$LINENO}: result: $apr_cv_typematch_ssize_t_int_d | |||
>&5 | " >&5 | |||
$as_echo "$apr_cv_typematch_ssize_t_long" >&6; } | $as_echo "$apr_cv_typematch_ssize_t_int_d" >&6; } | |||
if test "$apr_cv_typematch_ssize_t_int_d" = "yes"; then | ||||
: | ||||
ssize_t_fmt="d" | ||||
else | ||||
: | ||||
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether size_t and unsigned in | fi | |||
t are the same" >&5 | ||||
$as_echo_n "checking whether size_t and unsigned int are the same... " >&6; } | fi | |||
if ${apr_cv_typematch_size_t_unsigned_int+:} false; then : | ||||
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether size_t and unsigned lo | ||||
ng use fmt %lu" >&5 | ||||
$as_echo_n "checking whether size_t and unsigned long use fmt %lu... " >&6; } | ||||
if ${apr_cv_typematch_size_t_unsigned_long_lu+:} false; then : | ||||
$as_echo_n "(cached) " >&6 | $as_echo_n "(cached) " >&6 | |||
else | else | |||
cat confdefs.h - <<_ACEOF >conftest.$ac_ext | apr_save_CFLAGS=$CFLAGS | |||
CFLAGS="$CFLAGS $CFLAGS_WARN" | ||||
if test "$ac_cv_c_compiler_gnu" = "yes"; then | ||||
CFLAGS="$CFLAGS -Werror" | ||||
fi | ||||
cat confdefs.h - <<_ACEOF >conftest.$ac_ext | ||||
/* end confdefs.h. */ | /* end confdefs.h. */ | |||
$ac_includes_default | #include "confdefs.h" | |||
int | ||||
main () | ||||
{ | ||||
int foo[0 - !__builtin_types_compatible_p(size_t, unsigned int)]; | #include <sys/types.h> | |||
#include <stdio.h> | ||||
#ifdef HAVE_STDINT_H | ||||
#include <stdint.h> | ||||
#endif | ||||
int main(int argc, const char *const *argv) { | ||||
size_t chk1, *ptr1; | ||||
unsigned long chk2, *ptr2 = &chk1; | ||||
ptr1 = &chk2; | ||||
*ptr1 = *ptr2 = 0; | ||||
printf("%lu %lu", chk1, chk2); | ||||
return 0; } | ||||
; | ||||
return 0; | ||||
} | ||||
_ACEOF | _ACEOF | |||
if ac_fn_c_try_compile "$LINENO"; then : | if ac_fn_c_try_compile "$LINENO"; then : | |||
apr_cv_typematch_size_t_unsigned_int=yes | CFLAGS=$apr_save_CFLAGS | |||
size_t_fmt="u" | apr_cv_typematch_size_t_unsigned_long_lu=yes | |||
else | else | |||
apr_cv_typematch_size_t_unsigned_int=no | CFLAGS=$apr_save_CFLAGS | |||
apr_cv_typematch_size_t_unsigned_long_lu=no | ||||
fi | fi | |||
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext | rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext | |||
fi | fi | |||
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $apr_cv_typematch_size_t_unsign | { $as_echo "$as_me:${as_lineno-$LINENO}: result: $apr_cv_typematch_size_t_unsign | |||
ed_int" >&5 | ed_long_lu" >&5 | |||
$as_echo "$apr_cv_typematch_size_t_unsigned_int" >&6; } | $as_echo "$apr_cv_typematch_size_t_unsigned_long_lu" >&6; } | |||
if test "$apr_cv_typematch_size_t_unsigned_long_lu" = "yes"; then | ||||
: | ||||
size_t_fmt="lu" | ||||
else | ||||
: | ||||
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether size_t and unsigned lo | { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether size_t and unsigned in | |||
ng are the same" >&5 | t use fmt %u" >&5 | |||
$as_echo_n "checking whether size_t and unsigned long are the same... " >&6; } | $as_echo_n "checking whether size_t and unsigned int use fmt %u... " >&6; } | |||
if ${apr_cv_typematch_size_t_unsigned_long+:} false; then : | if ${apr_cv_typematch_size_t_unsigned_int_u+:} false; then : | |||
$as_echo_n "(cached) " >&6 | $as_echo_n "(cached) " >&6 | |||
else | else | |||
cat confdefs.h - <<_ACEOF >conftest.$ac_ext | apr_save_CFLAGS=$CFLAGS | |||
CFLAGS="$CFLAGS $CFLAGS_WARN" | ||||
if test "$ac_cv_c_compiler_gnu" = "yes"; then | ||||
CFLAGS="$CFLAGS -Werror" | ||||
fi | ||||
cat confdefs.h - <<_ACEOF >conftest.$ac_ext | ||||
/* end confdefs.h. */ | /* end confdefs.h. */ | |||
$ac_includes_default | #include "confdefs.h" | |||
int | ||||
main () | ||||
{ | ||||
int foo[0 - !__builtin_types_compatible_p(size_t, unsigned long)]; | #include <sys/types.h> | |||
#include <stdio.h> | ||||
#ifdef HAVE_STDINT_H | ||||
#include <stdint.h> | ||||
#endif | ||||
int main(int argc, const char *const *argv) { | ||||
size_t chk1, *ptr1; | ||||
unsigned int chk2, *ptr2 = &chk1; | ||||
ptr1 = &chk2; | ||||
*ptr1 = *ptr2 = 0; | ||||
printf("%u %u", chk1, chk2); | ||||
return 0; } | ||||
; | ||||
return 0; | ||||
} | ||||
_ACEOF | _ACEOF | |||
if ac_fn_c_try_compile "$LINENO"; then : | if ac_fn_c_try_compile "$LINENO"; then : | |||
apr_cv_typematch_size_t_unsigned_long=yes | CFLAGS=$apr_save_CFLAGS | |||
size_t_fmt="lu" | apr_cv_typematch_size_t_unsigned_int_u=yes | |||
else | else | |||
apr_cv_typematch_size_t_unsigned_long=no | CFLAGS=$apr_save_CFLAGS | |||
apr_cv_typematch_size_t_unsigned_int_u=no | ||||
fi | fi | |||
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext | rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext | |||
fi | ||||
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $apr_cv_typematch_size_t_unsign | ||||
ed_int_u" >&5 | ||||
$as_echo "$apr_cv_typematch_size_t_unsigned_int_u" >&6; } | ||||
if test "$apr_cv_typematch_size_t_unsigned_int_u" = "yes"; then | ||||
: | ||||
size_t_fmt="u" | ||||
else | ||||
: | ||||
fi | ||||
fi | fi | |||
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $apr_cv_typematch_size_t_unsign | ||||
ed_long" >&5 | ||||
$as_echo "$apr_cv_typematch_size_t_unsigned_long" >&6; } | ||||
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking size of ssize_t" >&5 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking size of ssize_t" >&5 | |||
$as_echo_n "checking size of ssize_t... " >&6; } | $as_echo_n "checking size of ssize_t... " >&6; } | |||
if ${ac_cv_sizeof_ssize_t+:} false; then : | if ${ac_cv_sizeof_ssize_t+:} false; then : | |||
$as_echo_n "(cached) " >&6 | $as_echo_n "(cached) " >&6 | |||
else | else | |||
if test "$cross_compiling" = yes; then : | if test "$cross_compiling" = yes; then : | |||
ac_cv_sizeof_ssize_t=8 | ac_cv_sizeof_ssize_t=8 | |||
else | else | |||
cat confdefs.h - <<_ACEOF >conftest.$ac_ext | cat confdefs.h - <<_ACEOF >conftest.$ac_ext | |||
skipping to change at line 22903 | skipping to change at line 23180 | |||
fi | fi | |||
fi | fi | |||
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sizeof_size_t" >&5 | { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sizeof_size_t" >&5 | |||
$as_echo "$ac_cv_sizeof_size_t" >&6; } | $as_echo "$ac_cv_sizeof_size_t" >&6; } | |||
cat >>confdefs.h <<_ACEOF | cat >>confdefs.h <<_ACEOF | |||
#define SIZEOF_SIZE_T $ac_cv_sizeof_size_t | #define SIZEOF_SIZE_T $ac_cv_sizeof_size_t | |||
_ACEOF | _ACEOF | |||
# else cases below should no longer occur; | ||||
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking which format to use for apr_si ze_t" >&5 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking which format to use for apr_si ze_t" >&5 | |||
$as_echo_n "checking which format to use for apr_size_t... " >&6; } | $as_echo_n "checking which format to use for apr_size_t... " >&6; } | |||
if test -n "$size_t_fmt"; then | if test -n "$size_t_fmt"; then | |||
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: %$size_t_fmt" >&5 | { $as_echo "$as_me:${as_lineno-$LINENO}: result: %$size_t_fmt" >&5 | |||
$as_echo "%$size_t_fmt" >&6; } | $as_echo "%$size_t_fmt" >&6; } | |||
elif test "$ac_cv_sizeof_size_t" = "$ac_cv_sizeof_int"; then | elif test "$ac_cv_sizeof_size_t" = "$ac_cv_sizeof_int"; then | |||
size_t_fmt="d" | size_t_fmt="d" | |||
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: %d" >&5 | { $as_echo "$as_me:${as_lineno-$LINENO}: result: %d" >&5 | |||
$as_echo "%d" >&6; } | $as_echo "%d" >&6; } | |||
elif test "$ac_cv_sizeof_size_t" = "$ac_cv_sizeof_long"; then | elif test "$ac_cv_sizeof_size_t" = "$ac_cv_sizeof_long"; then | |||
skipping to change at line 23020 | skipping to change at line 23298 | |||
off_t_strfn='apr_strtoi64' | off_t_strfn='apr_strtoi64' | |||
elif test "${ac_cv_sizeof_off_t}x${ac_cv_sizeof_long}" = "4x4"; then | elif test "${ac_cv_sizeof_off_t}x${ac_cv_sizeof_long}" = "4x4"; then | |||
# Special case: off_t may change size with _FILE_OFFSET_BITS | # Special case: off_t may change size with _FILE_OFFSET_BITS | |||
# on 32-bit systems with LFS support. To avoid compatibility | # on 32-bit systems with LFS support. To avoid compatibility | |||
# issues when other packages do define _FILE_OFFSET_BITS, | # issues when other packages do define _FILE_OFFSET_BITS, | |||
# hard-code apr_off_t to long. | # hard-code apr_off_t to long. | |||
off_t_value=long | off_t_value=long | |||
off_t_fmt='#define APR_OFF_T_FMT "ld"' | off_t_fmt='#define APR_OFF_T_FMT "ld"' | |||
off_t_strfn='strtol' | off_t_strfn='strtol' | |||
elif test "$ac_cv_type_off_t" = "yes"; then | elif test "$ac_cv_type_off_t" = "yes"; then | |||
off_t_value=off_t | ||||
# off_t is more commonly a long than an int; prefer that case | # off_t is more commonly a long than an int; prefer that case | |||
# where int and long are the same size. | # where int and long are the same size and interchangable. | |||
if test "$ac_cv_sizeof_off_t" = "$ac_cv_sizeof_long"; then | off_t_value=off_t | |||
off_t_fmt='#define APR_OFF_T_FMT "ld"' | ||||
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether off_t and long use fmt | ||||
%ld" >&5 | ||||
$as_echo_n "checking whether off_t and long use fmt %ld... " >&6; } | ||||
if ${apr_cv_typematch_off_t_long_ld+:} false; then : | ||||
$as_echo_n "(cached) " >&6 | ||||
else | ||||
apr_save_CFLAGS=$CFLAGS | ||||
CFLAGS="$CFLAGS $CFLAGS_WARN" | ||||
if test "$ac_cv_c_compiler_gnu" = "yes"; then | ||||
CFLAGS="$CFLAGS -Werror" | ||||
fi | ||||
cat confdefs.h - <<_ACEOF >conftest.$ac_ext | ||||
/* end confdefs.h. */ | ||||
#include "confdefs.h" | ||||
#include <sys/types.h> | ||||
#include <stdio.h> | ||||
#ifdef HAVE_STDINT_H | ||||
#include <stdint.h> | ||||
#endif | ||||
int main(int argc, const char *const *argv) { | ||||
off_t chk1, *ptr1; | ||||
long chk2, *ptr2 = &chk1; | ||||
ptr1 = &chk2; | ||||
*ptr1 = *ptr2 = 0; | ||||
printf("%ld %ld", chk1, chk2); | ||||
return 0; } | ||||
_ACEOF | ||||
if ac_fn_c_try_compile "$LINENO"; then : | ||||
CFLAGS=$apr_save_CFLAGS | ||||
apr_cv_typematch_off_t_long_ld=yes | ||||
else | ||||
CFLAGS=$apr_save_CFLAGS | ||||
apr_cv_typematch_off_t_long_ld=no | ||||
fi | ||||
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext | ||||
fi | ||||
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $apr_cv_typematch_off_t_long_ld | ||||
" >&5 | ||||
$as_echo "$apr_cv_typematch_off_t_long_ld" >&6; } | ||||
if test "$apr_cv_typematch_off_t_long_ld" = "yes"; then | ||||
: | ||||
off_t_fmt="#define APR_OFF_T_FMT \"ld\"" | ||||
off_t_strfn='strtol' | off_t_strfn='strtol' | |||
elif test "$ac_cv_sizeof_off_t" = "$ac_cv_sizeof_int"; then | ||||
off_t_fmt='#define APR_OFF_T_FMT "d"' | else | |||
: | ||||
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether off_t and int use fmt | ||||
%d" >&5 | ||||
$as_echo_n "checking whether off_t and int use fmt %d... " >&6; } | ||||
if ${apr_cv_typematch_off_t_int_d+:} false; then : | ||||
$as_echo_n "(cached) " >&6 | ||||
else | ||||
apr_save_CFLAGS=$CFLAGS | ||||
CFLAGS="$CFLAGS $CFLAGS_WARN" | ||||
if test "$ac_cv_c_compiler_gnu" = "yes"; then | ||||
CFLAGS="$CFLAGS -Werror" | ||||
fi | ||||
cat confdefs.h - <<_ACEOF >conftest.$ac_ext | ||||
/* end confdefs.h. */ | ||||
#include "confdefs.h" | ||||
#include <sys/types.h> | ||||
#include <stdio.h> | ||||
#ifdef HAVE_STDINT_H | ||||
#include <stdint.h> | ||||
#endif | ||||
int main(int argc, const char *const *argv) { | ||||
off_t chk1, *ptr1; | ||||
int chk2, *ptr2 = &chk1; | ||||
ptr1 = &chk2; | ||||
*ptr1 = *ptr2 = 0; | ||||
printf("%d %d", chk1, chk2); | ||||
return 0; } | ||||
_ACEOF | ||||
if ac_fn_c_try_compile "$LINENO"; then : | ||||
CFLAGS=$apr_save_CFLAGS | ||||
apr_cv_typematch_off_t_int_d=yes | ||||
else | ||||
CFLAGS=$apr_save_CFLAGS | ||||
apr_cv_typematch_off_t_int_d=no | ||||
fi | ||||
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext | ||||
fi | ||||
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $apr_cv_typematch_off_t_int_d" | ||||
>&5 | ||||
$as_echo "$apr_cv_typematch_off_t_int_d" >&6; } | ||||
if test "$apr_cv_typematch_off_t_int_d" = "yes"; then | ||||
: | ||||
off_t_fmt="#define APR_OFF_T_FMT \"d\"" | ||||
off_t_strfn='strtoi' | off_t_strfn='strtoi' | |||
elif test "$ac_cv_sizeof_off_t" = "$ac_cv_sizeof_long_long"; then | ||||
off_t_fmt='#define APR_OFF_T_FMT APR_INT64_T_FMT' | else | |||
: | ||||
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether off_t and long long us | ||||
e fmt %lld" >&5 | ||||
$as_echo_n "checking whether off_t and long long use fmt %lld... " >&6; } | ||||
if ${apr_cv_typematch_off_t_long_long_lld+:} false; then : | ||||
$as_echo_n "(cached) " >&6 | ||||
else | ||||
apr_save_CFLAGS=$CFLAGS | ||||
CFLAGS="$CFLAGS $CFLAGS_WARN" | ||||
if test "$ac_cv_c_compiler_gnu" = "yes"; then | ||||
CFLAGS="$CFLAGS -Werror" | ||||
fi | ||||
cat confdefs.h - <<_ACEOF >conftest.$ac_ext | ||||
/* end confdefs.h. */ | ||||
#include "confdefs.h" | ||||
#include <sys/types.h> | ||||
#include <stdio.h> | ||||
#ifdef HAVE_STDINT_H | ||||
#include <stdint.h> | ||||
#endif | ||||
int main(int argc, const char *const *argv) { | ||||
off_t chk1, *ptr1; | ||||
long long chk2, *ptr2 = &chk1; | ||||
ptr1 = &chk2; | ||||
*ptr1 = *ptr2 = 0; | ||||
printf("%lld %lld", chk1, chk2); | ||||
return 0; } | ||||
_ACEOF | ||||
if ac_fn_c_try_compile "$LINENO"; then : | ||||
CFLAGS=$apr_save_CFLAGS | ||||
apr_cv_typematch_off_t_long_long_lld=yes | ||||
else | ||||
CFLAGS=$apr_save_CFLAGS | ||||
apr_cv_typematch_off_t_long_long_lld=no | ||||
fi | ||||
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext | ||||
fi | ||||
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $apr_cv_typematch_off_t_long_lo | ||||
ng_lld" >&5 | ||||
$as_echo "$apr_cv_typematch_off_t_long_long_lld" >&6; } | ||||
if test "$apr_cv_typematch_off_t_long_long_lld" = "yes"; then | ||||
: | ||||
off_t_fmt="#define APR_OFF_T_FMT \"lld\"" | ||||
off_t_strfn='strtoll' | ||||
else | ||||
: | ||||
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether off_t and $int64_value | ||||
use fmt %I64d" >&5 | ||||
$as_echo_n "checking whether off_t and $int64_value use fmt %I64d... " >&6; } | ||||
if eval \${apr_cv_typematch_off_t_$int64_value_I64d+:} false; then : | ||||
$as_echo_n "(cached) " >&6 | ||||
else | ||||
apr_save_CFLAGS=$CFLAGS | ||||
CFLAGS="$CFLAGS $CFLAGS_WARN" | ||||
if test "$ac_cv_c_compiler_gnu" = "yes"; then | ||||
CFLAGS="$CFLAGS -Werror" | ||||
fi | ||||
cat confdefs.h - <<_ACEOF >conftest.$ac_ext | ||||
/* end confdefs.h. */ | ||||
#include "confdefs.h" | ||||
#include <sys/types.h> | ||||
#include <stdio.h> | ||||
#ifdef HAVE_STDINT_H | ||||
#include <stdint.h> | ||||
#endif | ||||
int main(int argc, const char *const *argv) { | ||||
off_t chk1, *ptr1; | ||||
$int64_value chk2, *ptr2 = &chk1; | ||||
ptr1 = &chk2; | ||||
*ptr1 = *ptr2 = 0; | ||||
printf("%I64d %I64d", chk1, chk2); | ||||
return 0; } | ||||
_ACEOF | ||||
if ac_fn_c_try_compile "$LINENO"; then : | ||||
CFLAGS=$apr_save_CFLAGS | ||||
apr_cv_typematch_off_t_$int64_value_I64d=yes | ||||
else | ||||
CFLAGS=$apr_save_CFLAGS | ||||
apr_cv_typematch_off_t_$int64_value_I64d=no | ||||
fi | ||||
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext | ||||
fi | ||||
eval ac_res=\$apr_cv_typematch_off_t_$int64_value_I64d | ||||
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 | ||||
$as_echo "$ac_res" >&6; } | ||||
if test "$apr_cv_typematch_off_t_$int64_value_I64d" = "yes"; then | ||||
: | ||||
off_t_fmt="#define APR_OFF_T_FMT APR_INT64_T_FMT" | ||||
off_t_strfn='apr_strtoi64' | off_t_strfn='apr_strtoi64' | |||
else | else | |||
as_fn_error $? "could not determine the size of off_t" "$LINENO" 5 | : | |||
fi | ||||
# Per OS tuning... | # Per OS tuning... | |||
case $host in | case $host in | |||
*-mingw*) | *-mingw*) | |||
off_t_value=apr_int64_t | off_t_value=apr_int64_t | |||
off_t_fmt='#define APR_OFF_T_FMT "I64d"' | off_t_fmt='#define APR_OFF_T_FMT "I64d"' | |||
off_t_strfn='_strtoi64' | off_t_strfn='_strtoi64' | |||
;; | ;; | |||
*) | ||||
as_fn_error $? "could not determine the size of off_t" "$LINENO" 5 | ||||
;; | ||||
esac | esac | |||
fi | ||||
fi | ||||
fi | ||||
fi | ||||
else | else | |||
# Fallback on int | # Fallback on int | |||
off_t_value=apr_int32_t | off_t_value=apr_int32_t | |||
off_t_fmt=d | off_t_fmt=d | |||
off_t_strfn='strtoi' | off_t_strfn='strtoi' | |||
fi | fi | |||
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $off_t_value" >&5 | { $as_echo "$as_me:${as_lineno-$LINENO}: result: $off_t_value" >&5 | |||
$as_echo "$off_t_value" >&6; } | $as_echo "$off_t_value" >&6; } | |||
# Regardless of whether _LARGEFILE64_SOURCE is used, on some | # Regardless of whether _LARGEFILE64_SOURCE is used, on some | |||
skipping to change at line 23917 | skipping to change at line 24408 | |||
int main(int argc, const char *const *argv) { | int main(int argc, const char *const *argv) { | |||
int foo[argc]; | int foo[argc]; | |||
foo[0] = 0; | foo[0] = 0; | |||
return 0; } | return 0; } | |||
_ACEOF | _ACEOF | |||
if ac_fn_c_try_compile "$LINENO"; then : | if ac_fn_c_try_compile "$LINENO"; then : | |||
vla_msg=yes | CFLAGS=$apr_save_CFLAGS | |||
vla_msg=yes | ||||
else | else | |||
vla_msg=no | CFLAGS=$apr_save_CFLAGS | |||
vla_msg=no | ||||
fi | fi | |||
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext | rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext | |||
CFLAGS=$apr_save_CFLAGS | ||||
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $vla_msg" >&5 | { $as_echo "$as_me:${as_lineno-$LINENO}: result: $vla_msg" >&5 | |||
$as_echo "$vla_msg" >&6; } | $as_echo "$vla_msg" >&6; } | |||
if test "$vla_msg" = "yes"; then | if test "$vla_msg" = "yes"; then | |||
$as_echo "#define HAVE_VLA 1" >>confdefs.h | $as_echo "#define HAVE_VLA 1" >>confdefs.h | |||
fi | fi | |||
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking struct rlimit" >&5 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking struct rlimit" >&5 | |||
skipping to change at line 23975 | skipping to change at line 24467 | |||
fi | fi | |||
fi | fi | |||
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_struct_rlimit" >&5 | { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_struct_rlimit" >&5 | |||
$as_echo "$ac_cv_struct_rlimit" >&6; } | $as_echo "$ac_cv_struct_rlimit" >&6; } | |||
struct_rlimit=0 | struct_rlimit=0 | |||
test "x$ac_cv_struct_rlimit" = xyes && struct_rlimit=1 | test "x$ac_cv_struct_rlimit" = xyes && struct_rlimit=1 | |||
echo "${nl}Checking for Locking..." | echo "${nl}Checking for Locking..." | |||
for ac_func in semget semctl flock | for ac_func in semget semctl semop semtimedop flock | |||
do : | do : | |||
as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh` | as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh` | |||
ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var" | ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var" | |||
if eval test \"x\$"$as_ac_var"\" = x"yes"; then : | if eval test \"x\$"$as_ac_var"\" = x"yes"; then : | |||
cat >>confdefs.h <<_ACEOF | cat >>confdefs.h <<_ACEOF | |||
#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1 | #define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1 | |||
_ACEOF | _ACEOF | |||
fi | fi | |||
done | done | |||
for ac_header in semaphore.h OS.h | ac_rc=yes | |||
for ac_spec in func:semtimedop; do | ||||
ac_type=`echo "$ac_spec" | sed -e 's/:.*$//'` | ||||
ac_item=`echo "$ac_spec" | sed -e 's/^.*://'` | ||||
case $ac_type in | ||||
header ) | ||||
ac_item=`echo "$ac_item" | sed 'y%./+-%__p_%'` | ||||
ac_var="ac_cv_header_$ac_item" | ||||
;; | ||||
file ) | ||||
ac_item=`echo "$ac_item" | sed 'y%./+-%__p_%'` | ||||
ac_var="ac_cv_file_$ac_item" | ||||
;; | ||||
func ) ac_var="ac_cv_func_$ac_item" ;; | ||||
struct ) ac_var="ac_cv_struct_$ac_item" ;; | ||||
define ) ac_var="ac_cv_define_$ac_item" ;; | ||||
custom ) ac_var="$ac_item" ;; | ||||
esac | ||||
eval "ac_val=\$$ac_var" | ||||
if test ".$ac_val" != .yes; then | ||||
ac_rc=no | ||||
break | ||||
fi | ||||
done | ||||
if test ".$ac_rc" = .yes; then | ||||
: | ||||
have_semtimedop="1" | ||||
else | ||||
: | ||||
have_semtimedop="0" | ||||
fi | ||||
for ac_header in semaphore.h | ||||
do : | do : | |||
as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh` | ac_fn_c_check_header_mongrel "$LINENO" "semaphore.h" "ac_cv_header_semaphore_h | |||
ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_include | " "$ac_includes_default" | |||
s_default" | if test "x$ac_cv_header_semaphore_h" = xyes; then : | |||
if eval test \"x\$"$as_ac_Header"\" = x"yes"; then : | ||||
cat >>confdefs.h <<_ACEOF | cat >>confdefs.h <<_ACEOF | |||
#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1 | #define HAVE_SEMAPHORE_H 1 | |||
_ACEOF | _ACEOF | |||
fi | fi | |||
done | done | |||
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing sem_ope n" >&5 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing sem_ope n" >&5 | |||
$as_echo_n "checking for library containing sem_open... " >&6; } | $as_echo_n "checking for library containing sem_open... " >&6; } | |||
if ${ac_cv_search_sem_open+:} false; then : | if ${ac_cv_search_sem_open+:} false; then : | |||
$as_echo_n "(cached) " >&6 | $as_echo_n "(cached) " >&6 | |||
skipping to change at line 24040 | skipping to change at line 24563 | |||
fi | fi | |||
if ac_fn_c_try_link "$LINENO"; then : | if ac_fn_c_try_link "$LINENO"; then : | |||
ac_cv_search_sem_open=$ac_res | ac_cv_search_sem_open=$ac_res | |||
fi | fi | |||
rm -f core conftest.err conftest.$ac_objext \ | rm -f core conftest.err conftest.$ac_objext \ | |||
conftest$ac_exeext | conftest$ac_exeext | |||
if ${ac_cv_search_sem_open+:} false; then : | if ${ac_cv_search_sem_open+:} false; then : | |||
break | break | |||
fi | fi | |||
done | done | |||
if ${ac_cv_search_sem_open+:} false; then : | if ${ac_cv_search_sem_open+:} false; then : | |||
else | ||||
ac_cv_search_sem_open=no | ||||
fi | ||||
rm conftest.$ac_ext | ||||
LIBS=$ac_func_search_save_LIBS | ||||
fi | ||||
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_sem_open" >&5 | ||||
$as_echo "$ac_cv_search_sem_open" >&6; } | ||||
ac_res=$ac_cv_search_sem_open | ||||
if test "$ac_res" != no; then : | ||||
test "$ac_res" = "none required" || LIBS="$ac_res $LIBS" | ||||
fi | ||||
for ac_func in sem_close sem_unlink sem_post sem_wait sem_timedwait | ||||
do : | ||||
as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh` | ||||
ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var" | ||||
if eval test \"x\$"$as_ac_var"\" = x"yes"; then : | ||||
cat >>confdefs.h <<_ACEOF | ||||
#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1 | ||||
_ACEOF | ||||
fi | ||||
done | ||||
ac_rc=yes | ||||
for ac_spec in func:sem_timedwait; do | ||||
ac_type=`echo "$ac_spec" | sed -e 's/:.*$//'` | ||||
ac_item=`echo "$ac_spec" | sed -e 's/^.*://'` | ||||
case $ac_type in | ||||
header ) | ||||
ac_item=`echo "$ac_item" | sed 'y%./+-%__p_%'` | ||||
ac_var="ac_cv_header_$ac_item" | ||||
;; | ||||
file ) | ||||
ac_item=`echo "$ac_item" | sed 'y%./+-%__p_%'` | ||||
ac_var="ac_cv_file_$ac_item" | ||||
;; | ||||
func ) ac_var="ac_cv_func_$ac_item" ;; | ||||
struct ) ac_var="ac_cv_struct_$ac_item" ;; | ||||
define ) ac_var="ac_cv_define_$ac_item" ;; | ||||
custom ) ac_var="$ac_item" ;; | ||||
esac | ||||
eval "ac_val=\$$ac_var" | ||||
if test ".$ac_val" != .yes; then | ||||
ac_rc=no | ||||
break | ||||
fi | ||||
done | ||||
if test ".$ac_rc" = .yes; then | ||||
: | ||||
have_sem_timedwait="1" | ||||
else | else | |||
ac_cv_search_sem_open=no | : | |||
fi | have_sem_timedwait="0" | |||
rm conftest.$ac_ext | ||||
LIBS=$ac_func_search_save_LIBS | ||||
fi | fi | |||
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_sem_open" >&5 | ||||
$as_echo "$ac_cv_search_sem_open" >&6; } | for ac_header in OS.h | |||
ac_res=$ac_cv_search_sem_open | do : | |||
if test "$ac_res" != no; then : | ac_fn_c_check_header_mongrel "$LINENO" "OS.h" "ac_cv_header_OS_h" "$ac_include | |||
test "$ac_res" = "none required" || LIBS="$ac_res $LIBS" | s_default" | |||
if test "x$ac_cv_header_OS_h" = xyes; then : | ||||
cat >>confdefs.h <<_ACEOF | ||||
#define HAVE_OS_H 1 | ||||
_ACEOF | ||||
fi | fi | |||
for ac_func in sem_close sem_unlink sem_post sem_wait create_sem | done | |||
for ac_func in create_sem acquire_sem acquire_sem_etc | ||||
do : | do : | |||
as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh` | as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh` | |||
ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var" | ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var" | |||
if eval test \"x\$"$as_ac_var"\" = x"yes"; then : | if eval test \"x\$"$as_ac_var"\" = x"yes"; then : | |||
cat >>confdefs.h <<_ACEOF | cat >>confdefs.h <<_ACEOF | |||
#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1 | #define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1 | |||
_ACEOF | _ACEOF | |||
fi | fi | |||
done | done | |||
ac_rc=yes | ||||
for ac_spec in header:OS.h func:acquire_sem_etc; do | ||||
ac_type=`echo "$ac_spec" | sed -e 's/:.*$//'` | ||||
ac_item=`echo "$ac_spec" | sed -e 's/^.*://'` | ||||
case $ac_type in | ||||
header ) | ||||
ac_item=`echo "$ac_item" | sed 'y%./+-%__p_%'` | ||||
ac_var="ac_cv_header_$ac_item" | ||||
;; | ||||
file ) | ||||
ac_item=`echo "$ac_item" | sed 'y%./+-%__p_%'` | ||||
ac_var="ac_cv_file_$ac_item" | ||||
;; | ||||
func ) ac_var="ac_cv_func_$ac_item" ;; | ||||
struct ) ac_var="ac_cv_struct_$ac_item" ;; | ||||
define ) ac_var="ac_cv_define_$ac_item" ;; | ||||
custom ) ac_var="$ac_item" ;; | ||||
esac | ||||
eval "ac_val=\$$ac_var" | ||||
if test ".$ac_val" != .yes; then | ||||
ac_rc=no | ||||
break | ||||
fi | ||||
done | ||||
if test ".$ac_rc" = .yes; then | ||||
: | ||||
have_acquire_sem_etc="1" | ||||
else | ||||
: | ||||
have_acquire_sem_etc="0" | ||||
fi | ||||
# Some systems return ENOSYS from sem_open. | # Some systems return ENOSYS from sem_open. | |||
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for working sem_open" >&5 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for working sem_open" >&5 | |||
$as_echo_n "checking for working sem_open... " >&6; } | $as_echo_n "checking for working sem_open... " >&6; } | |||
if ${ac_cv_func_sem_open+:} false; then : | if ${ac_cv_func_sem_open+:} false; then : | |||
$as_echo_n "(cached) " >&6 | $as_echo_n "(cached) " >&6 | |||
else | else | |||
if test "$cross_compiling" = yes; then : | if test "$cross_compiling" = yes; then : | |||
ac_cv_func_sem_open=no | ac_cv_func_sem_open=no | |||
else | else | |||
skipping to change at line 24321 | skipping to change at line 24932 | |||
fi | fi | |||
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_define_PTHREAD_PROCESS_S HARED" >&5 | { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_define_PTHREAD_PROCESS_S HARED" >&5 | |||
$as_echo "$ac_cv_define_PTHREAD_PROCESS_SHARED" >&6; } | $as_echo "$ac_cv_define_PTHREAD_PROCESS_SHARED" >&6; } | |||
if test "$ac_cv_define_PTHREAD_PROCESS_SHARED" = "yes"; then | if test "$ac_cv_define_PTHREAD_PROCESS_SHARED" = "yes"; then | |||
$as_echo "#define HAVE_PTHREAD_PROCESS_SHARED 1" >>confdefs.h | $as_echo "#define HAVE_PTHREAD_PROCESS_SHARED 1" >>confdefs.h | |||
fi | fi | |||
for ac_func in pthread_mutexattr_setpshared | for ac_func in pthread_mutex_timedlock pthread_mutexattr_setpshared | |||
do : | do : | |||
ac_fn_c_check_func "$LINENO" "pthread_mutexattr_setpshared" "ac_cv_func_pthrea | as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh` | |||
d_mutexattr_setpshared" | ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var" | |||
if test "x$ac_cv_func_pthread_mutexattr_setpshared" = xyes; then : | if eval test \"x\$"$as_ac_var"\" = x"yes"; then : | |||
cat >>confdefs.h <<_ACEOF | cat >>confdefs.h <<_ACEOF | |||
#define HAVE_PTHREAD_MUTEXATTR_SETPSHARED 1 | #define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1 | |||
_ACEOF | _ACEOF | |||
fi | fi | |||
done | done | |||
ac_rc=yes | ||||
for ac_spec in header:pthread.h func:pthread_mutex_timedlock; do | ||||
ac_type=`echo "$ac_spec" | sed -e 's/:.*$//'` | ||||
ac_item=`echo "$ac_spec" | sed -e 's/^.*://'` | ||||
case $ac_type in | ||||
header ) | ||||
ac_item=`echo "$ac_item" | sed 'y%./+-%__p_%'` | ||||
ac_var="ac_cv_header_$ac_item" | ||||
;; | ||||
file ) | ||||
ac_item=`echo "$ac_item" | sed 'y%./+-%__p_%'` | ||||
ac_var="ac_cv_file_$ac_item" | ||||
;; | ||||
func ) ac_var="ac_cv_func_$ac_item" ;; | ||||
struct ) ac_var="ac_cv_struct_$ac_item" ;; | ||||
define ) ac_var="ac_cv_define_$ac_item" ;; | ||||
custom ) ac_var="$ac_item" ;; | ||||
esac | ||||
eval "ac_val=\$$ac_var" | ||||
if test ".$ac_val" != .yes; then | ||||
ac_rc=no | ||||
break | ||||
fi | ||||
done | ||||
if test ".$ac_rc" = .yes; then | ||||
: | ||||
have_pthread_mutex_timedlock="1" | ||||
else | ||||
: | ||||
have_pthread_mutex_timedlock="0" | ||||
fi | ||||
# Some systems have setpshared and define PROCESS_SHARED, but don't | # Some systems have setpshared and define PROCESS_SHARED, but don't | |||
# really support PROCESS_SHARED locks. So, we must validate that we | # really support PROCESS_SHARED locks. So, we must validate that we | |||
# can go through the steps without receiving some sort of system error. | # can go through the steps without receiving some sort of system error. | |||
# Linux and older versions of AIX have this problem. | # Linux and older versions of AIX have this problem. | |||
ac_rc=yes | ac_rc=yes | |||
for ac_spec in header:pthread.h define:PTHREAD_PROCESS_SHARED func:pthread_mutex attr_setpshared; do | for ac_spec in header:pthread.h define:PTHREAD_PROCESS_SHARED func:pthread_mutex attr_setpshared; do | |||
ac_type=`echo "$ac_spec" | sed -e 's/:.*$//'` | ac_type=`echo "$ac_spec" | sed -e 's/:.*$//'` | |||
ac_item=`echo "$ac_spec" | sed -e 's/^.*://'` | ac_item=`echo "$ac_spec" | sed -e 's/^.*://'` | |||
case $ac_type in | case $ac_type in | |||
header ) | header ) | |||
skipping to change at line 24445 | skipping to change at line 25089 | |||
int main(int argc, char **argv) | int main(int argc, char **argv) | |||
{ | { | |||
pthread_mutex_t mutex; | pthread_mutex_t mutex; | |||
pthread_mutexattr_t attr; | pthread_mutexattr_t attr; | |||
if (pthread_mutexattr_init(&attr)) | if (pthread_mutexattr_init(&attr)) | |||
exit(1); | exit(1); | |||
if (pthread_mutexattr_setpshared(&attr, PTHREAD_PROCESS_SHARED)) | if (pthread_mutexattr_setpshared(&attr, PTHREAD_PROCESS_SHARED)) | |||
exit(2); | exit(2); | |||
if (pthread_mutexattr_setrobust_np(&attr, PTHREAD_MUTEX_ROBUST_NP)) | if (pthread_mutexattr_setrobust(&attr, PTHREAD_MUTEX_ROBUST)) | |||
exit(3); | exit(3); | |||
if (pthread_mutexattr_setprotocol(&attr, PTHREAD_PRIO_INHERIT)) | if (pthread_mutexattr_setprotocol(&attr, PTHREAD_PRIO_INHERIT)) | |||
exit(4); | exit(4); | |||
if (pthread_mutex_init(&mutex, &attr)) | if (pthread_mutex_init(&mutex, &attr)) | |||
exit(5); | exit(5); | |||
if (pthread_mutexattr_destroy(&attr)) | if (pthread_mutexattr_destroy(&attr)) | |||
exit(6); | exit(6); | |||
if (pthread_mutex_destroy(&mutex)) | if (pthread_mutex_destroy(&mutex)) | |||
exit(7); | exit(7); | |||
exit(0); | exit(0); | |||
} | } | |||
_ACEOF | _ACEOF | |||
if ac_fn_c_try_run "$LINENO"; then : | if ac_fn_c_try_run "$LINENO"; then : | |||
apr_cv_mutex_robust_shared=yes | apr_cv_mutex_robust_shared=yes | |||
else | else | |||
if test "$cross_compiling" = yes; then : | ||||
{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 | ||||
$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} | ||||
as_fn_error $? "cannot run test program while cross compiling | ||||
See \`config.log' for more details" "$LINENO" 5; } | ||||
else | ||||
cat confdefs.h - <<_ACEOF >conftest.$ac_ext | ||||
/* end confdefs.h. */ | ||||
#include <sys/types.h> | ||||
#include <pthread.h> | ||||
#include <stdlib.h> | ||||
int main(int argc, char **argv) | ||||
{ | ||||
pthread_mutex_t mutex; | ||||
pthread_mutexattr_t attr; | ||||
if (pthread_mutexattr_init(&attr)) | ||||
exit(1); | ||||
if (pthread_mutexattr_setpshared(&attr, PTHREAD_PROCESS_SHARED)) | ||||
exit(2); | ||||
if (pthread_mutexattr_setrobust_np(&attr, PTHREAD_MUTEX_ROBUST_NP)) | ||||
exit(3); | ||||
if (pthread_mutexattr_setprotocol(&attr, PTHREAD_PRIO_INHERIT)) | ||||
exit(4); | ||||
if (pthread_mutex_init(&mutex, &attr)) | ||||
exit(5); | ||||
if (pthread_mutexattr_destroy(&attr)) | ||||
exit(6); | ||||
if (pthread_mutex_destroy(&mutex)) | ||||
exit(7); | ||||
exit(0); | ||||
} | ||||
_ACEOF | ||||
if ac_fn_c_try_run "$LINENO"; then : | ||||
apr_cv_mutex_robust_shared=np | ||||
else | ||||
apr_cv_mutex_robust_shared=no | apr_cv_mutex_robust_shared=no | |||
fi | fi | |||
rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ | rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ | |||
conftest.$ac_objext conftest.beam conftest.$ac_ext | conftest.$ac_objext conftest.beam conftest.$ac_ext | |||
fi | fi | |||
fi | fi | |||
rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ | ||||
conftest.$ac_objext conftest.beam conftest.$ac_ext | ||||
fi | ||||
fi | ||||
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $apr_cv_mutex_robust_shared" >& 5 | { $as_echo "$as_me:${as_lineno-$LINENO}: result: $apr_cv_mutex_robust_shared" >& 5 | |||
$as_echo "$apr_cv_mutex_robust_shared" >&6; } | $as_echo "$apr_cv_mutex_robust_shared" >&6; } | |||
if test "$apr_cv_mutex_robust_shared" = "yes"; then | if test "$apr_cv_mutex_robust_shared" = "yes"; then | |||
$as_echo "#define HAVE_PTHREAD_MUTEX_ROBUST 1" >>confdefs.h | $as_echo "#define HAVE_PTHREAD_MUTEX_ROBUST 1" >>confdefs.h | |||
elif test "$apr_cv_mutex_robust_shared" = "np"; then | ||||
$as_echo "#define HAVE_PTHREAD_MUTEX_ROBUST_NP 1" >>confdefs.h | ||||
fi | fi | |||
fi | fi | |||
fi | fi | |||
# See which lock mechanisms we can support on this system. | # See which lock mechanisms we can support on this system. | |||
ac_rc=yes | ac_rc=yes | |||
for ac_spec in header:semaphore.h func:sem_open func:sem_close func :sem_unlink func:sem_post func:sem_wait; do | for ac_spec in header:semaphore.h func:sem_open func:sem_close func :sem_unlink func:sem_post func:sem_wait; do | |||
ac_type=`echo "$ac_spec" | sed -e 's/:.*$//'` | ac_type=`echo "$ac_spec" | sed -e 's/:.*$//'` | |||
ac_item=`echo "$ac_spec" | sed -e 's/^.*://'` | ac_item=`echo "$ac_spec" | sed -e 's/^.*://'` | |||
skipping to change at line 24515 | skipping to change at line 25208 | |||
done | done | |||
if test ".$ac_rc" = .yes; then | if test ".$ac_rc" = .yes; then | |||
: | : | |||
hasposixser="1" | hasposixser="1" | |||
else | else | |||
: | : | |||
hasposixser="0" | hasposixser="0" | |||
fi | fi | |||
ac_rc=yes | ac_rc=yes | |||
for ac_spec in func:semget func:semctl define:SEM_UNDO; do | for ac_spec in func:semget func:semctl func:semop define:SEM_UNDO; do | |||
ac_type=`echo "$ac_spec" | sed -e 's/:.*$//'` | ac_type=`echo "$ac_spec" | sed -e 's/:.*$//'` | |||
ac_item=`echo "$ac_spec" | sed -e 's/^.*://'` | ac_item=`echo "$ac_spec" | sed -e 's/^.*://'` | |||
case $ac_type in | case $ac_type in | |||
header ) | header ) | |||
ac_item=`echo "$ac_item" | sed 'y%./+-%__p_%'` | ac_item=`echo "$ac_item" | sed 'y%./+-%__p_%'` | |||
ac_var="ac_cv_header_$ac_item" | ac_var="ac_cv_header_$ac_item" | |||
;; | ;; | |||
file ) | file ) | |||
ac_item=`echo "$ac_item" | sed 'y%./+-%__p_%'` | ac_item=`echo "$ac_item" | sed 'y%./+-%__p_%'` | |||
ac_var="ac_cv_file_$ac_item" | ac_var="ac_cv_file_$ac_item" | |||
skipping to change at line 24675 | skipping to change at line 25368 | |||
fi | fi | |||
done | done | |||
if test ".$ac_rc" = .yes; then | if test ".$ac_rc" = .yes; then | |||
: | : | |||
hasbeossem="1" | hasbeossem="1" | |||
else | else | |||
: | : | |||
hasbeossem="0" | hasbeossem="0" | |||
fi | fi | |||
for ac_func in pthread_condattr_setpshared | ||||
do : | ||||
ac_fn_c_check_func "$LINENO" "pthread_condattr_setpshared" "ac_cv_func_pthread | ||||
_condattr_setpshared" | ||||
if test "x$ac_cv_func_pthread_condattr_setpshared" = xyes; then : | ||||
cat >>confdefs.h <<_ACEOF | ||||
#define HAVE_PTHREAD_CONDATTR_SETPSHARED 1 | ||||
_ACEOF | ||||
fi | ||||
done | ||||
ac_rc=yes | ||||
for ac_spec in header:pthread.h func:pthread_condattr_setpshared; do | ||||
ac_type=`echo "$ac_spec" | sed -e 's/:.*$//'` | ||||
ac_item=`echo "$ac_spec" | sed -e 's/^.*://'` | ||||
case $ac_type in | ||||
header ) | ||||
ac_item=`echo "$ac_item" | sed 'y%./+-%__p_%'` | ||||
ac_var="ac_cv_header_$ac_item" | ||||
;; | ||||
file ) | ||||
ac_item=`echo "$ac_item" | sed 'y%./+-%__p_%'` | ||||
ac_var="ac_cv_file_$ac_item" | ||||
;; | ||||
func ) ac_var="ac_cv_func_$ac_item" ;; | ||||
struct ) ac_var="ac_cv_struct_$ac_item" ;; | ||||
define ) ac_var="ac_cv_define_$ac_item" ;; | ||||
custom ) ac_var="$ac_item" ;; | ||||
esac | ||||
eval "ac_val=\$$ac_var" | ||||
if test ".$ac_val" != .yes; then | ||||
ac_rc=no | ||||
break | ||||
fi | ||||
done | ||||
if test ".$ac_rc" = .yes; then | ||||
: | ||||
have_pthread_condattr_setpshared="1" | ||||
else | ||||
: | ||||
have_pthread_condattr_setpshared="0" | ||||
fi | ||||
# See which lock mechanism we'll select by default on this system. | # See which lock mechanism we'll select by default on this system. | |||
# The last APR_DECIDE to execute sets the default. | # The last APR_DECIDE to execute sets the default. | |||
# At this stage, we match the ordering in Apache 1.3 | # At this stage, we match the ordering in Apache 1.3 | |||
# which is (highest to lowest): sysvsem -> fcntl -> flock. | # which is (highest to lowest): sysvsem -> fcntl -> flock. | |||
# POSIX semaphores and cross-process pthread mutexes are not | # POSIX semaphores and cross-process pthread mutexes are not | |||
# used by default since they have less desirable behaviour when | # used by default since they have less desirable behaviour when | |||
# e.g. a process holding the mutex segfaults. | # e.g. a process holding the mutex segfaults. | |||
# The BEOSSEM decision doesn't require any substitutions but is | # The BEOSSEM decision doesn't require any substitutions but is | |||
# included here to prevent the fcntl() branch being selected | # included here to prevent the fcntl() branch being selected | |||
# from the decision making. | # from the decision making. | |||
skipping to change at line 24764 | skipping to change at line 25500 | |||
ac_decision_msg='SVR4-style fcntl()' | ac_decision_msg='SVR4-style fcntl()' | |||
ac_decision_USE_FCNTL_SERIALIZE=yes | ac_decision_USE_FCNTL_SERIALIZE=yes | |||
ac_decision_USE_FCNTL_SERIALIZE_msg='SVR4-style fcntl()' | ac_decision_USE_FCNTL_SERIALIZE_msg='SVR4-style fcntl()' | |||
else | else | |||
: | : | |||
fi | fi | |||
ac_rc=yes | ac_rc=yes | |||
for ac_spec in func:semget func:semctl define:SEM_UNDO; do | for ac_spec in func:semget func:semctl func:semop define:SEM_UNDO; do | |||
ac_type=`echo "$ac_spec" | sed -e 's/:.*$//'` | ac_type=`echo "$ac_spec" | sed -e 's/:.*$//'` | |||
ac_item=`echo "$ac_spec" | sed -e 's/^.*://'` | ac_item=`echo "$ac_spec" | sed -e 's/^.*://'` | |||
case $ac_type in | case $ac_type in | |||
header ) | header ) | |||
ac_item=`echo "$ac_item" | sed 'y%./+-%__p_%'` | ac_item=`echo "$ac_item" | sed 'y%./+-%__p_%'` | |||
ac_var="ac_cv_header_$ac_item" | ac_var="ac_cv_header_$ac_item" | |||
;; | ;; | |||
file ) | file ) | |||
ac_item=`echo "$ac_item" | sed 'y%./+-%__p_%'` | ac_item=`echo "$ac_item" | sed 'y%./+-%__p_%'` | |||
ac_var="ac_cv_file_$ac_item" | ac_var="ac_cv_file_$ac_item" | |||
skipping to change at line 24801 | skipping to change at line 25537 | |||
ac_decision_msg='SysV IPC semget()' | ac_decision_msg='SysV IPC semget()' | |||
ac_decision_USE_SYSVSEM_SERIALIZE=yes | ac_decision_USE_SYSVSEM_SERIALIZE=yes | |||
ac_decision_USE_SYSVSEM_SERIALIZE_msg='SysV IPC semget()' | ac_decision_USE_SYSVSEM_SERIALIZE_msg='SysV IPC semget()' | |||
else | else | |||
: | : | |||
fi | fi | |||
ac_rc=yes | ac_rc=yes | |||
for ac_spec in header:OS.h func:create_sem; do | for ac_spec in header:OS.h func:create_sem func:acquire_sem func:acquire_sem_etc ; do | |||
ac_type=`echo "$ac_spec" | sed -e 's/:.*$//'` | ac_type=`echo "$ac_spec" | sed -e 's/:.*$//'` | |||
ac_item=`echo "$ac_spec" | sed -e 's/^.*://'` | ac_item=`echo "$ac_spec" | sed -e 's/^.*://'` | |||
case $ac_type in | case $ac_type in | |||
header ) | header ) | |||
ac_item=`echo "$ac_item" | sed 'y%./+-%__p_%'` | ac_item=`echo "$ac_item" | sed 'y%./+-%__p_%'` | |||
ac_var="ac_cv_header_$ac_item" | ac_var="ac_cv_header_$ac_item" | |||
;; | ;; | |||
file ) | file ) | |||
ac_item=`echo "$ac_item" | sed 'y%./+-%__p_%'` | ac_item=`echo "$ac_item" | sed 'y%./+-%__p_%'` | |||
ac_var="ac_cv_file_$ac_item" | ac_var="ac_cv_file_$ac_item" | |||
skipping to change at line 24837 | skipping to change at line 25573 | |||
ac_decision='USE_BEOSSEM' | ac_decision='USE_BEOSSEM' | |||
ac_decision_msg='BeOS Semaphores' | ac_decision_msg='BeOS Semaphores' | |||
ac_decision_USE_BEOSSEM=yes | ac_decision_USE_BEOSSEM=yes | |||
ac_decision_USE_BEOSSEM_msg='BeOS Semaphores' | ac_decision_USE_BEOSSEM_msg='BeOS Semaphores' | |||
else | else | |||
: | : | |||
fi | fi | |||
# pthread mutex both pshared and robust[_np] is the best default | ||||
case "$apr_cv_mutex_robust_shared" in | ||||
"yes"|"np") | ||||
ac_decision='USE_PROC_PTHREAD_SERIALIZE' | ||||
ac_decision_msg='pthread pshared mutex' | ||||
ac_decision_USE_PROC_PTHREAD_SERIALIZE=yes | ||||
ac_decision_USE_PROC_PTHREAD_SERIALIZE_msg='pthread pshared mutex' | ||||
;; | ||||
*) | ||||
;; | ||||
esac | ||||
if test "x$apr_lock_method" != "x"; then | if test "x$apr_lock_method" != "x"; then | |||
ac_decision="$apr_lock_method" | ac_decision="$apr_lock_method" | |||
eval "ac_decision_msg=\"\$ac_decision_${ac_decision}_msg\"" | eval "ac_decision_msg=\"\$ac_decision_${ac_decision}_msg\"" | |||
fi | fi | |||
if test ".$ac_decision" = .; then | if test ".$ac_decision" = .; then | |||
echo "$0:Error: decision on $ac_decision_item failed" 1>&2 | echo "$0:Error: decision on $ac_decision_item failed" 1>&2 | |||
exit 1 | exit 1 | |||
else | else | |||
if test ".$ac_decision_msg" = .; then | if test ".$ac_decision_msg" = .; then | |||
skipping to change at line 25037 | skipping to change at line 25786 | |||
$as_echo "#define FLOCK_IS_GLOBAL 1" >>confdefs.h | $as_echo "#define FLOCK_IS_GLOBAL 1" >>confdefs.h | |||
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 | { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 | |||
$as_echo "yes" >&6; } | $as_echo "yes" >&6; } | |||
else | else | |||
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 | { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 | |||
$as_echo "no" >&6; } | $as_echo "no" >&6; } | |||
fi | fi | |||
for ac_header in sys/random.h | ||||
do : | ||||
ac_fn_c_check_header_mongrel "$LINENO" "sys/random.h" "ac_cv_header_sys_random | ||||
_h" "$ac_includes_default" | ||||
if test "x$ac_cv_header_sys_random_h" = xyes; then : | ||||
cat >>confdefs.h <<_ACEOF | ||||
#define HAVE_SYS_RANDOM_H 1 | ||||
_ACEOF | ||||
fi | ||||
done | ||||
for ac_func in getrandom | ||||
do : | ||||
ac_fn_c_check_func "$LINENO" "getrandom" "ac_cv_func_getrandom" | ||||
if test "x$ac_cv_func_getrandom" = xyes; then : | ||||
cat >>confdefs.h <<_ACEOF | ||||
#define HAVE_GETRANDOM 1 | ||||
_ACEOF | ||||
fi | ||||
done | ||||
for ac_header in sys/syscall.h | ||||
do : | ||||
ac_fn_c_check_header_mongrel "$LINENO" "sys/syscall.h" "ac_cv_header_sys_sysca | ||||
ll_h" "$ac_includes_default" | ||||
if test "x$ac_cv_header_sys_syscall_h" = xyes; then : | ||||
cat >>confdefs.h <<_ACEOF | ||||
#define HAVE_SYS_SYSCALL_H 1 | ||||
_ACEOF | ||||
fi | ||||
done | ||||
for ac_header in linux/random.h | ||||
do : | ||||
ac_fn_c_check_header_mongrel "$LINENO" "linux/random.h" "ac_cv_header_linux_ra | ||||
ndom_h" "$ac_includes_default" | ||||
if test "x$ac_cv_header_linux_random_h" = xyes; then : | ||||
cat >>confdefs.h <<_ACEOF | ||||
#define HAVE_LINUX_RANDOM_H 1 | ||||
_ACEOF | ||||
fi | ||||
done | ||||
ac_fn_c_check_decl "$LINENO" "SYS_getrandom" "ac_cv_have_decl_SYS_getrandom" "#i | ||||
nclude <sys/syscall.h> | ||||
" | ||||
if test "x$ac_cv_have_decl_SYS_getrandom" = xyes; then : | ||||
ac_have_decl=1 | ||||
else | ||||
ac_have_decl=0 | ||||
fi | ||||
cat >>confdefs.h <<_ACEOF | ||||
#define HAVE_DECL_SYS_GETRANDOM $ac_have_decl | ||||
_ACEOF | ||||
for ac_func in arc4random_buf | ||||
do : | ||||
ac_fn_c_check_func "$LINENO" "arc4random_buf" "ac_cv_func_arc4random_buf" | ||||
if test "x$ac_cv_func_arc4random_buf" = xyes; then : | ||||
cat >>confdefs.h <<_ACEOF | ||||
#define HAVE_ARC4RANDOM_BUF 1 | ||||
_ACEOF | ||||
fi | ||||
done | ||||
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for entropy source" >&5 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for entropy source" >&5 | |||
$as_echo_n "checking for entropy source... " >&6; } | $as_echo_n "checking for entropy source... " >&6; } | |||
why_no_rand="" | why_no_rand="" | |||
# Check whether --with-egd was given. | # Check whether --with-egd was given. | |||
if test "${with_egd+set}" = set; then : | if test "${with_egd+set}" = set; then : | |||
withval=$with_egd; | withval=$with_egd; | |||
$as_echo "#define HAVE_EGD 1" >>confdefs.h | $as_echo "#define HAVE_EGD 1" >>confdefs.h | |||
skipping to change at line 25066 | skipping to change at line 25885 | |||
_ACEOF | _ACEOF | |||
fi | fi | |||
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: EGD-compatible daemon" >&5 | { $as_echo "$as_me:${as_lineno-$LINENO}: result: EGD-compatible daemon" >&5 | |||
$as_echo "EGD-compatible daemon" >&6; } | $as_echo "EGD-compatible daemon" >&6; } | |||
rand="1" | rand="1" | |||
fi | fi | |||
if test "$rand" != "1"; then | if test "$rand" != "1"; then | |||
if test "$ac_cv_func_getrandom" = yes; then | ||||
rand="getrandom" | ||||
elif test "$ac_cv_have_decl_SYS_getrandom" = yes; then | ||||
rand="SYS_getrandom" | ||||
elif test "$ac_cv_func_arc4random_buf" = yes; then | ||||
rand="arc4random" | ||||
fi | ||||
fi | ||||
if test "$rand" != "1"; then | ||||
# Check whether --with-devrandom was given. | # Check whether --with-devrandom was given. | |||
if test "${with_devrandom+set}" = set; then : | if test "${with_devrandom+set}" = set; then : | |||
withval=$with_devrandom; apr_devrandom="$withval" | withval=$with_devrandom; apr_devrandom="$withval" | |||
else | else | |||
apr_devrandom="yes" | apr_devrandom="no" | |||
fi | fi | |||
if test "$apr_devrandom" = "no"; then | ||||
if test -z "$rand"; then | ||||
apr_devrandom="yes" | ||||
else | ||||
apr_devrandom="no" | ||||
fi | ||||
fi | ||||
if test "$apr_devrandom" = "yes"; then | if test "$apr_devrandom" = "yes"; then | |||
# /dev/random on OpenBSD doesn't provide random data, so | # /dev/random on OpenBSD doesn't provide random data, so | |||
# prefer /dev/arandom, which does; see random(4). | # prefer /dev/arandom, which does; see random(4). | |||
for f in /dev/arandom /dev/urandom /dev/random; do | for f in /dev/arandom /dev/urandom /dev/random; do | |||
if test -r $f; then | if test -r $f; then | |||
apr_devrandom=$f | apr_devrandom=$f | |||
rand=1 | rand="1" | |||
break | break | |||
fi | fi | |||
done | done | |||
elif test "$apr_devrandom" != "no"; then | elif test "$apr_devrandom" != "no"; then | |||
if test -r "$apr_devrandom"; then | if test -r "$apr_devrandom"; then | |||
rand="1" | rand="1" | |||
else | else | |||
as_fn_error $? "$apr_devrandom not found or unreadable." "$LINENO" 5 | as_fn_error $? "$apr_devrandom not found or unreadable." "$LINENO" 5 | |||
fi | fi | |||
fi | fi | |||
skipping to change at line 25111 | skipping to change at line 25948 | |||
fi | fi | |||
if test "$rand" = "1"; then | if test "$rand" = "1"; then | |||
cat >>confdefs.h <<_ACEOF | cat >>confdefs.h <<_ACEOF | |||
#define DEV_RANDOM "$apr_devrandom" | #define DEV_RANDOM "$apr_devrandom" | |||
_ACEOF | _ACEOF | |||
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $apr_devrandom" >&5 | { $as_echo "$as_me:${as_lineno-$LINENO}: result: $apr_devrandom" >&5 | |||
$as_echo "$apr_devrandom" >&6; } | $as_echo "$apr_devrandom" >&6; } | |||
elif test -n "$rand"; then | ||||
cat >>confdefs.h <<_ACEOF | ||||
#define SYS_RANDOM "$rand" | ||||
_ACEOF | ||||
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $rand" >&5 | ||||
$as_echo "$rand" >&6; } | ||||
rand="1" | ||||
fi | fi | |||
fi | fi | |||
if test "$rand" != "1"; then | if test "$rand" != "1"; then | |||
case $host in | case $host in | |||
# we have built in support for OS/2 | # we have built in support for OS/2 | |||
*-os2*) | *-os2*) | |||
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: Using OS/2 builtin random" >&5 | { $as_echo "$as_me:${as_lineno-$LINENO}: result: Using OS/2 builtin random" >&5 | |||
$as_echo "Using OS/2 builtin random" >&6; } | $as_echo "Using OS/2 builtin random" >&6; } | |||
rand="1" | rand="1" | |||
skipping to change at line 25793 | skipping to change at line 26639 | |||
int tmp = gethostbyname_r((const char *) 0, (struct hostent *) 0, | int tmp = gethostbyname_r((const char *) 0, (struct hostent *) 0, | |||
(char *) 0, 0, (struct hostent **) 0, &tmp); | (char *) 0, 0, (struct hostent **) 0, &tmp); | |||
/* use tmp to suppress the warning */ | /* use tmp to suppress the warning */ | |||
tmp=0; | tmp=0; | |||
return 0; } | return 0; } | |||
_ACEOF | _ACEOF | |||
if ac_fn_c_try_compile "$LINENO"; then : | if ac_fn_c_try_compile "$LINENO"; then : | |||
ac_cv_gethostbyname_r_style=glibc2 | CFLAGS=$apr_save_CFLAGS | |||
ac_cv_gethostbyname_r_style=glibc2 | ||||
else | else | |||
ac_cv_gethostbyname_r_style=none | CFLAGS=$apr_save_CFLAGS | |||
ac_cv_gethostbyname_r_style=none | ||||
fi | fi | |||
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext | rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext | |||
CFLAGS=$apr_save_CFLAGS | ||||
fi | fi | |||
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_gethostbyname_r_style" > &5 | { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_gethostbyname_r_style" > &5 | |||
$as_echo "$ac_cv_gethostbyname_r_style" >&6; } | $as_echo "$ac_cv_gethostbyname_r_style" >&6; } | |||
if test "$ac_cv_gethostbyname_r_style" = "glibc2"; then | if test "$ac_cv_gethostbyname_r_style" = "glibc2"; then | |||
$as_echo "#define GETHOSTBYNAME_R_GLIBC2 1" >>confdefs.h | $as_echo "#define GETHOSTBYNAME_R_GLIBC2 1" >>confdefs.h | |||
fi | fi | |||
skipping to change at line 25851 | skipping to change at line 26698 | |||
int tmp = gethostbyname_r((const char *) 0, (struct hostent *) 0, | int tmp = gethostbyname_r((const char *) 0, (struct hostent *) 0, | |||
(struct hostent_data *) 0); | (struct hostent_data *) 0); | |||
/* use tmp to suppress the warning */ | /* use tmp to suppress the warning */ | |||
tmp=0; | tmp=0; | |||
return 0; } | return 0; } | |||
_ACEOF | _ACEOF | |||
if ac_fn_c_try_compile "$LINENO"; then : | if ac_fn_c_try_compile "$LINENO"; then : | |||
ac_cv_gethostbyname_r_arg=hostent_data | CFLAGS=$apr_save_CFLAGS | |||
ac_cv_gethostbyname_r_arg=hostent_data | ||||
else | else | |||
ac_cv_gethostbyname_r_arg=char | CFLAGS=$apr_save_CFLAGS | |||
ac_cv_gethostbyname_r_arg=char | ||||
fi | fi | |||
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext | rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext | |||
CFLAGS=$apr_save_CFLAGS | ||||
fi | fi | |||
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_gethostbyname_r_arg" >&5 | { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_gethostbyname_r_arg" >&5 | |||
$as_echo "$ac_cv_gethostbyname_r_arg" >&6; } | $as_echo "$ac_cv_gethostbyname_r_arg" >&6; } | |||
if test "$ac_cv_gethostbyname_r_arg" = "hostent_data"; then | if test "$ac_cv_gethostbyname_r_arg" = "hostent_data"; then | |||
$as_echo "#define GETHOSTBYNAME_R_HOSTENT_DATA 1" >>confdefs.h | $as_echo "#define GETHOSTBYNAME_R_HOSTENT_DATA 1" >>confdefs.h | |||
fi | fi | |||
skipping to change at line 25916 | skipping to change at line 26764 | |||
int tmp = getservbyname_r((const char *) 0, (const char *) 0, | int tmp = getservbyname_r((const char *) 0, (const char *) 0, | |||
(struct servent *) 0, (char *) 0, 0, | (struct servent *) 0, (char *) 0, 0, | |||
(struct servent **) 0); | (struct servent **) 0); | |||
/* use tmp to suppress the warning */ | /* use tmp to suppress the warning */ | |||
tmp=0; | tmp=0; | |||
return 0; } | return 0; } | |||
_ACEOF | _ACEOF | |||
if ac_fn_c_try_compile "$LINENO"; then : | if ac_fn_c_try_compile "$LINENO"; then : | |||
ac_cv_getservbyname_r_style=glibc2 | CFLAGS=$apr_save_CFLAGS | |||
ac_cv_getservbyname_r_style=glibc2 | ||||
else | else | |||
ac_cv_getservbyname_r_style=none | CFLAGS=$apr_save_CFLAGS | |||
ac_cv_getservbyname_r_style=none | ||||
fi | fi | |||
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext | rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext | |||
CFLAGS=$apr_save_CFLAGS | ||||
if test "$ac_cv_getservbyname_r_style" = "none"; then | if test "$ac_cv_getservbyname_r_style" = "none"; then | |||
apr_save_CFLAGS=$CFLAGS | apr_save_CFLAGS=$CFLAGS | |||
CFLAGS="$CFLAGS $CFLAGS_WARN" | CFLAGS="$CFLAGS $CFLAGS_WARN" | |||
if test "$ac_cv_c_compiler_gnu" = "yes"; then | if test "$ac_cv_c_compiler_gnu" = "yes"; then | |||
CFLAGS="$CFLAGS -Werror" | CFLAGS="$CFLAGS -Werror" | |||
fi | fi | |||
cat confdefs.h - <<_ACEOF >conftest.$ac_ext | cat confdefs.h - <<_ACEOF >conftest.$ac_ext | |||
/* end confdefs.h. */ | /* end confdefs.h. */ | |||
#include "confdefs.h" | #include "confdefs.h" | |||
skipping to change at line 25960 | skipping to change at line 26809 | |||
struct servent *tmp = getservbyname_r((const char *) 0, (const char *) 0, | struct servent *tmp = getservbyname_r((const char *) 0, (const char *) 0, | |||
(struct servent *) 0, (char *) 0, 0); | (struct servent *) 0, (char *) 0, 0); | |||
/* use tmp to suppress the warning */ | /* use tmp to suppress the warning */ | |||
tmp=NULL; | tmp=NULL; | |||
return 0; } | return 0; } | |||
_ACEOF | _ACEOF | |||
if ac_fn_c_try_compile "$LINENO"; then : | if ac_fn_c_try_compile "$LINENO"; then : | |||
ac_cv_getservbyname_r_style=solaris | CFLAGS=$apr_save_CFLAGS | |||
ac_cv_getservbyname_r_style=solaris | ||||
else | else | |||
ac_cv_getservbyname_r_style=none | CFLAGS=$apr_save_CFLAGS | |||
ac_cv_getservbyname_r_style=none | ||||
fi | fi | |||
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext | rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext | |||
CFLAGS=$apr_save_CFLAGS | ||||
fi | fi | |||
if test "$ac_cv_getservbyname_r_style" = "none"; then | if test "$ac_cv_getservbyname_r_style" = "none"; then | |||
apr_save_CFLAGS=$CFLAGS | apr_save_CFLAGS=$CFLAGS | |||
CFLAGS="$CFLAGS $CFLAGS_WARN" | CFLAGS="$CFLAGS $CFLAGS_WARN" | |||
if test "$ac_cv_c_compiler_gnu" = "yes"; then | if test "$ac_cv_c_compiler_gnu" = "yes"; then | |||
CFLAGS="$CFLAGS -Werror" | CFLAGS="$CFLAGS -Werror" | |||
fi | fi | |||
cat confdefs.h - <<_ACEOF >conftest.$ac_ext | cat confdefs.h - <<_ACEOF >conftest.$ac_ext | |||
skipping to change at line 26006 | skipping to change at line 26856 | |||
int tmp = getservbyname_r((const char *) 0, (const char *) 0, | int tmp = getservbyname_r((const char *) 0, (const char *) 0, | |||
(struct servent *) 0, (struct servent_data *) 0); | (struct servent *) 0, (struct servent_data *) 0); | |||
/* use tmp to suppress the warning */ | /* use tmp to suppress the warning */ | |||
tmp=0; | tmp=0; | |||
return 0; } | return 0; } | |||
_ACEOF | _ACEOF | |||
if ac_fn_c_try_compile "$LINENO"; then : | if ac_fn_c_try_compile "$LINENO"; then : | |||
ac_cv_getservbyname_r_style=osf1 | CFLAGS=$apr_save_CFLAGS | |||
ac_cv_getservbyname_r_style=osf1 | ||||
else | else | |||
ac_cv_getservbyname_r_style=none | CFLAGS=$apr_save_CFLAGS | |||
ac_cv_getservbyname_r_style=none | ||||
fi | fi | |||
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext | rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext | |||
CFLAGS=$apr_save_CFLAGS | ||||
fi | fi | |||
fi | fi | |||
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_getservbyname_r_style" > &5 | { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_getservbyname_r_style" > &5 | |||
$as_echo "$ac_cv_getservbyname_r_style" >&6; } | $as_echo "$ac_cv_getservbyname_r_style" >&6; } | |||
if test "$ac_cv_getservbyname_r_style" = "glibc2"; then | if test "$ac_cv_getservbyname_r_style" = "glibc2"; then | |||
$as_echo "#define GETSERVBYNAME_R_GLIBC2 1" >>confdefs.h | $as_echo "#define GETSERVBYNAME_R_GLIBC2 1" >>confdefs.h | |||
skipping to change at line 26843 | skipping to change at line 27694 | |||
LIBS=$ac_func_search_save_LIBS | LIBS=$ac_func_search_save_LIBS | |||
fi | fi | |||
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_getnameinfo" >&5 | { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_getnameinfo" >&5 | |||
$as_echo "$ac_cv_search_getnameinfo" >&6; } | $as_echo "$ac_cv_search_getnameinfo" >&6; } | |||
ac_res=$ac_cv_search_getnameinfo | ac_res=$ac_cv_search_getnameinfo | |||
if test "$ac_res" != no; then : | if test "$ac_res" != no; then : | |||
test "$ac_res" = "none required" || LIBS="$ac_res $LIBS" | test "$ac_res" = "none required" || LIBS="$ac_res $LIBS" | |||
fi | fi | |||
for ac_func in gai_strerror | for ac_func in gai_strerror if_nametoindex if_indextoname | |||
do : | do : | |||
ac_fn_c_check_func "$LINENO" "gai_strerror" "ac_cv_func_gai_strerror" | as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh` | |||
if test "x$ac_cv_func_gai_strerror" = xyes; then : | ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var" | |||
if eval test \"x\$"$as_ac_var"\" = x"yes"; then : | ||||
cat >>confdefs.h <<_ACEOF | cat >>confdefs.h <<_ACEOF | |||
#define HAVE_GAI_STRERROR 1 | #define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1 | |||
_ACEOF | _ACEOF | |||
fi | fi | |||
done | done | |||
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for working getaddrinfo" >&5 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for working getaddrinfo" >&5 | |||
$as_echo_n "checking for working getaddrinfo... " >&6; } | $as_echo_n "checking for working getaddrinfo... " >&6; } | |||
if ${ac_cv_working_getaddrinfo+:} false; then : | if ${ac_cv_working_getaddrinfo+:} false; then : | |||
$as_echo_n "(cached) " >&6 | $as_echo_n "(cached) " >&6 | |||
else | else | |||
skipping to change at line 27269 | skipping to change at line 28121 | |||
else | else | |||
ipv6_result="no -- the platform has known problems supporting IPv6" | ipv6_result="no -- the platform has known problems supporting IPv6" | |||
fi | fi | |||
fi | fi | |||
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if APR supports IPv6" >&5 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking if APR supports IPv6" >&5 | |||
$as_echo_n "checking if APR supports IPv6... " >&6; } | $as_echo_n "checking if APR supports IPv6... " >&6; } | |||
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ipv6_result" >&5 | { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ipv6_result" >&5 | |||
$as_echo "$ipv6_result" >&6; } | $as_echo "$ipv6_result" >&6; } | |||
# Check whether --enable-timedlocks was given. | ||||
if test "${enable_timedlocks+set}" = set; then : | ||||
enableval=$enable_timedlocks; apr_has_timedlocks="0" | ||||
else | ||||
apr_has_timedlocks="1" | ||||
fi | ||||
# hstrerror is only needed if IPv6 is not enabled, | # hstrerror is only needed if IPv6 is not enabled, | |||
# so getaddrinfo/gai_strerror are not used. | # so getaddrinfo/gai_strerror are not used. | |||
if test $have_ipv6 = 0; then | if test $have_ipv6 = 0; then | |||
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing hstre rror" >&5 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing hstre rror" >&5 | |||
$as_echo_n "checking for library containing hstrerror... " >&6; } | $as_echo_n "checking for library containing hstrerror... " >&6; } | |||
if ${ac_cv_search_hstrerror+:} false; then : | if ${ac_cv_search_hstrerror+:} false; then : | |||
$as_echo_n "(cached) " >&6 | $as_echo_n "(cached) " >&6 | |||
else | else | |||
ac_func_search_save_LIBS=$LIBS | ac_func_search_save_LIBS=$LIBS | |||
cat confdefs.h - <<_ACEOF >conftest.$ac_ext | cat confdefs.h - <<_ACEOF >conftest.$ac_ext | |||
End of changes. 135 change blocks. | ||||
221 lines changed or deleted | 1102 lines changed or added |