Python

Merge lp:~barry/python/sovers into lp:python/py3k

  1. sovers
  2. Merge into py3k
Proposed by Barry Warsaw
Status: Merged
Merge reported by: Barry Warsaw
Merged at revision: not available
Proposed branch: lp:~barry/python/sovers
Merge into: lp:python/py3k
Diff against target: 1886 lines (+438/-341)
6 files modified
Lib/distutils/tests/test_build_ext.py (+3/-4)
Makefile.pre.in (+6/-0)
Python/dynload_shlib.c (+13/-6)
configure (+352/-298)
configure.in (+63/-32)
pyconfig.h.in (+1/-1)
To merge this branch: bzr merge lp:~barry/python/sovers
Reviewer Review Type Date Requested Status
Adil Ishaq (community) cookies Needs Fixing
Python Development Pending
Review via email: mp+29411@code.launchpad.net

Description of the change

Adds ./configure --with-so-abi-tag to set the .so tag for importing and distutils extension building.

To post a comment you must log in.
lp:~barry/python/sovers updated
41938. By Barry Warsaw

Modify the search order so that $SOABI.so is searched first.

41939. By Barry Warsaw

The distutils changes aren't necessary for strict PEP 3149 support. When PEP
384 is implemented, it might... or might not.

41940. By Barry Warsaw

trunk merge

41941. By Barry Warsaw

trunk merge

41942. By Barry Warsaw

Fix compilation of dynload_shlib.c to reflect new cflags variables.

41943. By Barry Warsaw

trunk merge

41944. By Barry Warsaw

mergtopolis

41945. By Barry Warsaw

Trunk merge.

41946. By Barry Warsaw

trunk merge

41947. By Barry Warsaw

trunk merge

41948. By Barry Warsaw

branch merge

41949. By Barry Warsaw

trunk merge

Revision history for this message
Adil Ishaq (iradvisor) wrote :

Hope to kill germs from my devices also Fix issues from my email, gmail for Identity Crisis.

@Adilishaq

review: Needs Fixing (cookies)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'Lib/distutils/tests/test_build_ext.py'
--- Lib/distutils/tests/test_build_ext.py 2010-07-22 11:50:05 +0000
+++ Lib/distutils/tests/test_build_ext.py 2010-09-03 17:02:41 +0000
@@ -323,8 +323,8 @@
323 finally:323 finally:
324 os.chdir(old_wd)324 os.chdir(old_wd)
325 self.assertTrue(os.path.exists(so_file))325 self.assertTrue(os.path.exists(so_file))
326 self.assertEquals(os.path.splitext(so_file)[-1],326 so_ext = sysconfig.get_config_var('SO')
327 sysconfig.get_config_var('SO'))327 self.assertTrue(so_file.endswith(so_ext))
328 so_dir = os.path.dirname(so_file)328 so_dir = os.path.dirname(so_file)
329 self.assertEquals(so_dir, other_tmp_dir)329 self.assertEquals(so_dir, other_tmp_dir)
330330
@@ -333,8 +333,7 @@
333 cmd.run()333 cmd.run()
334 so_file = cmd.get_outputs()[0]334 so_file = cmd.get_outputs()[0]
335 self.assertTrue(os.path.exists(so_file))335 self.assertTrue(os.path.exists(so_file))
336 self.assertEquals(os.path.splitext(so_file)[-1],336 self.assertTrue(so_file.endswith(so_ext))
337 sysconfig.get_config_var('SO'))
338 so_dir = os.path.dirname(so_file)337 so_dir = os.path.dirname(so_file)
339 self.assertEquals(so_dir, cmd.build_lib)338 self.assertEquals(so_dir, cmd.build_lib)
340339
341340
=== modified file 'Makefile.pre.in'
--- Makefile.pre.in 2010-08-15 14:47:25 +0000
+++ Makefile.pre.in 2010-09-03 17:02:41 +0000
@@ -35,6 +35,7 @@
35AR= @AR@35AR= @AR@
36RANLIB= @RANLIB@36RANLIB= @RANLIB@
37SVNVERSION= @SVNVERSION@37SVNVERSION= @SVNVERSION@
38SOABI= @SOABI@
3839
39GNULD= @GNULD@40GNULD= @GNULD@
4041
@@ -559,6 +560,11 @@
559Modules/python.o: $(srcdir)/Modules/python.c560Modules/python.o: $(srcdir)/Modules/python.c
560 $(MAINCC) -c $(PY_CORE_CFLAGS) -o $@ $(srcdir)/Modules/python.c561 $(MAINCC) -c $(PY_CORE_CFLAGS) -o $@ $(srcdir)/Modules/python.c
561562
563Python/dynload_shlib.o: $(srcdir)/Python/dynload_shlib.c Makefile
564 $(CC) -c $(PY_CORE_CFLAGS) \
565 -DSOABI='"$(SOABI)"' \
566 -o $@ $(srcdir)/Python/dynload_shlib.c
567
562$(IO_OBJS): $(IO_H)568$(IO_OBJS): $(IO_H)
563569
564# Use a stamp file to prevent make -j invoking pgen twice570# Use a stamp file to prevent make -j invoking pgen twice
565571
=== modified file 'Python/dynload_shlib.c'
--- Python/dynload_shlib.c 2010-05-09 14:52:27 +0000
+++ Python/dynload_shlib.c 2010-09-03 17:02:41 +0000
@@ -30,27 +30,34 @@
30#define LEAD_UNDERSCORE ""30#define LEAD_UNDERSCORE ""
31#endif31#endif
3232
33/* The .so extension module ABI tag, supplied by the Makefile via
34 Makefile.pre.in and configure. This is used to discriminate between
35 incompatible .so files so that extensions for different Python builds can
36 live in the same directory. E.g. foomodule.cpython-32.so
37*/
3338
34const struct filedescr _PyImport_DynLoadFiletab[] = {39const struct filedescr _PyImport_DynLoadFiletab[] = {
35#ifdef __CYGWIN__40#ifdef __CYGWIN__
36 {".dll", "rb", C_EXTENSION},41 {".dll", "rb", C_EXTENSION},
37 {"module.dll", "rb", C_EXTENSION},42 {"module.dll", "rb", C_EXTENSION},
38#else43#else /* !__CYGWIN__ */
39#if defined(PYOS_OS2) && defined(PYCC_GCC)44#if defined(PYOS_OS2) && defined(PYCC_GCC)
40 {".pyd", "rb", C_EXTENSION},45 {".pyd", "rb", C_EXTENSION},
41 {".dll", "rb", C_EXTENSION},46 {".dll", "rb", C_EXTENSION},
42#else47#else /* !(defined(PYOS_OS2) && defined(PYCC_GCC)) */
43#ifdef __VMS48#ifdef __VMS
44 {".exe", "rb", C_EXTENSION},49 {".exe", "rb", C_EXTENSION},
45 {".EXE", "rb", C_EXTENSION},50 {".EXE", "rb", C_EXTENSION},
46 {"module.exe", "rb", C_EXTENSION},51 {"module.exe", "rb", C_EXTENSION},
47 {"MODULE.EXE", "rb", C_EXTENSION},52 {"MODULE.EXE", "rb", C_EXTENSION},
48#else53#else /* !__VMS */
54 {"." SOABI ".so", "rb", C_EXTENSION},
49 {".so", "rb", C_EXTENSION},55 {".so", "rb", C_EXTENSION},
56 {"module." SOABI ".so", "rb", C_EXTENSION},
50 {"module.so", "rb", C_EXTENSION},57 {"module.so", "rb", C_EXTENSION},
51#endif58#endif /* __VMS */
52#endif59#endif /* defined(PYOS_OS2) && defined(PYCC_GCC) */
53#endif60#endif /* __CYGWIN__ */
54 {0, 0}61 {0, 0}
55};62};
5663
5764
=== modified file 'configure'
--- configure 2010-08-31 19:51:07 +0000
+++ configure 2010-09-03 17:02:41 +0000
@@ -1,14 +1,14 @@
1#! /bin/sh1#! /bin/sh
2# From configure.in Revision: 83986 .2# From configure.in Revision: 83986 .
3# Guess values for system-dependent variables and create Makefiles.3# Guess values for system-dependent variables and create Makefiles.
4# Generated by GNU Autoconf 2.65 for python 3.2.4# Generated by GNU Autoconf 2.67 for python 3.2.
5#5#
6# Report bugs to <http://bugs.python.org/>.6# Report bugs to <http://bugs.python.org/>.
7#7#
8#8#
9# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,9# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
10# 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation,10# 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 Free Software
11# Inc.11# Foundation, Inc.
12#12#
13#13#
14# This configure script is free software; the Free Software Foundation14# This configure script is free software; the Free Software Foundation
@@ -320,7 +320,7 @@
320 test -d "$as_dir" && break320 test -d "$as_dir" && break
321 done321 done
322 test -z "$as_dirs" || eval "mkdir $as_dirs"322 test -z "$as_dirs" || eval "mkdir $as_dirs"
323 } || test -d "$as_dir" || as_fn_error "cannot create directory $as_dir"323 } || test -d "$as_dir" || as_fn_error $? "cannot create directory $as_dir"
324324
325325
326} # as_fn_mkdir_p326} # as_fn_mkdir_p
@@ -360,19 +360,19 @@
360fi # as_fn_arith360fi # as_fn_arith
361361
362362
363# as_fn_error ERROR [LINENO LOG_FD]363# as_fn_error STATUS ERROR [LINENO LOG_FD]
364# ---------------------------------364# ----------------------------------------
365# Output "`basename $0`: error: ERROR" to stderr. If LINENO and LOG_FD are365# Output "`basename $0`: error: ERROR" to stderr. If LINENO and LOG_FD are
366# provided, also output the error to LOG_FD, referencing LINENO. Then exit the366# provided, also output the error to LOG_FD, referencing LINENO. Then exit the
367# script with status $?, using 1 if that was 0.367# script with STATUS, using 1 if that was 0.
368as_fn_error ()368as_fn_error ()
369{369{
370 as_status=$?; test $as_status -eq 0 && as_status=1370 as_status=$1; test $as_status -eq 0 && as_status=1
371 if test "$3"; then371 if test "$4"; then
372 as_lineno=${as_lineno-"$2"} as_lineno_stack=as_lineno_stack=$as_lineno_stack372 as_lineno=${as_lineno-"$3"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
373 $as_echo "$as_me:${as_lineno-$LINENO}: error: $1" >&$3373 $as_echo "$as_me:${as_lineno-$LINENO}: error: $2" >&$4
374 fi374 fi
375 $as_echo "$as_me: error: $1" >&2375 $as_echo "$as_me: error: $2" >&2
376 as_fn_exit $as_status376 as_fn_exit $as_status
377} # as_fn_error377} # as_fn_error
378378
@@ -534,7 +534,7 @@
534exec 6>&1534exec 6>&1
535535
536# Name of the host.536# Name of the host.
537# hostname on some systems (SVR3.2, Linux) returns a bogus exit status,537# hostname on some systems (SVR3.2, old GNU/Linux) returns a bogus exit status,
538# so uname gets run too.538# so uname gets run too.
539ac_hostname=`(hostname || uname -n) 2>/dev/null | sed 1q`539ac_hostname=`(hostname || uname -n) 2>/dev/null | sed 1q`
540540
@@ -598,6 +598,7 @@
598ac_subst_vars='LTLIBOBJS598ac_subst_vars='LTLIBOBJS
599SRCDIRS599SRCDIRS
600THREADHEADERS600THREADHEADERS
601SOABI
601LIBC602LIBC
602LIBM603LIBM
603HAVE_GETHOSTBYNAME604HAVE_GETHOSTBYNAME
@@ -825,8 +826,9 @@
825 fi826 fi
826827
827 case $ac_option in828 case $ac_option in
828 *=*) ac_optarg=`expr "X$ac_option" : '[^=]*=\(.*\)'` ;;829 *=?*) ac_optarg=`expr "X$ac_option" : '[^=]*=\(.*\)'` ;;
829 *) ac_optarg=yes ;;830 *=) ac_optarg= ;;
831 *) ac_optarg=yes ;;
830 esac832 esac
831833
832 # Accept the important Cygnus configure options, so we can diagnose typos.834 # Accept the important Cygnus configure options, so we can diagnose typos.
@@ -871,7 +873,7 @@
871 ac_useropt=`expr "x$ac_option" : 'x-*disable-\(.*\)'`873 ac_useropt=`expr "x$ac_option" : 'x-*disable-\(.*\)'`
872 # Reject names that are not valid shell variable names.874 # Reject names that are not valid shell variable names.
873 expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&875 expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
874 as_fn_error "invalid feature name: $ac_useropt"876 as_fn_error $? "invalid feature name: $ac_useropt"
875 ac_useropt_orig=$ac_useropt877 ac_useropt_orig=$ac_useropt
876 ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`878 ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
877 case $ac_user_opts in879 case $ac_user_opts in
@@ -897,7 +899,7 @@
897 ac_useropt=`expr "x$ac_option" : 'x-*enable-\([^=]*\)'`899 ac_useropt=`expr "x$ac_option" : 'x-*enable-\([^=]*\)'`
898 # Reject names that are not valid shell variable names.900 # Reject names that are not valid shell variable names.
899 expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&901 expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
900 as_fn_error "invalid feature name: $ac_useropt"902 as_fn_error $? "invalid feature name: $ac_useropt"
901 ac_useropt_orig=$ac_useropt903 ac_useropt_orig=$ac_useropt
902 ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`904 ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
903 case $ac_user_opts in905 case $ac_user_opts in
@@ -1101,7 +1103,7 @@
1101 ac_useropt=`expr "x$ac_option" : 'x-*with-\([^=]*\)'`1103 ac_useropt=`expr "x$ac_option" : 'x-*with-\([^=]*\)'`
1102 # Reject names that are not valid shell variable names.1104 # Reject names that are not valid shell variable names.
1103 expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&1105 expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
1104 as_fn_error "invalid package name: $ac_useropt"1106 as_fn_error $? "invalid package name: $ac_useropt"
1105 ac_useropt_orig=$ac_useropt1107 ac_useropt_orig=$ac_useropt
1106 ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`1108 ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
1107 case $ac_user_opts in1109 case $ac_user_opts in
@@ -1117,7 +1119,7 @@
1117 ac_useropt=`expr "x$ac_option" : 'x-*without-\(.*\)'`1119 ac_useropt=`expr "x$ac_option" : 'x-*without-\(.*\)'`
1118 # Reject names that are not valid shell variable names.1120 # Reject names that are not valid shell variable names.
1119 expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&1121 expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
1120 as_fn_error "invalid package name: $ac_useropt"1122 as_fn_error $? "invalid package name: $ac_useropt"
1121 ac_useropt_orig=$ac_useropt1123 ac_useropt_orig=$ac_useropt
1122 ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`1124 ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
1123 case $ac_user_opts in1125 case $ac_user_opts in
@@ -1147,8 +1149,8 @@
1147 | --x-librar=* | --x-libra=* | --x-libr=* | --x-lib=* | --x-li=* | --x-l=*)1149 | --x-librar=* | --x-libra=* | --x-libr=* | --x-lib=* | --x-li=* | --x-l=*)
1148 x_libraries=$ac_optarg ;;1150 x_libraries=$ac_optarg ;;
11491151
1150 -*) as_fn_error "unrecognized option: \`$ac_option'1152 -*) as_fn_error $? "unrecognized option: \`$ac_option'
1151Try \`$0 --help' for more information."1153Try \`$0 --help' for more information"
1152 ;;1154 ;;
11531155
1154 *=*)1156 *=*)
@@ -1156,7 +1158,7 @@
1156 # Reject names that are not valid shell variable names.1158 # Reject names that are not valid shell variable names.
1157 case $ac_envvar in #(1159 case $ac_envvar in #(
1158 '' | [0-9]* | *[!_$as_cr_alnum]* )1160 '' | [0-9]* | *[!_$as_cr_alnum]* )
1159 as_fn_error "invalid variable name: \`$ac_envvar'" ;;1161 as_fn_error $? "invalid variable name: \`$ac_envvar'" ;;
1160 esac1162 esac
1161 eval $ac_envvar=\$ac_optarg1163 eval $ac_envvar=\$ac_optarg
1162 export $ac_envvar ;;1164 export $ac_envvar ;;
@@ -1174,13 +1176,13 @@
11741176
1175if test -n "$ac_prev"; then1177if test -n "$ac_prev"; then
1176 ac_option=--`echo $ac_prev | sed 's/_/-/g'`1178 ac_option=--`echo $ac_prev | sed 's/_/-/g'`
1177 as_fn_error "missing argument to $ac_option"1179 as_fn_error $? "missing argument to $ac_option"
1178fi1180fi
11791181
1180if test -n "$ac_unrecognized_opts"; then1182if test -n "$ac_unrecognized_opts"; then
1181 case $enable_option_checking in1183 case $enable_option_checking in
1182 no) ;;1184 no) ;;
1183 fatal) as_fn_error "unrecognized options: $ac_unrecognized_opts" ;;1185 fatal) as_fn_error $? "unrecognized options: $ac_unrecognized_opts" ;;
1184 *) $as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2 ;;1186 *) $as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2 ;;
1185 esac1187 esac
1186fi1188fi
@@ -1203,7 +1205,7 @@
1203 [\\/$]* | ?:[\\/]* ) continue;;1205 [\\/$]* | ?:[\\/]* ) continue;;
1204 NONE | '' ) case $ac_var in *prefix ) continue;; esac;;1206 NONE | '' ) case $ac_var in *prefix ) continue;; esac;;
1205 esac1207 esac
1206 as_fn_error "expected an absolute directory name for --$ac_var: $ac_val"1208 as_fn_error $? "expected an absolute directory name for --$ac_var: $ac_val"
1207done1209done
12081210
1209# There might be people who depend on the old broken behavior: `$host'1211# There might be people who depend on the old broken behavior: `$host'
@@ -1217,8 +1219,8 @@
1217if test "x$host_alias" != x; then1219if test "x$host_alias" != x; then
1218 if test "x$build_alias" = x; then1220 if test "x$build_alias" = x; then
1219 cross_compiling=maybe1221 cross_compiling=maybe
1220 $as_echo "$as_me: WARNING: If you wanted to set the --build type, don't use --host.1222 $as_echo "$as_me: WARNING: if you wanted to set the --build type, don't use --host.
1221 If a cross compiler is detected then cross compile mode will be used." >&21223 If a cross compiler is detected then cross compile mode will be used" >&2
1222 elif test "x$build_alias" != "x$host_alias"; then1224 elif test "x$build_alias" != "x$host_alias"; then
1223 cross_compiling=yes1225 cross_compiling=yes
1224 fi1226 fi
@@ -1233,9 +1235,9 @@
1233ac_pwd=`pwd` && test -n "$ac_pwd" &&1235ac_pwd=`pwd` && test -n "$ac_pwd" &&
1234ac_ls_di=`ls -di .` &&1236ac_ls_di=`ls -di .` &&
1235ac_pwd_ls_di=`cd "$ac_pwd" && ls -di .` ||1237ac_pwd_ls_di=`cd "$ac_pwd" && ls -di .` ||
1236 as_fn_error "working directory cannot be determined"1238 as_fn_error $? "working directory cannot be determined"
1237test "X$ac_ls_di" = "X$ac_pwd_ls_di" ||1239test "X$ac_ls_di" = "X$ac_pwd_ls_di" ||
1238 as_fn_error "pwd does not report name of working directory"1240 as_fn_error $? "pwd does not report name of working directory"
12391241
12401242
1241# Find the source files, if location was not specified.1243# Find the source files, if location was not specified.
@@ -1274,11 +1276,11 @@
1274fi1276fi
1275if test ! -r "$srcdir/$ac_unique_file"; then1277if test ! -r "$srcdir/$ac_unique_file"; then
1276 test "$ac_srcdir_defaulted" = yes && srcdir="$ac_confdir or .."1278 test "$ac_srcdir_defaulted" = yes && srcdir="$ac_confdir or .."
1277 as_fn_error "cannot find sources ($ac_unique_file) in $srcdir"1279 as_fn_error $? "cannot find sources ($ac_unique_file) in $srcdir"
1278fi1280fi
1279ac_msg="sources are in $srcdir, but \`cd $srcdir' does not work"1281ac_msg="sources are in $srcdir, but \`cd $srcdir' does not work"
1280ac_abs_confdir=`(1282ac_abs_confdir=`(
1281 cd "$srcdir" && test -r "./$ac_unique_file" || as_fn_error "$ac_msg"1283 cd "$srcdir" && test -r "./$ac_unique_file" || as_fn_error $? "$ac_msg"
1282 pwd)`1284 pwd)`
1283# When building in place, set srcdir=.1285# When building in place, set srcdir=.
1284if test "$ac_abs_confdir" = "$ac_pwd"; then1286if test "$ac_abs_confdir" = "$ac_pwd"; then
@@ -1318,7 +1320,7 @@
1318 --help=short display options specific to this package1320 --help=short display options specific to this package
1319 --help=recursive display the short help of all the included packages1321 --help=recursive display the short help of all the included packages
1320 -V, --version display version information and exit1322 -V, --version display version information and exit
1321 -q, --quiet, --silent do not print \`checking...' messages1323 -q, --quiet, --silent do not print \`checking ...' messages
1322 --cache-file=FILE cache test results in FILE [disabled]1324 --cache-file=FILE cache test results in FILE [disabled]
1323 -C, --config-cache alias for \`--cache-file=config.cache'1325 -C, --config-cache alias for \`--cache-file=config.cache'
1324 -n, --no-create do not create output files1326 -n, --no-create do not create output files
@@ -1503,9 +1505,9 @@
1503if $ac_init_version; then1505if $ac_init_version; then
1504 cat <<\_ACEOF1506 cat <<\_ACEOF
1505python configure 3.21507python configure 3.2
1506generated by GNU Autoconf 2.651508generated by GNU Autoconf 2.67
15071509
1508Copyright (C) 2009 Free Software Foundation, Inc.1510Copyright (C) 2010 Free Software Foundation, Inc.
1509This configure script is free software; the Free Software Foundation1511This configure script is free software; the Free Software Foundation
1510gives unlimited permission to copy, distribute and modify it.1512gives unlimited permission to copy, distribute and modify it.
1511_ACEOF1513_ACEOF
@@ -1575,7 +1577,7 @@
1575 mv -f conftest.er1 conftest.err1577 mv -f conftest.er1 conftest.err
1576 fi1578 fi
1577 $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&51579 $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
1578 test $ac_status = 0; } >/dev/null && {1580 test $ac_status = 0; } > conftest.i && {
1579 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||1581 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
1580 test ! -s conftest.err1582 test ! -s conftest.err
1581 }; then :1583 }; then :
@@ -1599,10 +1601,10 @@
1599ac_fn_c_check_header_mongrel ()1601ac_fn_c_check_header_mongrel ()
1600{1602{
1601 as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack1603 as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
1602 if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then :1604 if eval "test \"\${$3+set}\"" = set; then :
1603 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&51605 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
1604$as_echo_n "checking for $2... " >&6; }1606$as_echo_n "checking for $2... " >&6; }
1605if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then :1607if eval "test \"\${$3+set}\"" = set; then :
1606 $as_echo_n "(cached) " >&61608 $as_echo_n "(cached) " >&6
1607fi1609fi
1608eval ac_res=\$$31610eval ac_res=\$$3
@@ -1638,7 +1640,7 @@
1638else1640else
1639 ac_header_preproc=no1641 ac_header_preproc=no
1640fi1642fi
1641rm -f conftest.err conftest.$ac_ext1643rm -f conftest.err conftest.i conftest.$ac_ext
1642{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_header_preproc" >&51644{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_header_preproc" >&5
1643$as_echo "$ac_header_preproc" >&6; }1645$as_echo "$ac_header_preproc" >&6; }
16441646
@@ -1661,17 +1663,15 @@
1661$as_echo "$as_me: WARNING: $2: section \"Present But Cannot Be Compiled\"" >&2;}1663$as_echo "$as_me: WARNING: $2: section \"Present But Cannot Be Compiled\"" >&2;}
1662 { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: proceeding with the compiler's result" >&51664 { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: proceeding with the compiler's result" >&5
1663$as_echo "$as_me: WARNING: $2: proceeding with the compiler's result" >&2;}1665$as_echo "$as_me: WARNING: $2: proceeding with the compiler's result" >&2;}
1664( cat <<\_ASBOX1666( $as_echo "## -------------------------------------- ##
1665## -------------------------------------- ##
1666## Report this to http://bugs.python.org/ ##1667## Report this to http://bugs.python.org/ ##
1667## -------------------------------------- ##1668## -------------------------------------- ##"
1668_ASBOX
1669 ) | sed "s/^/$as_me: WARNING: /" >&21669 ) | sed "s/^/$as_me: WARNING: /" >&2
1670 ;;1670 ;;
1671esac1671esac
1672 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&51672 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
1673$as_echo_n "checking for $2... " >&6; }1673$as_echo_n "checking for $2... " >&6; }
1674if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then :1674if eval "test \"\${$3+set}\"" = set; then :
1675 $as_echo_n "(cached) " >&61675 $as_echo_n "(cached) " >&6
1676else1676else
1677 eval "$3=\$ac_header_compiler"1677 eval "$3=\$ac_header_compiler"
@@ -1735,7 +1735,7 @@
1735 as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack1735 as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
1736 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&51736 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
1737$as_echo_n "checking for $2... " >&6; }1737$as_echo_n "checking for $2... " >&6; }
1738if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then :1738if eval "test \"\${$3+set}\"" = set; then :
1739 $as_echo_n "(cached) " >&61739 $as_echo_n "(cached) " >&6
1740else1740else
1741 cat confdefs.h - <<_ACEOF >conftest.$ac_ext1741 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -1812,7 +1812,7 @@
1812 as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack1812 as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
1813 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&51813 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
1814$as_echo_n "checking for $2... " >&6; }1814$as_echo_n "checking for $2... " >&6; }
1815if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then :1815if eval "test \"\${$3+set}\"" = set; then :
1816 $as_echo_n "(cached) " >&61816 $as_echo_n "(cached) " >&6
1817else1817else
1818 eval "$3=no"1818 eval "$3=no"
@@ -1866,7 +1866,7 @@
1866 as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack1866 as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
1867 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for uint$2_t" >&51867 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for uint$2_t" >&5
1868$as_echo_n "checking for uint$2_t... " >&6; }1868$as_echo_n "checking for uint$2_t... " >&6; }
1869if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then :1869if eval "test \"\${$3+set}\"" = set; then :
1870 $as_echo_n "(cached) " >&61870 $as_echo_n "(cached) " >&6
1871else1871else
1872 eval "$3=no"1872 eval "$3=no"
@@ -1896,8 +1896,7 @@
1896esac1896esac
1897fi1897fi
1898rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext1898rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
1899 eval as_val=\$$31899 if eval test \"x\$"$3"\" = x"no"; then :
1900 if test "x$as_val" = x""no; then :
19011900
1902else1901else
1903 break1902 break
@@ -1920,7 +1919,7 @@
1920 as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack1919 as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
1921 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for int$2_t" >&51920 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for int$2_t" >&5
1922$as_echo_n "checking for int$2_t... " >&6; }1921$as_echo_n "checking for int$2_t... " >&6; }
1923if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then :1922if eval "test \"\${$3+set}\"" = set; then :
1924 $as_echo_n "(cached) " >&61923 $as_echo_n "(cached) " >&6
1925else1924else
1926 eval "$3=no"1925 eval "$3=no"
@@ -1971,8 +1970,7 @@
1971rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext1970rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
1972fi1971fi
1973rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext1972rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
1974 eval as_val=\$$31973 if eval test \"x\$"$3"\" = x"no"; then :
1975 if test "x$as_val" = x""no; then :
19761974
1977else1975else
1978 break1976 break
@@ -2172,7 +2170,7 @@
2172 as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack2170 as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
2173 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&52171 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
2174$as_echo_n "checking for $2... " >&6; }2172$as_echo_n "checking for $2... " >&6; }
2175if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then :2173if eval "test \"\${$3+set}\"" = set; then :
2176 $as_echo_n "(cached) " >&62174 $as_echo_n "(cached) " >&6
2177else2175else
2178 cat confdefs.h - <<_ACEOF >conftest.$ac_ext2176 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -2240,7 +2238,7 @@
2240 as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack2238 as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
2241 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2.$3" >&52239 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2.$3" >&5
2242$as_echo_n "checking for $2.$3... " >&6; }2240$as_echo_n "checking for $2.$3... " >&6; }
2243if { as_var=$4; eval "test \"\${$as_var+set}\" = set"; }; then :2241if eval "test \"\${$4+set}\"" = set; then :
2244 $as_echo_n "(cached) " >&62242 $as_echo_n "(cached) " >&6
2245else2243else
2246 cat confdefs.h - <<_ACEOF >conftest.$ac_ext2244 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -2288,15 +2286,18 @@
22882286
2289} # ac_fn_c_check_member2287} # ac_fn_c_check_member
22902288
2291# ac_fn_c_check_decl LINENO SYMBOL VAR2289# ac_fn_c_check_decl LINENO SYMBOL VAR INCLUDES
2292# ------------------------------------2290# ---------------------------------------------
2293# Tests whether SYMBOL is declared, setting cache variable VAR accordingly.2291# Tests whether SYMBOL is declared in INCLUDES, setting cache variable VAR
2292# accordingly.
2294ac_fn_c_check_decl ()2293ac_fn_c_check_decl ()
2295{2294{
2296 as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack2295 as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
2297 { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $2 is declared" >&52296 as_decl_name=`echo $2|sed 's/ *(.*//'`
2298$as_echo_n "checking whether $2 is declared... " >&6; }2297 as_decl_use=`echo $2|sed -e 's/(/((/' -e 's/)/) 0&/' -e 's/,/) 0& (/g'`
2299if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then :2298 { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $as_decl_name is declared" >&5
2299$as_echo_n "checking whether $as_decl_name is declared... " >&6; }
2300if eval "test \"\${$3+set}\"" = set; then :
2300 $as_echo_n "(cached) " >&62301 $as_echo_n "(cached) " >&6
2301else2302else
2302 cat confdefs.h - <<_ACEOF >conftest.$ac_ext2303 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -2305,8 +2306,12 @@
2305int2306int
2306main ()2307main ()
2307{2308{
2308#ifndef $22309#ifndef $as_decl_name
2309 (void) $2;2310#ifdef __cplusplus
2311 (void) $as_decl_use;
2312#else
2313 (void) $as_decl_name;
2314#endif
2310#endif2315#endif
23112316
2312 ;2317 ;
@@ -2331,7 +2336,7 @@
2331running configure, to aid debugging if configure makes a mistake.2336running configure, to aid debugging if configure makes a mistake.
23322337
2333It was created by python $as_me 3.2, which was2338It was created by python $as_me 3.2, which was
2334generated by GNU Autoconf 2.65. Invocation command line was2339generated by GNU Autoconf 2.67. Invocation command line was
23352340
2336 $ $0 $@2341 $ $0 $@
23372342
@@ -2441,11 +2446,9 @@
2441 {2446 {
2442 echo2447 echo
24432448
2444 cat <<\_ASBOX2449 $as_echo "## ---------------- ##
2445## ---------------- ##
2446## Cache variables. ##2450## Cache variables. ##
2447## ---------------- ##2451## ---------------- ##"
2448_ASBOX
2449 echo2452 echo
2450 # The following way of writing the cache mishandles newlines in values,2453 # The following way of writing the cache mishandles newlines in values,
2451(2454(
@@ -2479,11 +2482,9 @@
2479)2482)
2480 echo2483 echo
24812484
2482 cat <<\_ASBOX2485 $as_echo "## ----------------- ##
2483## ----------------- ##
2484## Output variables. ##2486## Output variables. ##
2485## ----------------- ##2487## ----------------- ##"
2486_ASBOX
2487 echo2488 echo
2488 for ac_var in $ac_subst_vars2489 for ac_var in $ac_subst_vars
2489 do2490 do
@@ -2496,11 +2497,9 @@
2496 echo2497 echo
24972498
2498 if test -n "$ac_subst_files"; then2499 if test -n "$ac_subst_files"; then
2499 cat <<\_ASBOX2500 $as_echo "## ------------------- ##
2500## ------------------- ##
2501## File substitutions. ##2501## File substitutions. ##
2502## ------------------- ##2502## ------------------- ##"
2503_ASBOX
2504 echo2503 echo
2505 for ac_var in $ac_subst_files2504 for ac_var in $ac_subst_files
2506 do2505 do
@@ -2514,11 +2513,9 @@
2514 fi2513 fi
25152514
2516 if test -s confdefs.h; then2515 if test -s confdefs.h; then
2517 cat <<\_ASBOX2516 $as_echo "## ----------- ##
2518## ----------- ##
2519## confdefs.h. ##2517## confdefs.h. ##
2520## ----------- ##2518## ----------- ##"
2521_ASBOX
2522 echo2519 echo
2523 cat confdefs.h2520 cat confdefs.h
2524 echo2521 echo
@@ -2573,7 +2570,12 @@
2573ac_site_file1=NONE2570ac_site_file1=NONE
2574ac_site_file2=NONE2571ac_site_file2=NONE
2575if test -n "$CONFIG_SITE"; then2572if test -n "$CONFIG_SITE"; then
2576 ac_site_file1=$CONFIG_SITE2573 # We do not want a PATH search for config.site.
2574 case $CONFIG_SITE in #((
2575 -*) ac_site_file1=./$CONFIG_SITE;;
2576 */*) ac_site_file1=$CONFIG_SITE;;
2577 *) ac_site_file1=./$CONFIG_SITE;;
2578 esac
2577elif test "x$prefix" != xNONE; then2579elif test "x$prefix" != xNONE; then
2578 ac_site_file1=$prefix/share/config.site2580 ac_site_file1=$prefix/share/config.site
2579 ac_site_file2=$prefix/etc/config.site2581 ac_site_file2=$prefix/etc/config.site
@@ -2588,7 +2590,11 @@
2588 { $as_echo "$as_me:${as_lineno-$LINENO}: loading site script $ac_site_file" >&52590 { $as_echo "$as_me:${as_lineno-$LINENO}: loading site script $ac_site_file" >&5
2589$as_echo "$as_me: loading site script $ac_site_file" >&6;}2591$as_echo "$as_me: loading site script $ac_site_file" >&6;}
2590 sed 's/^/| /' "$ac_site_file" >&52592 sed 's/^/| /' "$ac_site_file" >&5
2591 . "$ac_site_file"2593 . "$ac_site_file" \
2594 || { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
2595$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
2596as_fn_error $? "failed to load site script $ac_site_file
2597See \`config.log' for more details" "$LINENO" 5 ; }
2592 fi2598 fi
2593done2599done
25942600
@@ -2664,7 +2670,7 @@
2664$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}2670$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
2665 { $as_echo "$as_me:${as_lineno-$LINENO}: error: changes in the environment can compromise the build" >&52671 { $as_echo "$as_me:${as_lineno-$LINENO}: error: changes in the environment can compromise the build" >&5
2666$as_echo "$as_me: error: changes in the environment can compromise the build" >&2;}2672$as_echo "$as_me: error: changes in the environment can compromise the build" >&2;}
2667 as_fn_error "run \`make distclean' and/or \`rm $cache_file' and start over" "$LINENO" 52673 as_fn_error $? "run \`make distclean' and/or \`rm $cache_file' and start over" "$LINENO" 5
2668fi2674fi
2669## -------------------- ##2675## -------------------- ##
2670## Main body of script. ##2676## Main body of script. ##
@@ -2698,6 +2704,7 @@
26982704
2699VERSION=3.22705VERSION=3.2
27002706
2707# Version number or Python's own shared library file.
27012708
2702SOVERSION=1.02709SOVERSION=1.0
27032710
@@ -2764,7 +2771,7 @@
2764 UNIVERSALSDK=$enableval2771 UNIVERSALSDK=$enableval
2765 if test ! -d "${UNIVERSALSDK}"2772 if test ! -d "${UNIVERSALSDK}"
2766 then2773 then
2767 as_fn_error "--enable-universalsdk specifies non-existing SDK: ${UNIVERSALSDK}" "$LINENO" 52774 as_fn_error $? "--enable-universalsdk specifies non-existing SDK: ${UNIVERSALSDK}" "$LINENO" 5
2768 fi2775 fi
2769 ;;2776 ;;
2770 esac2777 esac
@@ -3156,7 +3163,7 @@
3156# If the user switches compilers, we can't believe the cache3163# If the user switches compilers, we can't believe the cache
3157if test ! -z "$ac_cv_prog_CC" -a ! -z "$CC" -a "$CC" != "$ac_cv_prog_CC"3164if test ! -z "$ac_cv_prog_CC" -a ! -z "$CC" -a "$CC" != "$ac_cv_prog_CC"
3158then3165then
3159 as_fn_error "cached CC is different -- throw away $cache_file3166 as_fn_error $? "cached CC is different -- throw away $cache_file
3160(it is also a good idea to do 'make clean' before compiling)" "$LINENO" 53167(it is also a good idea to do 'make clean' before compiling)" "$LINENO" 5
3161fi3168fi
31623169
@@ -3466,8 +3473,8 @@
34663473
3467test -z "$CC" && { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&53474test -z "$CC" && { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
3468$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}3475$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
3469as_fn_error "no acceptable C compiler found in \$PATH3476as_fn_error $? "no acceptable C compiler found in \$PATH
3470See \`config.log' for more details." "$LINENO" 5; }3477See \`config.log' for more details" "$LINENO" 5 ; }
34713478
3472# Provide some information about the compiler.3479# Provide some information about the compiler.
3473$as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler version" >&53480$as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler version" >&5
@@ -3581,9 +3588,8 @@
35813588
3582{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&53589{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
3583$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}3590$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
3584{ as_fn_set_status 773591as_fn_error 77 "C compiler cannot create executables
3585as_fn_error "C compiler cannot create executables3592See \`config.log' for more details" "$LINENO" 5 ; }
3586See \`config.log' for more details." "$LINENO" 5; }; }
3587else3593else
3588 { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&53594 { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
3589$as_echo "yes" >&6; }3595$as_echo "yes" >&6; }
@@ -3625,8 +3631,8 @@
3625else3631else
3626 { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&53632 { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
3627$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}3633$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
3628as_fn_error "cannot compute suffix of executables: cannot compile and link3634as_fn_error $? "cannot compute suffix of executables: cannot compile and link
3629See \`config.log' for more details." "$LINENO" 5; }3635See \`config.log' for more details" "$LINENO" 5 ; }
3630fi3636fi
3631rm -f conftest conftest$ac_cv_exeext3637rm -f conftest conftest$ac_cv_exeext
3632{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_exeext" >&53638{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_exeext" >&5
@@ -3683,9 +3689,9 @@
3683 else3689 else
3684 { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&53690 { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
3685$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}3691$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
3686as_fn_error "cannot run C compiled programs.3692as_fn_error $? "cannot run C compiled programs.
3687If you meant to cross compile, use \`--host'.3693If you meant to cross compile, use \`--host'.
3688See \`config.log' for more details." "$LINENO" 5; }3694See \`config.log' for more details" "$LINENO" 5 ; }
3689 fi3695 fi
3690 fi3696 fi
3691fi3697fi
@@ -3736,8 +3742,8 @@
37363742
3737{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&53743{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
3738$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}3744$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
3739as_fn_error "cannot compute suffix of object files: cannot compile3745as_fn_error $? "cannot compute suffix of object files: cannot compile
3740See \`config.log' for more details." "$LINENO" 5; }3746See \`config.log' for more details" "$LINENO" 5 ; }
3741fi3747fi
3742rm -f conftest.$ac_cv_objext conftest.$ac_ext3748rm -f conftest.$ac_cv_objext conftest.$ac_ext
3743fi3749fi
@@ -4190,7 +4196,7 @@
4190 # Broken: fails on valid input.4196 # Broken: fails on valid input.
4191continue4197continue
4192fi4198fi
4193rm -f conftest.err conftest.$ac_ext4199rm -f conftest.err conftest.i conftest.$ac_ext
41944200
4195 # OK, works on sane cases. Now check whether nonexistent headers4201 # OK, works on sane cases. Now check whether nonexistent headers
4196 # can be detected and how.4202 # can be detected and how.
@@ -4206,11 +4212,11 @@
4206ac_preproc_ok=:4212ac_preproc_ok=:
4207break4213break
4208fi4214fi
4209rm -f conftest.err conftest.$ac_ext4215rm -f conftest.err conftest.i conftest.$ac_ext
42104216
4211done4217done
4212# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.4218# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
4213rm -f conftest.err conftest.$ac_ext4219rm -f conftest.i conftest.err conftest.$ac_ext
4214if $ac_preproc_ok; then :4220if $ac_preproc_ok; then :
4215 break4221 break
4216fi4222fi
@@ -4249,7 +4255,7 @@
4249 # Broken: fails on valid input.4255 # Broken: fails on valid input.
4250continue4256continue
4251fi4257fi
4252rm -f conftest.err conftest.$ac_ext4258rm -f conftest.err conftest.i conftest.$ac_ext
42534259
4254 # OK, works on sane cases. Now check whether nonexistent headers4260 # OK, works on sane cases. Now check whether nonexistent headers
4255 # can be detected and how.4261 # can be detected and how.
@@ -4265,18 +4271,18 @@
4265ac_preproc_ok=:4271ac_preproc_ok=:
4266break4272break
4267fi4273fi
4268rm -f conftest.err conftest.$ac_ext4274rm -f conftest.err conftest.i conftest.$ac_ext
42694275
4270done4276done
4271# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.4277# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
4272rm -f conftest.err conftest.$ac_ext4278rm -f conftest.i conftest.err conftest.$ac_ext
4273if $ac_preproc_ok; then :4279if $ac_preproc_ok; then :
42744280
4275else4281else
4276 { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&54282 { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
4277$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}4283$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
4278as_fn_error "C preprocessor \"$CPP\" fails sanity check4284as_fn_error $? "C preprocessor \"$CPP\" fails sanity check
4279See \`config.log' for more details." "$LINENO" 5; }4285See \`config.log' for more details" "$LINENO" 5 ; }
4280fi4286fi
42814287
4282ac_ext=c4288ac_ext=c
@@ -4337,7 +4343,7 @@
4337 done4343 done
4338IFS=$as_save_IFS4344IFS=$as_save_IFS
4339 if test -z "$ac_cv_path_GREP"; then4345 if test -z "$ac_cv_path_GREP"; then
4340 as_fn_error "no acceptable grep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 54346 as_fn_error $? "no acceptable grep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5
4341 fi4347 fi
4342else4348else
4343 ac_cv_path_GREP=$GREP4349 ac_cv_path_GREP=$GREP
@@ -4403,7 +4409,7 @@
4403 done4409 done
4404IFS=$as_save_IFS4410IFS=$as_save_IFS
4405 if test -z "$ac_cv_path_EGREP"; then4411 if test -z "$ac_cv_path_EGREP"; then
4406 as_fn_error "no acceptable egrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 54412 as_fn_error $? "no acceptable egrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5
4407 fi4413 fi
4408else4414else
4409 ac_cv_path_EGREP=$EGREP4415 ac_cv_path_EGREP=$EGREP
@@ -4535,8 +4541,7 @@
4535 as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`4541 as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
4536ac_fn_c_check_header_compile "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default4542ac_fn_c_check_header_compile "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default
4537"4543"
4538eval as_val=\$$as_ac_Header4544if eval test \"x\$"$as_ac_Header"\" = x"yes"; then :
4539 if test "x$as_val" = x""yes; then :
4540 cat >>confdefs.h <<_ACEOF4545 cat >>confdefs.h <<_ACEOF
4541#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 14546#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
4542_ACEOF4547_ACEOF
@@ -5140,16 +5145,22 @@
5140esac5145esac
5141ac_aux_dir=5146ac_aux_dir=
5142for ac_dir in "$srcdir" "$srcdir/.." "$srcdir/../.."; do5147for ac_dir in "$srcdir" "$srcdir/.." "$srcdir/../.."; do
5143 for ac_t in install-sh install.sh shtool; do5148 if test -f "$ac_dir/install-sh"; then
5144 if test -f "$ac_dir/$ac_t"; then5149 ac_aux_dir=$ac_dir
5145 ac_aux_dir=$ac_dir5150 ac_install_sh="$ac_aux_dir/install-sh -c"
5146 ac_install_sh="$ac_aux_dir/$ac_t -c"5151 break
5147 break 25152 elif test -f "$ac_dir/install.sh"; then
5148 fi5153 ac_aux_dir=$ac_dir
5149 done5154 ac_install_sh="$ac_aux_dir/install.sh -c"
5155 break
5156 elif test -f "$ac_dir/shtool"; then
5157 ac_aux_dir=$ac_dir
5158 ac_install_sh="$ac_aux_dir/shtool install -c"
5159 break
5160 fi
5150done5161done
5151if test -z "$ac_aux_dir"; then5162if test -z "$ac_aux_dir"; then
5152 as_fn_error "cannot find install-sh, install.sh, or shtool in \"$srcdir\" \"$srcdir/..\" \"$srcdir/../..\"" "$LINENO" 55163 as_fn_error $? "cannot find install-sh, install.sh, or shtool in \"$srcdir\" \"$srcdir/..\" \"$srcdir/../..\"" "$LINENO" 5
5153fi5164fi
51545165
5155# These three variables are undocumented and unsupported,5166# These three variables are undocumented and unsupported,
@@ -5264,6 +5275,9 @@
5264 esac5275 esac
5265fi5276fi
52665277
5278# For calculating the .so ABI tag.
5279SOABI_QUALIFIERS=""
5280
5267# Check for --with-pydebug5281# Check for --with-pydebug
5268{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for --with-pydebug" >&55282{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for --with-pydebug" >&5
5269$as_echo_n "checking for --with-pydebug... " >&6; }5283$as_echo_n "checking for --with-pydebug... " >&6; }
@@ -5279,6 +5293,7 @@
5279 { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&55293 { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
5280$as_echo "yes" >&6; };5294$as_echo "yes" >&6; };
5281 Py_DEBUG='true'5295 Py_DEBUG='true'
5296 SOABI_QUALIFIERS="${SOABI_QUALIFIERS}d"
5282else { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&55297else { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
5283$as_echo "no" >&6; }; Py_DEBUG='false'5298$as_echo "no" >&6; }; Py_DEBUG='false'
5284fi5299fi
@@ -5482,7 +5497,7 @@
5482 ARCH_RUN_32BIT="/usr/bin/arch -i386 -ppc"5497 ARCH_RUN_32BIT="/usr/bin/arch -i386 -ppc"
54835498
5484 else5499 else
5485 as_fn_error "proper usage is --with-universal-arch=32-bit|64-bit|all|intel|3-way" "$LINENO" 55500 as_fn_error $? "proper usage is --with-universal-arch=32-bit|64-bit|all|intel|3-way" "$LINENO" 5
54865501
5487 fi5502 fi
54885503
@@ -6059,8 +6074,7 @@
6059do :6074do :
6060 as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`6075 as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
6061ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default"6076ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default"
6062eval as_val=\$$as_ac_Header6077if eval test \"x\$"$as_ac_Header"\" = x"yes"; then :
6063 if test "x$as_val" = x""yes; then :
6064 cat >>confdefs.h <<_ACEOF6078 cat >>confdefs.h <<_ACEOF
6065#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 16079#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
6066_ACEOF6080_ACEOF
@@ -6074,7 +6088,7 @@
6074 as_ac_Header=`$as_echo "ac_cv_header_dirent_$ac_hdr" | $as_tr_sh`6088 as_ac_Header=`$as_echo "ac_cv_header_dirent_$ac_hdr" | $as_tr_sh`
6075{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_hdr that defines DIR" >&56089{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_hdr that defines DIR" >&5
6076$as_echo_n "checking for $ac_hdr that defines DIR... " >&6; }6090$as_echo_n "checking for $ac_hdr that defines DIR... " >&6; }
6077if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then :6091if eval "test \"\${$as_ac_Header+set}\"" = set; then :
6078 $as_echo_n "(cached) " >&66092 $as_echo_n "(cached) " >&6
6079else6093else
6080 cat confdefs.h - <<_ACEOF >conftest.$ac_ext6094 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -6101,8 +6115,7 @@
6101eval ac_res=\$$as_ac_Header6115eval ac_res=\$$as_ac_Header
6102 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&56116 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
6103$as_echo "$ac_res" >&6; }6117$as_echo "$ac_res" >&6; }
6104eval as_val=\$$as_ac_Header6118if eval test \"x\$"$as_ac_Header"\" = x"yes"; then :
6105 if test "x$as_val" = x""yes; then :
6106 cat >>confdefs.h <<_ACEOF6119 cat >>confdefs.h <<_ACEOF
6107#define `$as_echo "HAVE_$ac_hdr" | $as_tr_cpp` 16120#define `$as_echo "HAVE_$ac_hdr" | $as_tr_cpp` 1
6108_ACEOF6121_ACEOF
@@ -6622,9 +6635,8 @@
6622 if test "$ac_cv_type_int" = yes; then6635 if test "$ac_cv_type_int" = yes; then
6623 { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&56636 { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
6624$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}6637$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
6625{ as_fn_set_status 776638as_fn_error 77 "cannot compute sizeof (int)
6626as_fn_error "cannot compute sizeof (int)6639See \`config.log' for more details" "$LINENO" 5 ; }
6627See \`config.log' for more details." "$LINENO" 5; }; }
6628 else6640 else
6629 ac_cv_sizeof_int=06641 ac_cv_sizeof_int=0
6630 fi6642 fi
@@ -6656,9 +6668,8 @@
6656 if test "$ac_cv_type_long" = yes; then6668 if test "$ac_cv_type_long" = yes; then
6657 { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&56669 { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
6658$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}6670$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
6659{ as_fn_set_status 776671as_fn_error 77 "cannot compute sizeof (long)
6660as_fn_error "cannot compute sizeof (long)6672See \`config.log' for more details" "$LINENO" 5 ; }
6661See \`config.log' for more details." "$LINENO" 5; }; }
6662 else6673 else
6663 ac_cv_sizeof_long=06674 ac_cv_sizeof_long=0
6664 fi6675 fi
@@ -6690,9 +6701,8 @@
6690 if test "$ac_cv_type_void_p" = yes; then6701 if test "$ac_cv_type_void_p" = yes; then
6691 { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&56702 { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
6692$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}6703$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
6693{ as_fn_set_status 776704as_fn_error 77 "cannot compute sizeof (void *)
6694as_fn_error "cannot compute sizeof (void *)6705See \`config.log' for more details" "$LINENO" 5 ; }
6695See \`config.log' for more details." "$LINENO" 5; }; }
6696 else6706 else
6697 ac_cv_sizeof_void_p=06707 ac_cv_sizeof_void_p=0
6698 fi6708 fi
@@ -6724,9 +6734,8 @@
6724 if test "$ac_cv_type_short" = yes; then6734 if test "$ac_cv_type_short" = yes; then
6725 { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&56735 { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
6726$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}6736$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
6727{ as_fn_set_status 776737as_fn_error 77 "cannot compute sizeof (short)
6728as_fn_error "cannot compute sizeof (short)6738See \`config.log' for more details" "$LINENO" 5 ; }
6729See \`config.log' for more details." "$LINENO" 5; }; }
6730 else6739 else
6731 ac_cv_sizeof_short=06740 ac_cv_sizeof_short=0
6732 fi6741 fi
@@ -6758,9 +6767,8 @@
6758 if test "$ac_cv_type_float" = yes; then6767 if test "$ac_cv_type_float" = yes; then
6759 { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&56768 { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
6760$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}6769$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
6761{ as_fn_set_status 776770as_fn_error 77 "cannot compute sizeof (float)
6762as_fn_error "cannot compute sizeof (float)6771See \`config.log' for more details" "$LINENO" 5 ; }
6763See \`config.log' for more details." "$LINENO" 5; }; }
6764 else6772 else
6765 ac_cv_sizeof_float=06773 ac_cv_sizeof_float=0
6766 fi6774 fi
@@ -6792,9 +6800,8 @@
6792 if test "$ac_cv_type_double" = yes; then6800 if test "$ac_cv_type_double" = yes; then
6793 { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&56801 { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
6794$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}6802$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
6795{ as_fn_set_status 776803as_fn_error 77 "cannot compute sizeof (double)
6796as_fn_error "cannot compute sizeof (double)6804See \`config.log' for more details" "$LINENO" 5 ; }
6797See \`config.log' for more details." "$LINENO" 5; }; }
6798 else6805 else
6799 ac_cv_sizeof_double=06806 ac_cv_sizeof_double=0
6800 fi6807 fi
@@ -6826,9 +6833,8 @@
6826 if test "$ac_cv_type_fpos_t" = yes; then6833 if test "$ac_cv_type_fpos_t" = yes; then
6827 { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&56834 { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
6828$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}6835$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
6829{ as_fn_set_status 776836as_fn_error 77 "cannot compute sizeof (fpos_t)
6830as_fn_error "cannot compute sizeof (fpos_t)6837See \`config.log' for more details" "$LINENO" 5 ; }
6831See \`config.log' for more details." "$LINENO" 5; }; }
6832 else6838 else
6833 ac_cv_sizeof_fpos_t=06839 ac_cv_sizeof_fpos_t=0
6834 fi6840 fi
@@ -6860,9 +6866,8 @@
6860 if test "$ac_cv_type_size_t" = yes; then6866 if test "$ac_cv_type_size_t" = yes; then
6861 { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&56867 { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
6862$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}6868$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
6863{ as_fn_set_status 776869as_fn_error 77 "cannot compute sizeof (size_t)
6864as_fn_error "cannot compute sizeof (size_t)6870See \`config.log' for more details" "$LINENO" 5 ; }
6865See \`config.log' for more details." "$LINENO" 5; }; }
6866 else6871 else
6867 ac_cv_sizeof_size_t=06872 ac_cv_sizeof_size_t=0
6868 fi6873 fi
@@ -6894,9 +6899,8 @@
6894 if test "$ac_cv_type_pid_t" = yes; then6899 if test "$ac_cv_type_pid_t" = yes; then
6895 { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&56900 { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
6896$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}6901$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
6897{ as_fn_set_status 776902as_fn_error 77 "cannot compute sizeof (pid_t)
6898as_fn_error "cannot compute sizeof (pid_t)6903See \`config.log' for more details" "$LINENO" 5 ; }
6899See \`config.log' for more details." "$LINENO" 5; }; }
6900 else6904 else
6901 ac_cv_sizeof_pid_t=06905 ac_cv_sizeof_pid_t=0
6902 fi6906 fi
@@ -6955,9 +6959,8 @@
6955 if test "$ac_cv_type_long_long" = yes; then6959 if test "$ac_cv_type_long_long" = yes; then
6956 { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&56960 { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
6957$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}6961$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
6958{ as_fn_set_status 776962as_fn_error 77 "cannot compute sizeof (long long)
6959as_fn_error "cannot compute sizeof (long long)6963See \`config.log' for more details" "$LINENO" 5 ; }
6960See \`config.log' for more details." "$LINENO" 5; }; }
6961 else6964 else
6962 ac_cv_sizeof_long_long=06965 ac_cv_sizeof_long_long=0
6963 fi6966 fi
@@ -7017,9 +7020,8 @@
7017 if test "$ac_cv_type_long_double" = yes; then7020 if test "$ac_cv_type_long_double" = yes; then
7018 { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&57021 { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
7019$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}7022$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
7020{ as_fn_set_status 777023as_fn_error 77 "cannot compute sizeof (long double)
7021as_fn_error "cannot compute sizeof (long double)7024See \`config.log' for more details" "$LINENO" 5 ; }
7022See \`config.log' for more details." "$LINENO" 5; }; }
7023 else7025 else
7024 ac_cv_sizeof_long_double=07026 ac_cv_sizeof_long_double=0
7025 fi7027 fi
@@ -7080,9 +7082,8 @@
7080 if test "$ac_cv_type__Bool" = yes; then7082 if test "$ac_cv_type__Bool" = yes; then
7081 { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&57083 { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
7082$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}7084$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
7083{ as_fn_set_status 777085as_fn_error 77 "cannot compute sizeof (_Bool)
7084as_fn_error "cannot compute sizeof (_Bool)7086See \`config.log' for more details" "$LINENO" 5 ; }
7085See \`config.log' for more details." "$LINENO" 5; }; }
7086 else7087 else
7087 ac_cv_sizeof__Bool=07088 ac_cv_sizeof__Bool=0
7088 fi7089 fi
@@ -7126,9 +7127,8 @@
7126 if test "$ac_cv_type_uintptr_t" = yes; then7127 if test "$ac_cv_type_uintptr_t" = yes; then
7127 { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&57128 { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
7128$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}7129$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
7129{ as_fn_set_status 777130as_fn_error 77 "cannot compute sizeof (uintptr_t)
7130as_fn_error "cannot compute sizeof (uintptr_t)7131See \`config.log' for more details" "$LINENO" 5 ; }
7131See \`config.log' for more details." "$LINENO" 5; }; }
7132 else7132 else
7133 ac_cv_sizeof_uintptr_t=07133 ac_cv_sizeof_uintptr_t=0
7134 fi7134 fi
@@ -7168,9 +7168,8 @@
7168 if test "$ac_cv_type_off_t" = yes; then7168 if test "$ac_cv_type_off_t" = yes; then
7169 { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&57169 { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
7170$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}7170$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
7171{ as_fn_set_status 777171as_fn_error 77 "cannot compute sizeof (off_t)
7172as_fn_error "cannot compute sizeof (off_t)7172See \`config.log' for more details" "$LINENO" 5 ; }
7173See \`config.log' for more details." "$LINENO" 5; }; }
7174 else7173 else
7175 ac_cv_sizeof_off_t=07174 ac_cv_sizeof_off_t=0
7176 fi7175 fi
@@ -7231,9 +7230,8 @@
7231 if test "$ac_cv_type_time_t" = yes; then7230 if test "$ac_cv_type_time_t" = yes; then
7232 { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&57231 { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
7233$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}7232$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
7234{ as_fn_set_status 777233as_fn_error 77 "cannot compute sizeof (time_t)
7235as_fn_error "cannot compute sizeof (time_t)7234See \`config.log' for more details" "$LINENO" 5 ; }
7236See \`config.log' for more details." "$LINENO" 5; }; }
7237 else7235 else
7238 ac_cv_sizeof_time_t=07236 ac_cv_sizeof_time_t=0
7239 fi7237 fi
@@ -7304,9 +7302,8 @@
7304 if test "$ac_cv_type_pthread_t" = yes; then7302 if test "$ac_cv_type_pthread_t" = yes; then
7305 { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&57303 { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
7306$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}7304$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
7307{ as_fn_set_status 777305as_fn_error 77 "cannot compute sizeof (pthread_t)
7308as_fn_error "cannot compute sizeof (pthread_t)7306See \`config.log' for more details" "$LINENO" 5 ; }
7309See \`config.log' for more details." "$LINENO" 5; }; }
7310 else7307 else
7311 ac_cv_sizeof_pthread_t=07308 ac_cv_sizeof_pthread_t=0
7312 fi7309 fi
@@ -7393,7 +7390,7 @@
7393 MACOSX_DEFAULT_ARCH="ppc"7390 MACOSX_DEFAULT_ARCH="ppc"
7394 ;;7391 ;;
7395 *)7392 *)
7396 as_fn_error "Unexpected output of 'arch' on OSX" "$LINENO" 57393 as_fn_error $? "Unexpected output of 'arch' on OSX" "$LINENO" 5
7397 ;;7394 ;;
7398 esac7395 esac
7399 else7396 else
@@ -7405,7 +7402,7 @@
7405 MACOSX_DEFAULT_ARCH="ppc64"7402 MACOSX_DEFAULT_ARCH="ppc64"
7406 ;;7403 ;;
7407 *)7404 *)
7408 as_fn_error "Unexpected output of 'arch' on OSX" "$LINENO" 57405 as_fn_error $? "Unexpected output of 'arch' on OSX" "$LINENO" 5
7409 ;;7406 ;;
7410 esac7407 esac
74117408
@@ -7431,7 +7428,7 @@
7431$as_echo "yes" >&6; }7428$as_echo "yes" >&6; }
7432 if test $enable_shared = "yes"7429 if test $enable_shared = "yes"
7433 then7430 then
7434 as_fn_error "Specifying both --enable-shared and --enable-framework is not supported, use only --enable-framework instead" "$LINENO" 57431 as_fn_error $? "Specifying both --enable-shared and --enable-framework is not supported, use only --enable-framework instead" "$LINENO" 5
7435 fi7432 fi
7436else7433else
7437 { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&57434 { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
@@ -7461,36 +7458,6 @@
74617458
74627459
74637460
7464# SO is the extension of shared libraries `(including the dot!)
7465# -- usually .so, .sl on HP-UX, .dll on Cygwin
7466{ $as_echo "$as_me:${as_lineno-$LINENO}: checking SO" >&5
7467$as_echo_n "checking SO... " >&6; }
7468if test -z "$SO"
7469then
7470 case $ac_sys_system in
7471 hp*|HP*)
7472 case `uname -m` in
7473 ia64) SO=.so;;
7474 *) SO=.sl;;
7475 esac
7476 ;;
7477 CYGWIN*) SO=.dll;;
7478 *) SO=.so;;
7479 esac
7480else
7481 # this might also be a termcap variable, see #610332
7482 echo
7483 echo '====================================================================='
7484 echo '+ +'
7485 echo '+ WARNING: You have set SO in your environment. +'
7486 echo '+ Do you really mean to change the extension for shared libraries? +'
7487 echo '+ Continuing in 10 seconds to let you to ponder. +'
7488 echo '+ +'
7489 echo '====================================================================='
7490 sleep 10
7491fi
7492{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $SO" >&5
7493$as_echo "$SO" >&6; }
74947461
74957462
7496cat >>confdefs.h <<_ACEOF7463cat >>confdefs.h <<_ACEOF
@@ -8239,12 +8206,12 @@
8239 withval=$with_dbmliborder;8206 withval=$with_dbmliborder;
8240if test x$with_dbmliborder = xyes8207if test x$with_dbmliborder = xyes
8241then8208then
8242as_fn_error "proper usage is --with-dbmliborder=db1:db2:..." "$LINENO" 58209as_fn_error $? "proper usage is --with-dbmliborder=db1:db2:..." "$LINENO" 5
8243else8210else
8244 for db in `echo $with_dbmliborder | sed 's/:/ /g'`; do8211 for db in `echo $with_dbmliborder | sed 's/:/ /g'`; do
8245 if test x$db != xndbm && test x$db != xgdbm && test x$db != xbdb8212 if test x$db != xndbm && test x$db != xgdbm && test x$db != xbdb
8246 then8213 then
8247 as_fn_error "proper usage is --with-dbmliborder=db1:db2:..." "$LINENO" 58214 as_fn_error $? "proper usage is --with-dbmliborder=db1:db2:..." "$LINENO" 5
8248 fi8215 fi
8249 done8216 done
8250fi8217fi
@@ -9210,7 +9177,9 @@
92109177
92119178
9212if test -z "$with_pymalloc"9179if test -z "$with_pymalloc"
9213then with_pymalloc="yes"9180then
9181 with_pymalloc="yes"
9182 SOABI_QUALIFIERS="${SOABI_QUALIFIERS}m"
9214fi9183fi
9215if test "$with_pymalloc" != "no"9184if test "$with_pymalloc" != "no"
9216then9185then
@@ -9241,7 +9210,7 @@
9241$as_echo "#define WITH_VALGRIND 1" >>confdefs.h9210$as_echo "#define WITH_VALGRIND 1" >>confdefs.h
92429211
9243else9212else
9244 as_fn_error "Valgrind support requested but headers not available" "$LINENO" 59213 as_fn_error $? "Valgrind support requested but headers not available" "$LINENO" 5
92459214
9246fi9215fi
92479216
@@ -9358,8 +9327,7 @@
9358do :9327do :
9359 as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`9328 as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
9360ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var"9329ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var"
9361eval as_val=\$$as_ac_var9330if eval test \"x\$"$as_ac_var"\" = x"yes"; then :
9362 if test "x$as_val" = x""yes; then :
9363 cat >>confdefs.h <<_ACEOF9331 cat >>confdefs.h <<_ACEOF
9364#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 19332#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
9365_ACEOF9333_ACEOF
@@ -10293,35 +10261,53 @@
10293do :10261do :
10294 as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`10262 as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
10295ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var"10263ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var"
10296eval as_val=\$$as_ac_var10264if eval test \"x\$"$as_ac_var"\" = x"yes"; then :
10297 if test "x$as_val" = x""yes; then :10265 cat >>confdefs.h <<_ACEOF
10298 cat >>confdefs.h <<_ACEOF10266#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
10299#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 110267_ACEOF
10300_ACEOF10268
1030110269fi
10302fi10270done
10303done10271
1030410272
1030510273ac_fn_c_check_func "$LINENO" "dup2" "ac_cv_func_dup2"
10306for ac_func in dup2 getcwd strdup10274if test "x$ac_cv_func_dup2" = x""yes; then :
10307do :10275 $as_echo "#define HAVE_DUP2 1" >>confdefs.h
10308 as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`10276
10309ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var"10277else
10310eval as_val=\$$as_ac_var10278 case " $LIBOBJS " in
10311 if test "x$as_val" = x""yes; then :10279 *" dup2.$ac_objext "* ) ;;
10312 cat >>confdefs.h <<_ACEOF10280 *) LIBOBJS="$LIBOBJS dup2.$ac_objext"
10313#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 110281 ;;
10314_ACEOF10282esac
1031510283
10316else10284fi
10317 case " $LIBOBJS " in10285
10318 *" $ac_func.$ac_objext "* ) ;;10286ac_fn_c_check_func "$LINENO" "getcwd" "ac_cv_func_getcwd"
10319 *) LIBOBJS="$LIBOBJS $ac_func.$ac_objext"10287if test "x$ac_cv_func_getcwd" = x""yes; then :
10320 ;;10288 $as_echo "#define HAVE_GETCWD 1" >>confdefs.h
10321esac10289
1032210290else
10323fi10291 case " $LIBOBJS " in
10324done10292 *" getcwd.$ac_objext "* ) ;;
10293 *) LIBOBJS="$LIBOBJS getcwd.$ac_objext"
10294 ;;
10295esac
10296
10297fi
10298
10299ac_fn_c_check_func "$LINENO" "strdup" "ac_cv_func_strdup"
10300if test "x$ac_cv_func_strdup" = x""yes; then :
10301 $as_echo "#define HAVE_STRDUP 1" >>confdefs.h
10302
10303else
10304 case " $LIBOBJS " in
10305 *" strdup.$ac_objext "* ) ;;
10306 *) LIBOBJS="$LIBOBJS strdup.$ac_objext"
10307 ;;
10308esac
10309
10310fi
1032510311
1032610312
10327for ac_func in getpgrp10313for ac_func in getpgrp
@@ -11530,7 +11516,7 @@
11530then LIBM=$withval11516then LIBM=$withval
11531 { $as_echo "$as_me:${as_lineno-$LINENO}: result: set LIBM=\"$withval\"" >&511517 { $as_echo "$as_me:${as_lineno-$LINENO}: result: set LIBM=\"$withval\"" >&5
11532$as_echo "set LIBM=\"$withval\"" >&6; }11518$as_echo "set LIBM=\"$withval\"" >&6; }
11533else as_fn_error "proper usage is --with-libm=STRING" "$LINENO" 511519else as_fn_error $? "proper usage is --with-libm=STRING" "$LINENO" 5
11534fi11520fi
11535else11521else
11536 { $as_echo "$as_me:${as_lineno-$LINENO}: result: default LIBM=\"$LIBM\"" >&511522 { $as_echo "$as_me:${as_lineno-$LINENO}: result: default LIBM=\"$LIBM\"" >&5
@@ -11554,7 +11540,7 @@
11554then LIBC=$withval11540then LIBC=$withval
11555 { $as_echo "$as_me:${as_lineno-$LINENO}: result: set LIBC=\"$withval\"" >&511541 { $as_echo "$as_me:${as_lineno-$LINENO}: result: set LIBC=\"$withval\"" >&5
11556$as_echo "set LIBC=\"$withval\"" >&6; }11542$as_echo "set LIBC=\"$withval\"" >&6; }
11557else as_fn_error "proper usage is --with-libc=STRING" "$LINENO" 511543else as_fn_error $? "proper usage is --with-libc=STRING" "$LINENO" 5
11558fi11544fi
11559else11545else
11560 { $as_echo "$as_me:${as_lineno-$LINENO}: result: default LIBC=\"$LIBC\"" >&511546 { $as_echo "$as_me:${as_lineno-$LINENO}: result: default LIBC=\"$LIBC\"" >&5
@@ -11850,8 +11836,7 @@
11850do :11836do :
11851 as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`11837 as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
11852ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var"11838ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var"
11853eval as_val=\$$as_ac_var11839if eval test \"x\$"$as_ac_var"\" = x"yes"; then :
11854 if test "x$as_val" = x""yes; then :
11855 cat >>confdefs.h <<_ACEOF11840 cat >>confdefs.h <<_ACEOF
11856#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 111841#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
11857_ACEOF11842_ACEOF
@@ -11863,8 +11848,7 @@
11863do :11848do :
11864 as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`11849 as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
11865ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var"11850ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var"
11866eval as_val=\$$as_ac_var11851if eval test \"x\$"$as_ac_var"\" = x"yes"; then :
11867 if test "x$as_val" = x""yes; then :
11868 cat >>confdefs.h <<_ACEOF11852 cat >>confdefs.h <<_ACEOF
11869#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 111853#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
11870_ACEOF11854_ACEOF
@@ -12032,7 +12016,7 @@
1203215|30)1201615|30)
12033 ;;12017 ;;
12034*)12018*)
12035 as_fn_error "bad value $enable_big_digits for --enable-big-digits; value should be 15 or 30" "$LINENO" 5 ;;12019 as_fn_error $? "bad value $enable_big_digits for --enable-big-digits; value should be 15 or 30" "$LINENO" 5 ;;
12036esac12020esac
12037{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $enable_big_digits" >&512021{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $enable_big_digits" >&5
12038$as_echo "$enable_big_digits" >&6; }12022$as_echo "$enable_big_digits" >&6; }
@@ -12083,9 +12067,8 @@
12083 if test "$ac_cv_type_wchar_t" = yes; then12067 if test "$ac_cv_type_wchar_t" = yes; then
12084 { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&512068 { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
12085$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}12069$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
12086{ as_fn_set_status 7712070as_fn_error 77 "cannot compute sizeof (wchar_t)
12087as_fn_error "cannot compute sizeof (wchar_t)12071See \`config.log' for more details" "$LINENO" 5 ; }
12088See \`config.log' for more details." "$LINENO" 5; }; }
12089 else12072 else
12090 ac_cv_sizeof_wchar_t=012073 ac_cv_sizeof_wchar_t=0
12091 fi12074 fi
@@ -12187,7 +12170,7 @@
12187else12170else
1218812171
12189case "$have_ucs4_tcl" in12172case "$have_ucs4_tcl" in
12190 yes) unicode_size="4" ;;12173 yes) unicode_size="4";;
12191 *) unicode_size="2" ;;12174 *) unicode_size="2" ;;
12192esac12175esac
1219312176
@@ -12196,8 +12179,11 @@
1219612179
1219712180
12198case "$unicode_size" in12181case "$unicode_size" in
12199 4) $as_echo "#define Py_UNICODE_SIZE 4" >>confdefs.h12182 4)
12200 ;;12183 $as_echo "#define Py_UNICODE_SIZE 4" >>confdefs.h
12184
12185 SOABI_QUALIFIERS="${SOABI_QUALIFIERS}u"
12186 ;;
12201 *) $as_echo "#define Py_UNICODE_SIZE 2" >>confdefs.h12187 *) $as_echo "#define Py_UNICODE_SIZE 2" >>confdefs.h
12202 ;;12188 ;;
12203esac12189esac
@@ -12451,11 +12437,64 @@
1245112437
12452 ;; #(12438 ;; #(
12453 *)12439 *)
12454 as_fn_error "unknown endianness12440 as_fn_error $? "unknown endianness
12455 presetting ac_cv_c_bigendian=no (or yes) will help" "$LINENO" 5 ;;12441 presetting ac_cv_c_bigendian=no (or yes) will help" "$LINENO" 5 ;;
12456 esac12442 esac
1245712443
1245812444
12445# ABI version string for Python extension modules. This appears between the
12446# periods in shared library file names, e.g. foo.<SOABI>.so. It is calculated
12447# from the following attributes which affect the ABI of this Python build (in
12448# this order):
12449#
12450# * The Python implementation (always 'cpython-' for us)
12451# * The major and minor version numbers
12452# * --with-pydebug (adds a 'd')
12453# * --with-pymalloc (adds a 'm')
12454# * --with-wide-unicode (adds a 'u')
12455#
12456# Thus for example, Python 3.2 built with wide unicode, pydebug, and pymalloc,
12457# would get a shared library ABI version tag of 'cpython-32udm' and shared
12458# libraries would be named 'foo.cpython-32udm.so'.
12459
12460{ $as_echo "$as_me:${as_lineno-$LINENO}: checking SOABI" >&5
12461$as_echo_n "checking SOABI... " >&6; }
12462SOABI='cpython-'`echo $VERSION | tr -d .`${SOABI_QUALIFIERS}
12463{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $SOABI" >&5
12464$as_echo "$SOABI" >&6; }
12465
12466# SO is the extension of shared libraries `(including the dot!)
12467# -- usually .so, .sl on HP-UX, .dll on Cygwin
12468{ $as_echo "$as_me:${as_lineno-$LINENO}: checking SO" >&5
12469$as_echo_n "checking SO... " >&6; }
12470if test -z "$SO"
12471then
12472 case $ac_sys_system in
12473 hp*|HP*)
12474 case `uname -m` in
12475 ia64) SO=.so;;
12476 *) SO=.sl;;
12477 esac
12478 ;;
12479 CYGWIN*) SO=.dll;;
12480 Linux*) SO=.${SOABI}.so;;
12481 *) SO=.so;;
12482 esac
12483else
12484 # this might also be a termcap variable, see #610332
12485 echo
12486 echo '====================================================================='
12487 echo '+ +'
12488 echo '+ WARNING: You have set SO in your environment. +'
12489 echo '+ Do you really mean to change the extension for shared libraries? +'
12490 echo '+ Continuing in 10 seconds to let you to ponder. +'
12491 echo '+ +'
12492 echo '====================================================================='
12493 sleep 10
12494fi
12495{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $SO" >&5
12496$as_echo "$SO" >&6; }
12497
12459# Check whether right shifting a negative integer extends the sign bit12498# Check whether right shifting a negative integer extends the sign bit
12460# or fills with zeros (like the Cray J90, according to Tim Peters).12499# or fills with zeros (like the Cray J90, according to Tim Peters).
12461{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether right shift extends the sign bit" >&512500{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether right shift extends the sign bit" >&5
@@ -12649,7 +12688,7 @@
12649 have_readline=no12688 have_readline=no
1265012689
12651fi12690fi
12652rm -f conftest.err conftest.$ac_ext12691rm -f conftest.err conftest.i conftest.$ac_ext
12653if test $have_readline = yes12692if test $have_readline = yes
12654then12693then
12655 cat confdefs.h - <<_ACEOF >conftest.$ac_ext12694 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -12823,7 +12862,7 @@
12823 have_readline=no12862 have_readline=no
1282412863
12825fi12864fi
12826rm -f conftest.err conftest.$ac_ext12865rm -f conftest.err conftest.i conftest.$ac_ext
12827if test $have_readline = yes12866if test $have_readline = yes
12828then12867then
12829 cat confdefs.h - <<_ACEOF >conftest.$ac_ext12868 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -13633,7 +13672,7 @@
1363313672
1363413673
13635case $ac_sys_system in13674case $ac_sys_system in
13636 OSF*) as_fn_error "OSF* systems are deprecated unless somebody volunteers. Check http://bugs.python.org/issue8606" "$LINENO" 5 ;;13675 OSF*) as_fn_error $? "OSF* systems are deprecated unless somebody volunteers. Check http://bugs.python.org/issue8606" "$LINENO" 5 ;;
13637esac13676esac
1363813677
1363913678
@@ -13743,6 +13782,7 @@
1374313782
13744ac_libobjs=13783ac_libobjs=
13745ac_ltlibobjs=13784ac_ltlibobjs=
13785U=
13746for ac_i in : $LIBOBJS; do test "x$ac_i" = x: && continue13786for ac_i in : $LIBOBJS; do test "x$ac_i" = x: && continue
13747 # 1. Remove the extension, and $U if already installed.13787 # 1. Remove the extension, and $U if already installed.
13748 ac_script='s/\$U\././;s/\.o$//;s/\.obj$//'13788 ac_script='s/\$U\././;s/\.o$//;s/\.obj$//'
@@ -13905,19 +13945,19 @@
13905(unset CDPATH) >/dev/null 2>&1 && unset CDPATH13945(unset CDPATH) >/dev/null 2>&1 && unset CDPATH
1390613946
1390713947
13908# as_fn_error ERROR [LINENO LOG_FD]13948# as_fn_error STATUS ERROR [LINENO LOG_FD]
13909# ---------------------------------13949# ----------------------------------------
13910# Output "`basename $0`: error: ERROR" to stderr. If LINENO and LOG_FD are13950# Output "`basename $0`: error: ERROR" to stderr. If LINENO and LOG_FD are
13911# provided, also output the error to LOG_FD, referencing LINENO. Then exit the13951# provided, also output the error to LOG_FD, referencing LINENO. Then exit the
13912# script with status $?, using 1 if that was 0.13952# script with STATUS, using 1 if that was 0.
13913as_fn_error ()13953as_fn_error ()
13914{13954{
13915 as_status=$?; test $as_status -eq 0 && as_status=113955 as_status=$1; test $as_status -eq 0 && as_status=1
13916 if test "$3"; then13956 if test "$4"; then
13917 as_lineno=${as_lineno-"$2"} as_lineno_stack=as_lineno_stack=$as_lineno_stack13957 as_lineno=${as_lineno-"$3"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
13918 $as_echo "$as_me:${as_lineno-$LINENO}: error: $1" >&$313958 $as_echo "$as_me:${as_lineno-$LINENO}: error: $2" >&$4
13919 fi13959 fi
13920 $as_echo "$as_me: error: $1" >&213960 $as_echo "$as_me: error: $2" >&2
13921 as_fn_exit $as_status13961 as_fn_exit $as_status
13922} # as_fn_error13962} # as_fn_error
1392313963
@@ -14113,7 +14153,7 @@
14113 test -d "$as_dir" && break14153 test -d "$as_dir" && break
14114 done14154 done
14115 test -z "$as_dirs" || eval "mkdir $as_dirs"14155 test -z "$as_dirs" || eval "mkdir $as_dirs"
14116 } || test -d "$as_dir" || as_fn_error "cannot create directory $as_dir"14156 } || test -d "$as_dir" || as_fn_error $? "cannot create directory $as_dir"
1411714157
1411814158
14119} # as_fn_mkdir_p14159} # as_fn_mkdir_p
@@ -14167,7 +14207,7 @@
14167# values after options handling.14207# values after options handling.
14168ac_log="14208ac_log="
14169This file was extended by python $as_me 3.2, which was14209This file was extended by python $as_me 3.2, which was
14170generated by GNU Autoconf 2.65. Invocation command line was14210generated by GNU Autoconf 2.67. Invocation command line was
1417114211
14172 CONFIG_FILES = $CONFIG_FILES14212 CONFIG_FILES = $CONFIG_FILES
14173 CONFIG_HEADERS = $CONFIG_HEADERS14213 CONFIG_HEADERS = $CONFIG_HEADERS
@@ -14229,10 +14269,10 @@
14229ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"14269ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
14230ac_cs_version="\\14270ac_cs_version="\\
14231python config.status 3.214271python config.status 3.2
14232configured by $0, generated by GNU Autoconf 2.65,14272configured by $0, generated by GNU Autoconf 2.67,
14233 with options \\"\$ac_cs_config\\"14273 with options \\"\$ac_cs_config\\"
1423414274
14235Copyright (C) 2009 Free Software Foundation, Inc.14275Copyright (C) 2010 Free Software Foundation, Inc.
14236This config.status script is free software; the Free Software Foundation14276This config.status script is free software; the Free Software Foundation
14237gives unlimited permission to copy, distribute and modify it."14277gives unlimited permission to copy, distribute and modify it."
1423814278
@@ -14248,11 +14288,16 @@
14248while test $# != 014288while test $# != 0
14249do14289do
14250 case $1 in14290 case $1 in
14251 --*=*)14291 --*=?*)
14252 ac_option=`expr "X$1" : 'X\([^=]*\)='`14292 ac_option=`expr "X$1" : 'X\([^=]*\)='`
14253 ac_optarg=`expr "X$1" : 'X[^=]*=\(.*\)'`14293 ac_optarg=`expr "X$1" : 'X[^=]*=\(.*\)'`
14254 ac_shift=:14294 ac_shift=:
14255 ;;14295 ;;
14296 --*=)
14297 ac_option=`expr "X$1" : 'X\([^=]*\)='`
14298 ac_optarg=
14299 ac_shift=:
14300 ;;
14256 *)14301 *)
14257 ac_option=$114302 ac_option=$1
14258 ac_optarg=$214303 ac_optarg=$2
@@ -14274,6 +14319,7 @@
14274 $ac_shift14319 $ac_shift
14275 case $ac_optarg in14320 case $ac_optarg in
14276 *\'*) ac_optarg=`$as_echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"` ;;14321 *\'*) ac_optarg=`$as_echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"` ;;
14322 '') as_fn_error $? "missing file argument" ;;
14277 esac14323 esac
14278 as_fn_append CONFIG_FILES " '$ac_optarg'"14324 as_fn_append CONFIG_FILES " '$ac_optarg'"
14279 ac_need_defaults=false;;14325 ac_need_defaults=false;;
@@ -14286,7 +14332,7 @@
14286 ac_need_defaults=false;;14332 ac_need_defaults=false;;
14287 --he | --h)14333 --he | --h)
14288 # Conflict between --help and --header14334 # Conflict between --help and --header
14289 as_fn_error "ambiguous option: \`$1'14335 as_fn_error $? "ambiguous option: \`$1'
14290Try \`$0 --help' for more information.";;14336Try \`$0 --help' for more information.";;
14291 --help | --hel | -h )14337 --help | --hel | -h )
14292 $as_echo "$ac_cs_usage"; exit ;;14338 $as_echo "$ac_cs_usage"; exit ;;
@@ -14295,7 +14341,7 @@
14295 ac_cs_silent=: ;;14341 ac_cs_silent=: ;;
1429614342
14297 # This is an error.14343 # This is an error.
14298 -*) as_fn_error "unrecognized option: \`$1'14344 -*) as_fn_error $? "unrecognized option: \`$1'
14299Try \`$0 --help' for more information." ;;14345Try \`$0 --help' for more information." ;;
1430014346
14301 *) as_fn_append ac_config_targets " $1"14347 *) as_fn_append ac_config_targets " $1"
@@ -14353,7 +14399,7 @@
14353 "Modules/Setup.config") CONFIG_FILES="$CONFIG_FILES Modules/Setup.config" ;;14399 "Modules/Setup.config") CONFIG_FILES="$CONFIG_FILES Modules/Setup.config" ;;
14354 "Misc/python.pc") CONFIG_FILES="$CONFIG_FILES Misc/python.pc" ;;14400 "Misc/python.pc") CONFIG_FILES="$CONFIG_FILES Misc/python.pc" ;;
1435514401
14356 *) as_fn_error "invalid argument: \`$ac_config_target'" "$LINENO" 5;;14402 *) as_fn_error $? "invalid argument: \`$ac_config_target'" "$LINENO" 5 ;;
14357 esac14403 esac
14358done14404done
1435914405
@@ -14390,7 +14436,7 @@
14390{14436{
14391 tmp=./conf$$-$RANDOM14437 tmp=./conf$$-$RANDOM
14392 (umask 077 && mkdir "$tmp")14438 (umask 077 && mkdir "$tmp")
14393} || as_fn_error "cannot create a temporary directory in ." "$LINENO" 514439} || as_fn_error $? "cannot create a temporary directory in ." "$LINENO" 5
1439414440
14395# Set up the scripts for CONFIG_FILES section.14441# Set up the scripts for CONFIG_FILES section.
14396# No need to generate them if there are no CONFIG_FILES.14442# No need to generate them if there are no CONFIG_FILES.
@@ -14407,7 +14453,7 @@
14407fi14453fi
14408ac_cs_awk_cr=`$AWK 'BEGIN { print "a\rb" }' </dev/null 2>/dev/null`14454ac_cs_awk_cr=`$AWK 'BEGIN { print "a\rb" }' </dev/null 2>/dev/null`
14409if test "$ac_cs_awk_cr" = "a${ac_cr}b"; then14455if test "$ac_cs_awk_cr" = "a${ac_cr}b"; then
14410 ac_cs_awk_cr='\r'14456 ac_cs_awk_cr='\\r'
14411else14457else
14412 ac_cs_awk_cr=$ac_cr14458 ac_cs_awk_cr=$ac_cr
14413fi14459fi
@@ -14421,18 +14467,18 @@
14421 echo "$ac_subst_vars" | sed 's/.*/&!$&$ac_delim/' &&14467 echo "$ac_subst_vars" | sed 's/.*/&!$&$ac_delim/' &&
14422 echo "_ACEOF"14468 echo "_ACEOF"
14423} >conf$$subs.sh ||14469} >conf$$subs.sh ||
14424 as_fn_error "could not make $CONFIG_STATUS" "$LINENO" 514470 as_fn_error $? "could not make $CONFIG_STATUS" "$LINENO" 5
14425ac_delim_num=`echo "$ac_subst_vars" | grep -c '$'`14471ac_delim_num=`echo "$ac_subst_vars" | grep -c '^'`
14426ac_delim='%!_!# '14472ac_delim='%!_!# '
14427for ac_last_try in false false false false false :; do14473for ac_last_try in false false false false false :; do
14428 . ./conf$$subs.sh ||14474 . ./conf$$subs.sh ||
14429 as_fn_error "could not make $CONFIG_STATUS" "$LINENO" 514475 as_fn_error $? "could not make $CONFIG_STATUS" "$LINENO" 5
1443014476
14431 ac_delim_n=`sed -n "s/.*$ac_delim\$/X/p" conf$$subs.awk | grep -c X`14477 ac_delim_n=`sed -n "s/.*$ac_delim\$/X/p" conf$$subs.awk | grep -c X`
14432 if test $ac_delim_n = $ac_delim_num; then14478 if test $ac_delim_n = $ac_delim_num; then
14433 break14479 break
14434 elif $ac_last_try; then14480 elif $ac_last_try; then
14435 as_fn_error "could not make $CONFIG_STATUS" "$LINENO" 514481 as_fn_error $? "could not make $CONFIG_STATUS" "$LINENO" 5
14436 else14482 else
14437 ac_delim="$ac_delim!$ac_delim _$ac_delim!! "14483 ac_delim="$ac_delim!$ac_delim _$ac_delim!! "
14438 fi14484 fi
@@ -14521,20 +14567,28 @@
14521else14567else
14522 cat14568 cat
14523fi < "$tmp/subs1.awk" > "$tmp/subs.awk" \14569fi < "$tmp/subs1.awk" > "$tmp/subs.awk" \
14524 || as_fn_error "could not setup config files machinery" "$LINENO" 514570 || as_fn_error $? "could not setup config files machinery" "$LINENO" 5
14525_ACEOF14571_ACEOF
1452614572
14527# VPATH may cause trouble with some makes, so we remove $(srcdir),14573# VPATH may cause trouble with some makes, so we remove sole $(srcdir),
14528# ${srcdir} and @srcdir@ from VPATH if srcdir is ".", strip leading and14574# ${srcdir} and @srcdir@ entries from VPATH if srcdir is ".", strip leading and
14529# trailing colons and then remove the whole line if VPATH becomes empty14575# trailing colons and then remove the whole line if VPATH becomes empty
14530# (actually we leave an empty line to preserve line numbers).14576# (actually we leave an empty line to preserve line numbers).
14531if test "x$srcdir" = x.; then14577if test "x$srcdir" = x.; then
14532 ac_vpsub='/^[ ]*VPATH[ ]*=/{14578 ac_vpsub='/^[ ]*VPATH[ ]*=[ ]*/{
14533s/:*\$(srcdir):*/:/14579h
14534s/:*\${srcdir}:*/:/14580s///
14535s/:*@srcdir@:*/:/14581s/^/:/
14536s/^\([^=]*=[ ]*\):*/\1/14582s/[ ]*$/:/
14583s/:\$(srcdir):/:/g
14584s/:\${srcdir}:/:/g
14585s/:@srcdir@:/:/g
14586s/^:*//
14537s/:*$//14587s/:*$//
14588x
14589s/\(=[ ]*\).*/\1/
14590G
14591s/\n//
14538s/^[^=]*=[ ]*$//14592s/^[^=]*=[ ]*$//
14539}'14593}'
14540fi14594fi
@@ -14562,7 +14616,7 @@
14562 if test -z "$ac_t"; then14616 if test -z "$ac_t"; then
14563 break14617 break
14564 elif $ac_last_try; then14618 elif $ac_last_try; then
14565 as_fn_error "could not make $CONFIG_HEADERS" "$LINENO" 514619 as_fn_error $? "could not make $CONFIG_HEADERS" "$LINENO" 5
14566 else14620 else
14567 ac_delim="$ac_delim!$ac_delim _$ac_delim!! "14621 ac_delim="$ac_delim!$ac_delim _$ac_delim!! "
14568 fi14622 fi
@@ -14647,7 +14701,7 @@
14647_ACAWK14701_ACAWK
14648_ACEOF14702_ACEOF
14649cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=114703cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
14650 as_fn_error "could not setup config headers machinery" "$LINENO" 514704 as_fn_error $? "could not setup config headers machinery" "$LINENO" 5
14651fi # test -n "$CONFIG_HEADERS"14705fi # test -n "$CONFIG_HEADERS"
1465214706
1465314707
@@ -14660,7 +14714,7 @@
14660 esac14714 esac
14661 case $ac_mode$ac_tag in14715 case $ac_mode$ac_tag in
14662 :[FHL]*:*);;14716 :[FHL]*:*);;
14663 :L* | :C*:*) as_fn_error "invalid tag \`$ac_tag'" "$LINENO" 5;;14717 :L* | :C*:*) as_fn_error $? "invalid tag \`$ac_tag'" "$LINENO" 5 ;;
14664 :[FH]-) ac_tag=-:-;;14718 :[FH]-) ac_tag=-:-;;
14665 :[FH]*) ac_tag=$ac_tag:$ac_tag.in;;14719 :[FH]*) ac_tag=$ac_tag:$ac_tag.in;;
14666 esac14720 esac
@@ -14688,7 +14742,7 @@
14688 [\\/$]*) false;;14742 [\\/$]*) false;;
14689 *) test -f "$srcdir/$ac_f" && ac_f="$srcdir/$ac_f";;14743 *) test -f "$srcdir/$ac_f" && ac_f="$srcdir/$ac_f";;
14690 esac ||14744 esac ||
14691 as_fn_error "cannot find input file: \`$ac_f'" "$LINENO" 5;;14745 as_fn_error 1 "cannot find input file: \`$ac_f'" "$LINENO" 5 ;;
14692 esac14746 esac
14693 case $ac_f in *\'*) ac_f=`$as_echo "$ac_f" | sed "s/'/'\\\\\\\\''/g"`;; esac14747 case $ac_f in *\'*) ac_f=`$as_echo "$ac_f" | sed "s/'/'\\\\\\\\''/g"`;; esac
14694 as_fn_append ac_file_inputs " '$ac_f'"14748 as_fn_append ac_file_inputs " '$ac_f'"
@@ -14715,7 +14769,7 @@
1471514769
14716 case $ac_tag in14770 case $ac_tag in
14717 *:-:* | *:-) cat >"$tmp/stdin" \14771 *:-:* | *:-) cat >"$tmp/stdin" \
14718 || as_fn_error "could not create $ac_file" "$LINENO" 5 ;;14772 || as_fn_error $? "could not create $ac_file" "$LINENO" 5 ;;
14719 esac14773 esac
14720 ;;14774 ;;
14721 esac14775 esac
@@ -14846,22 +14900,22 @@
14846$ac_datarootdir_hack14900$ac_datarootdir_hack
14847"14901"
14848eval sed \"\$ac_sed_extra\" "$ac_file_inputs" | $AWK -f "$tmp/subs.awk" >$tmp/out \14902eval sed \"\$ac_sed_extra\" "$ac_file_inputs" | $AWK -f "$tmp/subs.awk" >$tmp/out \
14849 || as_fn_error "could not create $ac_file" "$LINENO" 514903 || as_fn_error $? "could not create $ac_file" "$LINENO" 5
1485014904
14851test -z "$ac_datarootdir_hack$ac_datarootdir_seen" &&14905test -z "$ac_datarootdir_hack$ac_datarootdir_seen" &&
14852 { ac_out=`sed -n '/\${datarootdir}/p' "$tmp/out"`; test -n "$ac_out"; } &&14906 { ac_out=`sed -n '/\${datarootdir}/p' "$tmp/out"`; test -n "$ac_out"; } &&
14853 { ac_out=`sed -n '/^[ ]*datarootdir[ ]*:*=/p' "$tmp/out"`; test -z "$ac_out"; } &&14907 { ac_out=`sed -n '/^[ ]*datarootdir[ ]*:*=/p' "$tmp/out"`; test -z "$ac_out"; } &&
14854 { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $ac_file contains a reference to the variable \`datarootdir'14908 { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $ac_file contains a reference to the variable \`datarootdir'
14855which seems to be undefined. Please make sure it is defined." >&514909which seems to be undefined. Please make sure it is defined" >&5
14856$as_echo "$as_me: WARNING: $ac_file contains a reference to the variable \`datarootdir'14910$as_echo "$as_me: WARNING: $ac_file contains a reference to the variable \`datarootdir'
14857which seems to be undefined. Please make sure it is defined." >&2;}14911which seems to be undefined. Please make sure it is defined" >&2;}
1485814912
14859 rm -f "$tmp/stdin"14913 rm -f "$tmp/stdin"
14860 case $ac_file in14914 case $ac_file in
14861 -) cat "$tmp/out" && rm -f "$tmp/out";;14915 -) cat "$tmp/out" && rm -f "$tmp/out";;
14862 *) rm -f "$ac_file" && mv "$tmp/out" "$ac_file";;14916 *) rm -f "$ac_file" && mv "$tmp/out" "$ac_file";;
14863 esac \14917 esac \
14864 || as_fn_error "could not create $ac_file" "$LINENO" 514918 || as_fn_error $? "could not create $ac_file" "$LINENO" 5
14865 ;;14919 ;;
14866 :H)14920 :H)
14867 #14921 #
@@ -14872,19 +14926,19 @@
14872 $as_echo "/* $configure_input */" \14926 $as_echo "/* $configure_input */" \
14873 && eval '$AWK -f "$tmp/defines.awk"' "$ac_file_inputs"14927 && eval '$AWK -f "$tmp/defines.awk"' "$ac_file_inputs"
14874 } >"$tmp/config.h" \14928 } >"$tmp/config.h" \
14875 || as_fn_error "could not create $ac_file" "$LINENO" 514929 || as_fn_error $? "could not create $ac_file" "$LINENO" 5
14876 if diff "$ac_file" "$tmp/config.h" >/dev/null 2>&1; then14930 if diff "$ac_file" "$tmp/config.h" >/dev/null 2>&1; then
14877 { $as_echo "$as_me:${as_lineno-$LINENO}: $ac_file is unchanged" >&514931 { $as_echo "$as_me:${as_lineno-$LINENO}: $ac_file is unchanged" >&5
14878$as_echo "$as_me: $ac_file is unchanged" >&6;}14932$as_echo "$as_me: $ac_file is unchanged" >&6;}
14879 else14933 else
14880 rm -f "$ac_file"14934 rm -f "$ac_file"
14881 mv "$tmp/config.h" "$ac_file" \14935 mv "$tmp/config.h" "$ac_file" \
14882 || as_fn_error "could not create $ac_file" "$LINENO" 514936 || as_fn_error $? "could not create $ac_file" "$LINENO" 5
14883 fi14937 fi
14884 else14938 else
14885 $as_echo "/* $configure_input */" \14939 $as_echo "/* $configure_input */" \
14886 && eval '$AWK -f "$tmp/defines.awk"' "$ac_file_inputs" \14940 && eval '$AWK -f "$tmp/defines.awk"' "$ac_file_inputs" \
14887 || as_fn_error "could not create -" "$LINENO" 514941 || as_fn_error $? "could not create -" "$LINENO" 5
14888 fi14942 fi
14889 ;;14943 ;;
1489014944
@@ -14899,7 +14953,7 @@
14899ac_clean_files=$ac_clean_files_save14953ac_clean_files=$ac_clean_files_save
1490014954
14901test $ac_write_fail = 0 ||14955test $ac_write_fail = 0 ||
14902 as_fn_error "write failure creating $CONFIG_STATUS" "$LINENO" 514956 as_fn_error $? "write failure creating $CONFIG_STATUS" "$LINENO" 5
1490314957
1490414958
14905# configure is writing to config.log, and then calls config.status.14959# configure is writing to config.log, and then calls config.status.
@@ -14920,7 +14974,7 @@
14920 exec 5>>config.log14974 exec 5>>config.log
14921 # Use ||, not &&, to avoid exiting from the if with $? = 1, which14975 # Use ||, not &&, to avoid exiting from the if with $? = 1, which
14922 # would make configure fail if this is the last instruction.14976 # would make configure fail if this is the last instruction.
14923 $ac_cs_success || as_fn_exit $?14977 $ac_cs_success || as_fn_exit 1
14924fi14978fi
14925if test -n "$ac_unrecognized_opts" && test "$enable_option_checking" != no; then14979if test -n "$ac_unrecognized_opts" && test "$enable_option_checking" != no; then
14926 { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: unrecognized options: $ac_unrecognized_opts" >&514980 { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: unrecognized options: $ac_unrecognized_opts" >&5
1492714981
=== modified file 'configure.in'
--- configure.in 2010-08-31 19:51:07 +0000
+++ configure.in 2010-09-03 17:02:41 +0000
@@ -12,7 +12,7 @@
12 [],12 [],
13 [m4_fatal([Autoconf version $1 is required for Python], 63)])13 [m4_fatal([Autoconf version $1 is required for Python], 63)])
14])14])
15version_required(2.65)15AC_PREREQ(2.65)
1616
17AC_REVISION($Revision$)17AC_REVISION($Revision$)
18AC_INIT(python, PYTHON_VERSION, http://bugs.python.org/)18AC_INIT(python, PYTHON_VERSION, http://bugs.python.org/)
@@ -52,6 +52,7 @@
52AC_SUBST(VERSION)52AC_SUBST(VERSION)
53VERSION=PYTHON_VERSION53VERSION=PYTHON_VERSION
5454
55# Version number or Python's own shared library file.
55AC_SUBST(SOVERSION)56AC_SUBST(SOVERSION)
56SOVERSION=1.057SOVERSION=1.0
5758
@@ -817,6 +818,9 @@
817 esac818 esac
818fi819fi
819820
821# For calculating the .so ABI tag.
822SOABI_QUALIFIERS=""
823
820# Check for --with-pydebug824# Check for --with-pydebug
821AC_MSG_CHECKING(for --with-pydebug)825AC_MSG_CHECKING(for --with-pydebug)
822AC_ARG_WITH(pydebug, 826AC_ARG_WITH(pydebug,
@@ -828,6 +832,7 @@
828 [Define if you want to build an interpreter with many run-time checks.]) 832 [Define if you want to build an interpreter with many run-time checks.])
829 AC_MSG_RESULT(yes); 833 AC_MSG_RESULT(yes);
830 Py_DEBUG='true'834 Py_DEBUG='true'
835 SOABI_QUALIFIERS="${SOABI_QUALIFIERS}d"
831else AC_MSG_RESULT(no); Py_DEBUG='false'836else AC_MSG_RESULT(no); Py_DEBUG='false'
832fi],837fi],
833[AC_MSG_RESULT(no)])838[AC_MSG_RESULT(no)])
@@ -1649,34 +1654,6 @@
1649AC_SUBST(BLDSHARED)1654AC_SUBST(BLDSHARED)
1650AC_SUBST(CCSHARED)1655AC_SUBST(CCSHARED)
1651AC_SUBST(LINKFORSHARED)1656AC_SUBST(LINKFORSHARED)
1652# SO is the extension of shared libraries `(including the dot!)
1653# -- usually .so, .sl on HP-UX, .dll on Cygwin
1654AC_MSG_CHECKING(SO)
1655if test -z "$SO"
1656then
1657 case $ac_sys_system in
1658 hp*|HP*)
1659 case `uname -m` in
1660 ia64) SO=.so;;
1661 *) SO=.sl;;
1662 esac
1663 ;;
1664 CYGWIN*) SO=.dll;;
1665 *) SO=.so;;
1666 esac
1667else
1668 # this might also be a termcap variable, see #610332
1669 echo
1670 echo '====================================================================='
1671 echo '+ +'
1672 echo '+ WARNING: You have set SO in your environment. +'
1673 echo '+ Do you really mean to change the extension for shared libraries? +'
1674 echo '+ Continuing in 10 seconds to let you to ponder. +'
1675 echo '+ +'
1676 echo '====================================================================='
1677 sleep 10
1678fi
1679AC_MSG_RESULT($SO)
16801657
1681AC_DEFINE_UNQUOTED(SHLIB_EXT, "$SO", [Define this to be extension of shared libraries (including the dot!).])1658AC_DEFINE_UNQUOTED(SHLIB_EXT, "$SO", [Define this to be extension of shared libraries (including the dot!).])
1682# LDSHARED is the ld *command* used to create shared library1659# LDSHARED is the ld *command* used to create shared library
@@ -2487,7 +2464,9 @@
2487 AS_HELP_STRING([--with(out)-pymalloc], [disable/enable specialized mallocs]))2464 AS_HELP_STRING([--with(out)-pymalloc], [disable/enable specialized mallocs]))
24882465
2489if test -z "$with_pymalloc"2466if test -z "$with_pymalloc"
2490then with_pymalloc="yes"2467then
2468 with_pymalloc="yes"
2469 SOABI_QUALIFIERS="${SOABI_QUALIFIERS}m"
2491fi2470fi
2492if test "$with_pymalloc" != "no"2471if test "$with_pymalloc" != "no"
2493then2472then
@@ -3595,7 +3574,7 @@
3595],3574],
3596[3575[
3597case "$have_ucs4_tcl" in3576case "$have_ucs4_tcl" in
3598 yes) unicode_size="4" ;;3577 yes) unicode_size="4";;
3599 *) unicode_size="2" ;;3578 *) unicode_size="2" ;;
3600esac3579esac
3601])3580])
@@ -3603,7 +3582,10 @@
3603AH_TEMPLATE(Py_UNICODE_SIZE,3582AH_TEMPLATE(Py_UNICODE_SIZE,
3604 [Define as the size of the unicode type.])3583 [Define as the size of the unicode type.])
3605case "$unicode_size" in3584case "$unicode_size" in
3606 4) AC_DEFINE(Py_UNICODE_SIZE, 4) ;;3585 4)
3586 AC_DEFINE(Py_UNICODE_SIZE, 4)
3587 SOABI_QUALIFIERS="${SOABI_QUALIFIERS}u"
3588 ;;
3607 *) AC_DEFINE(Py_UNICODE_SIZE, 2) ;;3589 *) AC_DEFINE(Py_UNICODE_SIZE, 2) ;;
3608esac3590esac
36093591
@@ -3636,6 +3618,55 @@
3636# check for endianness3618# check for endianness
3637AC_C_BIGENDIAN3619AC_C_BIGENDIAN
36383620
3621# ABI version string for Python extension modules. This appears between the
3622# periods in shared library file names, e.g. foo.<SOABI>.so. It is calculated
3623# from the following attributes which affect the ABI of this Python build (in
3624# this order):
3625#
3626# * The Python implementation (always 'cpython-' for us)
3627# * The major and minor version numbers
3628# * --with-pydebug (adds a 'd')
3629# * --with-pymalloc (adds a 'm')
3630# * --with-wide-unicode (adds a 'u')
3631#
3632# Thus for example, Python 3.2 built with wide unicode, pydebug, and pymalloc,
3633# would get a shared library ABI version tag of 'cpython-32udm' and shared
3634# libraries would be named 'foo.cpython-32udm.so'.
3635AC_SUBST(SOABI)
3636AC_MSG_CHECKING(SOABI)
3637SOABI='cpython-'`echo $VERSION | tr -d .`${SOABI_QUALIFIERS}
3638AC_MSG_RESULT($SOABI)
3639
3640# SO is the extension of shared libraries `(including the dot!)
3641# -- usually .so, .sl on HP-UX, .dll on Cygwin
3642AC_MSG_CHECKING(SO)
3643if test -z "$SO"
3644then
3645 case $ac_sys_system in
3646 hp*|HP*)
3647 case `uname -m` in
3648 ia64) SO=.so;;
3649 *) SO=.sl;;
3650 esac
3651 ;;
3652 CYGWIN*) SO=.dll;;
3653 Linux*) SO=.${SOABI}.so;;
3654 *) SO=.so;;
3655 esac
3656else
3657 # this might also be a termcap variable, see #610332
3658 echo
3659 echo '====================================================================='
3660 echo '+ +'
3661 echo '+ WARNING: You have set SO in your environment. +'
3662 echo '+ Do you really mean to change the extension for shared libraries? +'
3663 echo '+ Continuing in 10 seconds to let you to ponder. +'
3664 echo '+ +'
3665 echo '====================================================================='
3666 sleep 10
3667fi
3668AC_MSG_RESULT($SO)
3669
3639# Check whether right shifting a negative integer extends the sign bit3670# Check whether right shifting a negative integer extends the sign bit
3640# or fills with zeros (like the Cray J90, according to Tim Peters).3671# or fills with zeros (like the Cray J90, according to Tim Peters).
3641AC_MSG_CHECKING(whether right shift extends the sign bit)3672AC_MSG_CHECKING(whether right shift extends the sign bit)
36423673
=== modified file 'pyconfig.h.in'
--- pyconfig.h.in 2010-08-31 19:51:07 +0000
+++ pyconfig.h.in 2010-09-03 17:02:41 +0000
@@ -1040,7 +1040,7 @@
1040/* Define to 1 if your <sys/time.h> declares `struct tm'. */1040/* Define to 1 if your <sys/time.h> declares `struct tm'. */
1041#undef TM_IN_SYS_TIME1041#undef TM_IN_SYS_TIME
10421042
1043/* Define to 0 if you don't want to use computed gotos in ceval.c. */1043/* Define if you want to use computed gotos in ceval.c. */
1044#undef USE_COMPUTED_GOTOS1044#undef USE_COMPUTED_GOTOS
10451045
1046/* Define if the compiler supports the inline keyword */1046/* Define if the compiler supports the inline keyword */

Subscribers

People subscribed via source and target branches

to all changes: