[Python-checkins] python/dist/src configure,1.279.6.15,1.279.6.16 configure.in,1.288.6.15,1.288.6.16
loewis@users.sourceforge.net
loewis@users.sourceforge.net
Thu, 10 Oct 2002 08:26:50 -0700
Update of /cvsroot/python/python/dist/src
In directory usw-pr-cvs1:/tmp/cvs-serv28436
Modified Files:
Tag: release22-maint
configure configure.in
Log Message:
Expand AC_CHECK_SIZEOF inline to overcome a autoconf 2.13 weakness.
Fixes #620791.
Index: configure
===================================================================
RCS file: /cvsroot/python/python/dist/src/configure,v
retrieving revision 1.279.6.15
retrieving revision 1.279.6.16
diff -C2 -d -r1.279.6.15 -r1.279.6.16
*** configure 7 Oct 2002 11:57:02 -0000 1.279.6.15
--- configure 10 Oct 2002 15:26:41 -0000 1.279.6.16
***************
*** 1,5 ****
#! /bin/sh
! # From configure.in Revision: 1.288.6.14
# Guess values for system-dependent variables and create Makefiles.
--- 1,5 ----
#! /bin/sh
! # From configure.in Revision: 1.288.6.15
# Guess values for system-dependent variables and create Makefiles.
***************
*** 7013,7019 ****
if test "$wchar_h" = yes
then
! echo $ac_n "checking size of wchar_t""... $ac_c" 1>&6
echo "configure:7017: checking size of wchar_t" >&5
! if eval "test \"`echo '$''{'ac_cv_sizeof_wchar_t'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
--- 7013,7019 ----
if test "$wchar_h" = yes
then
! echo $ac_n "checking size of wchar_t""... $ac_c" 1>&6
echo "configure:7017: checking size of wchar_t" >&5
! if eval "test \"`echo '$''{'ac_cv_sizeof_wchar_t'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
***************
*** 7024,7037 ****
#line 7025 "configure"
#include "confdefs.h"
! #include <stdio.h>
! main()
! {
! FILE *f=fopen("conftestval", "w");
! if (!f) exit(1);
! fprintf(f, "%d\n", sizeof(wchar_t));
! exit(0);
! }
EOF
! if { (eval echo configure:7036: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
then
ac_cv_sizeof_wchar_t=`cat conftestval`
--- 7024,7039 ----
#line 7025 "configure"
#include "confdefs.h"
!
! #include <stdio.h>
! #include <wchar.h>
! main()
! {
! FILE *f=fopen("conftestval", "w");
! if (!f) exit(1);
! fprintf(f, "%d\n", sizeof(wchar_t));
! exit(0);
! }
EOF
! if { (eval echo configure:7038: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
then
ac_cv_sizeof_wchar_t=`cat conftestval`
***************
*** 7045,7059 ****
fi
fi
! echo "$ac_t""$ac_cv_sizeof_wchar_t" 1>&6
! cat >> confdefs.h <<EOF
#define SIZEOF_WCHAR_T $ac_cv_sizeof_wchar_t
EOF
-
fi
echo $ac_n "checking what type to use for unicode""... $ac_c" 1>&6
! echo "configure:7058: checking what type to use for unicode" >&5
# Check whether --enable-unicode or --disable-unicode was given.
if test "${enable_unicode+set}" = set; then
--- 7047,7062 ----
fi
+
fi
!
! echo "$ac_t""$ac_cv_sizeof_wchar_t" 1>&6
! cat >> confdefs.h <<EOF
#define SIZEOF_WCHAR_T $ac_cv_sizeof_wchar_t
EOF
fi
echo $ac_n "checking what type to use for unicode""... $ac_c" 1>&6
! echo "configure:7061: checking what type to use for unicode" >&5
# Check whether --enable-unicode or --disable-unicode was given.
if test "${enable_unicode+set}" = set; then
***************
*** 7130,7134 ****
# check for endianness
echo $ac_n "checking whether byte ordering is bigendian""... $ac_c" 1>&6
! echo "configure:7133: checking whether byte ordering is bigendian" >&5
if eval "test \"`echo '$''{'ac_cv_c_bigendian'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
--- 7133,7137 ----
# check for endianness
echo $ac_n "checking whether byte ordering is bigendian""... $ac_c" 1>&6
! echo "configure:7136: checking whether byte ordering is bigendian" >&5
if eval "test \"`echo '$''{'ac_cv_c_bigendian'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
***************
*** 7137,7141 ****
# See if sys/param.h defines the BYTE_ORDER macro.
cat > conftest.$ac_ext <<EOF
! #line 7140 "configure"
#include "confdefs.h"
#include <sys/types.h>
--- 7140,7144 ----
# See if sys/param.h defines the BYTE_ORDER macro.
cat > conftest.$ac_ext <<EOF
! #line 7143 "configure"
#include "confdefs.h"
#include <sys/types.h>
***************
*** 7148,7156 ****
; return 0; }
EOF
! if { (eval echo configure:7151: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
# It does; now see whether it defined to BIG_ENDIAN or not.
cat > conftest.$ac_ext <<EOF
! #line 7155 "configure"
#include "confdefs.h"
#include <sys/types.h>
--- 7151,7159 ----
; return 0; }
EOF
! if { (eval echo configure:7154: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
# It does; now see whether it defined to BIG_ENDIAN or not.
cat > conftest.$ac_ext <<EOF
! #line 7158 "configure"
#include "confdefs.h"
#include <sys/types.h>
***************
*** 7163,7167 ****
; return 0; }
EOF
! if { (eval echo configure:7166: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
ac_cv_c_bigendian=yes
--- 7166,7170 ----
; return 0; }
EOF
! if { (eval echo configure:7169: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
ac_cv_c_bigendian=yes
***************
*** 7183,7187 ****
else
cat > conftest.$ac_ext <<EOF
! #line 7186 "configure"
#include "confdefs.h"
main () {
--- 7186,7190 ----
else
cat > conftest.$ac_ext <<EOF
! #line 7189 "configure"
#include "confdefs.h"
main () {
***************
*** 7196,7200 ****
}
EOF
! if { (eval echo configure:7199: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
then
ac_cv_c_bigendian=no
--- 7199,7203 ----
}
EOF
! if { (eval echo configure:7202: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
then
ac_cv_c_bigendian=no
***************
*** 7223,7227 ****
# or fills with zeros (like the Cray J90, according to Tim Peters).
echo $ac_n "checking whether right shift extends the sign bit""... $ac_c" 1>&6
! echo "configure:7226: checking whether right shift extends the sign bit" >&5
if eval "test \"`echo '$''{'ac_cv_rshift_extends_sign'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
--- 7226,7230 ----
# or fills with zeros (like the Cray J90, according to Tim Peters).
echo $ac_n "checking whether right shift extends the sign bit""... $ac_c" 1>&6
! echo "configure:7229: checking whether right shift extends the sign bit" >&5
if eval "test \"`echo '$''{'ac_cv_rshift_extends_sign'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
***************
*** 7232,7236 ****
else
cat > conftest.$ac_ext <<EOF
! #line 7235 "configure"
#include "confdefs.h"
--- 7235,7239 ----
else
cat > conftest.$ac_ext <<EOF
! #line 7238 "configure"
#include "confdefs.h"
***************
*** 7241,7245 ****
EOF
! if { (eval echo configure:7244: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
then
ac_cv_rshift_extends_sign=yes
--- 7244,7248 ----
EOF
! if { (eval echo configure:7247: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
then
ac_cv_rshift_extends_sign=yes
***************
*** 7266,7270 ****
# check for getc_unlocked and related locking functions
echo $ac_n "checking for getc_unlocked() and friends""... $ac_c" 1>&6
! echo "configure:7269: checking for getc_unlocked() and friends" >&5
if eval "test \"`echo '$''{'ac_cv_have_getc_unlocked'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
--- 7269,7273 ----
# check for getc_unlocked and related locking functions
echo $ac_n "checking for getc_unlocked() and friends""... $ac_c" 1>&6
! echo "configure:7272: checking for getc_unlocked() and friends" >&5
if eval "test \"`echo '$''{'ac_cv_have_getc_unlocked'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
***************
*** 7272,7276 ****
cat > conftest.$ac_ext <<EOF
! #line 7275 "configure"
#include "confdefs.h"
#include <stdio.h>
--- 7275,7279 ----
cat > conftest.$ac_ext <<EOF
! #line 7278 "configure"
#include "confdefs.h"
#include <stdio.h>
***************
*** 7284,7288 ****
; return 0; }
EOF
! if { (eval echo configure:7287: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
ac_cv_have_getc_unlocked=yes
--- 7287,7291 ----
; return 0; }
EOF
! if { (eval echo configure:7290: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
ac_cv_have_getc_unlocked=yes
***************
*** 7307,7311 ****
# check for readline 4.0
echo $ac_n "checking for rl_pre_input_hook in -lreadline""... $ac_c" 1>&6
! echo "configure:7310: checking for rl_pre_input_hook in -lreadline" >&5
ac_lib_var=`echo readline'_'rl_pre_input_hook | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
--- 7310,7314 ----
# check for readline 4.0
echo $ac_n "checking for rl_pre_input_hook in -lreadline""... $ac_c" 1>&6
! echo "configure:7313: checking for rl_pre_input_hook in -lreadline" >&5
ac_lib_var=`echo readline'_'rl_pre_input_hook | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
***************
*** 7315,7319 ****
LIBS="-lreadline -ltermcap $LIBS"
cat > conftest.$ac_ext <<EOF
! #line 7318 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
--- 7318,7322 ----
LIBS="-lreadline -ltermcap $LIBS"
cat > conftest.$ac_ext <<EOF
! #line 7321 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
***************
*** 7326,7330 ****
; return 0; }
EOF
! if { (eval echo configure:7329: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
--- 7329,7333 ----
; return 0; }
EOF
! if { (eval echo configure:7332: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
***************
*** 7352,7356 ****
# check for readline 4.2
echo $ac_n "checking for rl_completion_matches in -lreadline""... $ac_c" 1>&6
! echo "configure:7355: checking for rl_completion_matches in -lreadline" >&5
ac_lib_var=`echo readline'_'rl_completion_matches | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
--- 7355,7359 ----
# check for readline 4.2
echo $ac_n "checking for rl_completion_matches in -lreadline""... $ac_c" 1>&6
! echo "configure:7358: checking for rl_completion_matches in -lreadline" >&5
ac_lib_var=`echo readline'_'rl_completion_matches | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
***************
*** 7360,7364 ****
LIBS="-lreadline -ltermcap $LIBS"
cat > conftest.$ac_ext <<EOF
! #line 7363 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
--- 7363,7367 ----
LIBS="-lreadline -ltermcap $LIBS"
cat > conftest.$ac_ext <<EOF
! #line 7366 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
***************
*** 7371,7375 ****
; return 0; }
EOF
! if { (eval echo configure:7374: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
--- 7374,7378 ----
; return 0; }
EOF
! if { (eval echo configure:7377: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
***************
*** 7396,7400 ****
echo $ac_n "checking for broken nice()""... $ac_c" 1>&6
! echo "configure:7399: checking for broken nice()" >&5
if eval "test \"`echo '$''{'ac_cv_broken_nice'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
--- 7399,7403 ----
echo $ac_n "checking for broken nice()""... $ac_c" 1>&6
! echo "configure:7402: checking for broken nice()" >&5
if eval "test \"`echo '$''{'ac_cv_broken_nice'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
***************
*** 7405,7409 ****
else
cat > conftest.$ac_ext <<EOF
! #line 7408 "configure"
#include "confdefs.h"
--- 7408,7412 ----
else
cat > conftest.$ac_ext <<EOF
! #line 7411 "configure"
#include "confdefs.h"
***************
*** 7417,7421 ****
EOF
! if { (eval echo configure:7420: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
then
ac_cv_broken_nice=yes
--- 7420,7424 ----
EOF
! if { (eval echo configure:7423: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
then
ac_cv_broken_nice=yes
***************
*** 7442,7451 ****
# On HP/UX 11.0, mvwdelch is a block with a return statement
echo $ac_n "checking whether mvwdelch is an expression""... $ac_c" 1>&6
! echo "configure:7445: checking whether mvwdelch is an expression" >&5
if eval "test \"`echo '$''{'ac_cv_mvwdelch_is_expression'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
! #line 7450 "configure"
#include "confdefs.h"
#include <curses.h>
--- 7445,7454 ----
# On HP/UX 11.0, mvwdelch is a block with a return statement
echo $ac_n "checking whether mvwdelch is an expression""... $ac_c" 1>&6
! echo "configure:7448: checking whether mvwdelch is an expression" >&5
if eval "test \"`echo '$''{'ac_cv_mvwdelch_is_expression'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
! #line 7453 "configure"
#include "confdefs.h"
#include <curses.h>
***************
*** 7457,7461 ****
; return 0; }
EOF
! if { (eval echo configure:7460: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
ac_cv_mvwdelch_is_expression=yes
--- 7460,7464 ----
; return 0; }
EOF
! if { (eval echo configure:7463: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
ac_cv_mvwdelch_is_expression=yes
***************
*** 7480,7489 ****
echo $ac_n "checking whether WINDOW has _flags""... $ac_c" 1>&6
! echo "configure:7483: checking whether WINDOW has _flags" >&5
if eval "test \"`echo '$''{'ac_cv_window_has_flags'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
! #line 7488 "configure"
#include "confdefs.h"
#include <curses.h>
--- 7483,7492 ----
echo $ac_n "checking whether WINDOW has _flags""... $ac_c" 1>&6
! echo "configure:7486: checking whether WINDOW has _flags" >&5
if eval "test \"`echo '$''{'ac_cv_window_has_flags'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
! #line 7491 "configure"
#include "confdefs.h"
#include <curses.h>
***************
*** 7495,7499 ****
; return 0; }
EOF
! if { (eval echo configure:7498: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
ac_cv_window_has_flags=yes
--- 7498,7502 ----
; return 0; }
EOF
! if { (eval echo configure:7501: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
ac_cv_window_has_flags=yes
***************
*** 7526,7535 ****
EOF
echo $ac_n "checking for socklen_t""... $ac_c" 1>&6
! echo "configure:7529: checking for socklen_t" >&5
if eval "test \"`echo '$''{'ac_cv_type_socklen_t'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
! #line 7534 "configure"
#include "confdefs.h"
#include <sys/types.h>
--- 7529,7538 ----
EOF
echo $ac_n "checking for socklen_t""... $ac_c" 1>&6
! echo "configure:7532: checking for socklen_t" >&5
if eval "test \"`echo '$''{'ac_cv_type_socklen_t'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
! #line 7537 "configure"
#include "confdefs.h"
#include <sys/types.h>
***************
*** 7587,7591 ****
SRCDIRS="Parser Grammar Objects Python Modules"
echo $ac_n "checking for build directories""... $ac_c" 1>&6
! echo "configure:7590: checking for build directories" >&5
for dir in $SRCDIRS; do
if test ! -d $dir; then
--- 7590,7594 ----
SRCDIRS="Parser Grammar Objects Python Modules"
echo $ac_n "checking for build directories""... $ac_c" 1>&6
! echo "configure:7593: checking for build directories" >&5
for dir in $SRCDIRS; do
if test ! -d $dir; then
Index: configure.in
===================================================================
RCS file: /cvsroot/python/python/dist/src/configure.in,v
retrieving revision 1.288.6.15
retrieving revision 1.288.6.16
diff -C2 -d -r1.288.6.15 -r1.288.6.16
*** configure.in 7 Oct 2002 11:57:04 -0000 1.288.6.15
--- configure.in 10 Oct 2002 15:26:46 -0000 1.288.6.16
***************
*** 1907,1911 ****
if test "$wchar_h" = yes
then
! AC_CHECK_SIZEOF(wchar_t, 4, [#include <wchar.h>])
fi
--- 1907,1931 ----
if test "$wchar_h" = yes
then
! dnl autoconf 2.13 fails to automatically include additional headers
! dnl Therefore, we expand
! dnl AC_CHECK_SIZEOF(wchar_t, 4, [#include <wchar.h>])
! dnl inline
! AC_MSG_CHECKING(size of wchar_t)
! AC_CACHE_VAL(ac_cv_sizeof_wchar_t,
! [AC_TRY_RUN([
! #include <stdio.h>
! #include <wchar.h>
! main()
! {
! FILE *f=fopen("conftestval", "w");
! if (!f) exit(1);
! fprintf(f, "%d\n", sizeof(wchar_t));
! exit(0);
! }], ac_cv_sizeof_wchar_t=`cat conftestval`,
! ac_cv_sizeof_wchar_t=0,
! ac_cv_sizeof_wchar_t=4)
! ])
! AC_MSG_RESULT($ac_cv_sizeof_wchar_t)
! AC_DEFINE_UNQUOTED(SIZEOF_WCHAR_T,$ac_cv_sizeof_wchar_t)
fi