Merge lp:~barry/python/sovers into lp:python/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
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

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'Lib/distutils/tests/test_build_ext.py'
2--- Lib/distutils/tests/test_build_ext.py 2010-07-22 11:50:05 +0000
3+++ Lib/distutils/tests/test_build_ext.py 2010-09-03 17:02:41 +0000
4@@ -323,8 +323,8 @@
5 finally:
6 os.chdir(old_wd)
7 self.assertTrue(os.path.exists(so_file))
8- self.assertEquals(os.path.splitext(so_file)[-1],
9- sysconfig.get_config_var('SO'))
10+ so_ext = sysconfig.get_config_var('SO')
11+ self.assertTrue(so_file.endswith(so_ext))
12 so_dir = os.path.dirname(so_file)
13 self.assertEquals(so_dir, other_tmp_dir)
14
15@@ -333,8 +333,7 @@
16 cmd.run()
17 so_file = cmd.get_outputs()[0]
18 self.assertTrue(os.path.exists(so_file))
19- self.assertEquals(os.path.splitext(so_file)[-1],
20- sysconfig.get_config_var('SO'))
21+ self.assertTrue(so_file.endswith(so_ext))
22 so_dir = os.path.dirname(so_file)
23 self.assertEquals(so_dir, cmd.build_lib)
24
25
26=== modified file 'Makefile.pre.in'
27--- Makefile.pre.in 2010-08-15 14:47:25 +0000
28+++ Makefile.pre.in 2010-09-03 17:02:41 +0000
29@@ -35,6 +35,7 @@
30 AR= @AR@
31 RANLIB= @RANLIB@
32 SVNVERSION= @SVNVERSION@
33+SOABI= @SOABI@
34
35 GNULD= @GNULD@
36
37@@ -559,6 +560,11 @@
38 Modules/python.o: $(srcdir)/Modules/python.c
39 $(MAINCC) -c $(PY_CORE_CFLAGS) -o $@ $(srcdir)/Modules/python.c
40
41+Python/dynload_shlib.o: $(srcdir)/Python/dynload_shlib.c Makefile
42+ $(CC) -c $(PY_CORE_CFLAGS) \
43+ -DSOABI='"$(SOABI)"' \
44+ -o $@ $(srcdir)/Python/dynload_shlib.c
45+
46 $(IO_OBJS): $(IO_H)
47
48 # Use a stamp file to prevent make -j invoking pgen twice
49
50=== modified file 'Python/dynload_shlib.c'
51--- Python/dynload_shlib.c 2010-05-09 14:52:27 +0000
52+++ Python/dynload_shlib.c 2010-09-03 17:02:41 +0000
53@@ -30,27 +30,34 @@
54 #define LEAD_UNDERSCORE ""
55 #endif
56
57+/* The .so extension module ABI tag, supplied by the Makefile via
58+ Makefile.pre.in and configure. This is used to discriminate between
59+ incompatible .so files so that extensions for different Python builds can
60+ live in the same directory. E.g. foomodule.cpython-32.so
61+*/
62
63 const struct filedescr _PyImport_DynLoadFiletab[] = {
64 #ifdef __CYGWIN__
65 {".dll", "rb", C_EXTENSION},
66 {"module.dll", "rb", C_EXTENSION},
67-#else
68+#else /* !__CYGWIN__ */
69 #if defined(PYOS_OS2) && defined(PYCC_GCC)
70 {".pyd", "rb", C_EXTENSION},
71 {".dll", "rb", C_EXTENSION},
72-#else
73+#else /* !(defined(PYOS_OS2) && defined(PYCC_GCC)) */
74 #ifdef __VMS
75 {".exe", "rb", C_EXTENSION},
76 {".EXE", "rb", C_EXTENSION},
77 {"module.exe", "rb", C_EXTENSION},
78 {"MODULE.EXE", "rb", C_EXTENSION},
79-#else
80+#else /* !__VMS */
81+ {"." SOABI ".so", "rb", C_EXTENSION},
82 {".so", "rb", C_EXTENSION},
83+ {"module." SOABI ".so", "rb", C_EXTENSION},
84 {"module.so", "rb", C_EXTENSION},
85-#endif
86-#endif
87-#endif
88+#endif /* __VMS */
89+#endif /* defined(PYOS_OS2) && defined(PYCC_GCC) */
90+#endif /* __CYGWIN__ */
91 {0, 0}
92 };
93
94
95=== modified file 'configure'
96--- configure 2010-08-31 19:51:07 +0000
97+++ configure 2010-09-03 17:02:41 +0000
98@@ -1,14 +1,14 @@
99 #! /bin/sh
100 # From configure.in Revision: 83986 .
101 # Guess values for system-dependent variables and create Makefiles.
102-# Generated by GNU Autoconf 2.65 for python 3.2.
103+# Generated by GNU Autoconf 2.67 for python 3.2.
104 #
105 # Report bugs to <http://bugs.python.org/>.
106 #
107 #
108 # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
109-# 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation,
110-# Inc.
111+# 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 Free Software
112+# Foundation, Inc.
113 #
114 #
115 # This configure script is free software; the Free Software Foundation
116@@ -320,7 +320,7 @@
117 test -d "$as_dir" && break
118 done
119 test -z "$as_dirs" || eval "mkdir $as_dirs"
120- } || test -d "$as_dir" || as_fn_error "cannot create directory $as_dir"
121+ } || test -d "$as_dir" || as_fn_error $? "cannot create directory $as_dir"
122
123
124 } # as_fn_mkdir_p
125@@ -360,19 +360,19 @@
126 fi # as_fn_arith
127
128
129-# as_fn_error ERROR [LINENO LOG_FD]
130-# ---------------------------------
131+# as_fn_error STATUS ERROR [LINENO LOG_FD]
132+# ----------------------------------------
133 # Output "`basename $0`: error: ERROR" to stderr. If LINENO and LOG_FD are
134 # provided, also output the error to LOG_FD, referencing LINENO. Then exit the
135-# script with status $?, using 1 if that was 0.
136+# script with STATUS, using 1 if that was 0.
137 as_fn_error ()
138 {
139- as_status=$?; test $as_status -eq 0 && as_status=1
140- if test "$3"; then
141- as_lineno=${as_lineno-"$2"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
142- $as_echo "$as_me:${as_lineno-$LINENO}: error: $1" >&$3
143+ as_status=$1; test $as_status -eq 0 && as_status=1
144+ if test "$4"; then
145+ as_lineno=${as_lineno-"$3"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
146+ $as_echo "$as_me:${as_lineno-$LINENO}: error: $2" >&$4
147 fi
148- $as_echo "$as_me: error: $1" >&2
149+ $as_echo "$as_me: error: $2" >&2
150 as_fn_exit $as_status
151 } # as_fn_error
152
153@@ -534,7 +534,7 @@
154 exec 6>&1
155
156 # Name of the host.
157-# hostname on some systems (SVR3.2, Linux) returns a bogus exit status,
158+# hostname on some systems (SVR3.2, old GNU/Linux) returns a bogus exit status,
159 # so uname gets run too.
160 ac_hostname=`(hostname || uname -n) 2>/dev/null | sed 1q`
161
162@@ -598,6 +598,7 @@
163 ac_subst_vars='LTLIBOBJS
164 SRCDIRS
165 THREADHEADERS
166+SOABI
167 LIBC
168 LIBM
169 HAVE_GETHOSTBYNAME
170@@ -825,8 +826,9 @@
171 fi
172
173 case $ac_option in
174- *=*) ac_optarg=`expr "X$ac_option" : '[^=]*=\(.*\)'` ;;
175- *) ac_optarg=yes ;;
176+ *=?*) ac_optarg=`expr "X$ac_option" : '[^=]*=\(.*\)'` ;;
177+ *=) ac_optarg= ;;
178+ *) ac_optarg=yes ;;
179 esac
180
181 # Accept the important Cygnus configure options, so we can diagnose typos.
182@@ -871,7 +873,7 @@
183 ac_useropt=`expr "x$ac_option" : 'x-*disable-\(.*\)'`
184 # Reject names that are not valid shell variable names.
185 expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
186- as_fn_error "invalid feature name: $ac_useropt"
187+ as_fn_error $? "invalid feature name: $ac_useropt"
188 ac_useropt_orig=$ac_useropt
189 ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
190 case $ac_user_opts in
191@@ -897,7 +899,7 @@
192 ac_useropt=`expr "x$ac_option" : 'x-*enable-\([^=]*\)'`
193 # Reject names that are not valid shell variable names.
194 expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
195- as_fn_error "invalid feature name: $ac_useropt"
196+ as_fn_error $? "invalid feature name: $ac_useropt"
197 ac_useropt_orig=$ac_useropt
198 ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
199 case $ac_user_opts in
200@@ -1101,7 +1103,7 @@
201 ac_useropt=`expr "x$ac_option" : 'x-*with-\([^=]*\)'`
202 # Reject names that are not valid shell variable names.
203 expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
204- as_fn_error "invalid package name: $ac_useropt"
205+ as_fn_error $? "invalid package name: $ac_useropt"
206 ac_useropt_orig=$ac_useropt
207 ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
208 case $ac_user_opts in
209@@ -1117,7 +1119,7 @@
210 ac_useropt=`expr "x$ac_option" : 'x-*without-\(.*\)'`
211 # Reject names that are not valid shell variable names.
212 expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
213- as_fn_error "invalid package name: $ac_useropt"
214+ as_fn_error $? "invalid package name: $ac_useropt"
215 ac_useropt_orig=$ac_useropt
216 ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
217 case $ac_user_opts in
218@@ -1147,8 +1149,8 @@
219 | --x-librar=* | --x-libra=* | --x-libr=* | --x-lib=* | --x-li=* | --x-l=*)
220 x_libraries=$ac_optarg ;;
221
222- -*) as_fn_error "unrecognized option: \`$ac_option'
223-Try \`$0 --help' for more information."
224+ -*) as_fn_error $? "unrecognized option: \`$ac_option'
225+Try \`$0 --help' for more information"
226 ;;
227
228 *=*)
229@@ -1156,7 +1158,7 @@
230 # Reject names that are not valid shell variable names.
231 case $ac_envvar in #(
232 '' | [0-9]* | *[!_$as_cr_alnum]* )
233- as_fn_error "invalid variable name: \`$ac_envvar'" ;;
234+ as_fn_error $? "invalid variable name: \`$ac_envvar'" ;;
235 esac
236 eval $ac_envvar=\$ac_optarg
237 export $ac_envvar ;;
238@@ -1174,13 +1176,13 @@
239
240 if test -n "$ac_prev"; then
241 ac_option=--`echo $ac_prev | sed 's/_/-/g'`
242- as_fn_error "missing argument to $ac_option"
243+ as_fn_error $? "missing argument to $ac_option"
244 fi
245
246 if test -n "$ac_unrecognized_opts"; then
247 case $enable_option_checking in
248 no) ;;
249- fatal) as_fn_error "unrecognized options: $ac_unrecognized_opts" ;;
250+ fatal) as_fn_error $? "unrecognized options: $ac_unrecognized_opts" ;;
251 *) $as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2 ;;
252 esac
253 fi
254@@ -1203,7 +1205,7 @@
255 [\\/$]* | ?:[\\/]* ) continue;;
256 NONE | '' ) case $ac_var in *prefix ) continue;; esac;;
257 esac
258- as_fn_error "expected an absolute directory name for --$ac_var: $ac_val"
259+ as_fn_error $? "expected an absolute directory name for --$ac_var: $ac_val"
260 done
261
262 # There might be people who depend on the old broken behavior: `$host'
263@@ -1217,8 +1219,8 @@
264 if test "x$host_alias" != x; then
265 if test "x$build_alias" = x; then
266 cross_compiling=maybe
267- $as_echo "$as_me: WARNING: If you wanted to set the --build type, don't use --host.
268- If a cross compiler is detected then cross compile mode will be used." >&2
269+ $as_echo "$as_me: WARNING: if you wanted to set the --build type, don't use --host.
270+ If a cross compiler is detected then cross compile mode will be used" >&2
271 elif test "x$build_alias" != "x$host_alias"; then
272 cross_compiling=yes
273 fi
274@@ -1233,9 +1235,9 @@
275 ac_pwd=`pwd` && test -n "$ac_pwd" &&
276 ac_ls_di=`ls -di .` &&
277 ac_pwd_ls_di=`cd "$ac_pwd" && ls -di .` ||
278- as_fn_error "working directory cannot be determined"
279+ as_fn_error $? "working directory cannot be determined"
280 test "X$ac_ls_di" = "X$ac_pwd_ls_di" ||
281- as_fn_error "pwd does not report name of working directory"
282+ as_fn_error $? "pwd does not report name of working directory"
283
284
285 # Find the source files, if location was not specified.
286@@ -1274,11 +1276,11 @@
287 fi
288 if test ! -r "$srcdir/$ac_unique_file"; then
289 test "$ac_srcdir_defaulted" = yes && srcdir="$ac_confdir or .."
290- as_fn_error "cannot find sources ($ac_unique_file) in $srcdir"
291+ as_fn_error $? "cannot find sources ($ac_unique_file) in $srcdir"
292 fi
293 ac_msg="sources are in $srcdir, but \`cd $srcdir' does not work"
294 ac_abs_confdir=`(
295- cd "$srcdir" && test -r "./$ac_unique_file" || as_fn_error "$ac_msg"
296+ cd "$srcdir" && test -r "./$ac_unique_file" || as_fn_error $? "$ac_msg"
297 pwd)`
298 # When building in place, set srcdir=.
299 if test "$ac_abs_confdir" = "$ac_pwd"; then
300@@ -1318,7 +1320,7 @@
301 --help=short display options specific to this package
302 --help=recursive display the short help of all the included packages
303 -V, --version display version information and exit
304- -q, --quiet, --silent do not print \`checking...' messages
305+ -q, --quiet, --silent do not print \`checking ...' messages
306 --cache-file=FILE cache test results in FILE [disabled]
307 -C, --config-cache alias for \`--cache-file=config.cache'
308 -n, --no-create do not create output files
309@@ -1503,9 +1505,9 @@
310 if $ac_init_version; then
311 cat <<\_ACEOF
312 python configure 3.2
313-generated by GNU Autoconf 2.65
314+generated by GNU Autoconf 2.67
315
316-Copyright (C) 2009 Free Software Foundation, Inc.
317+Copyright (C) 2010 Free Software Foundation, Inc.
318 This configure script is free software; the Free Software Foundation
319 gives unlimited permission to copy, distribute and modify it.
320 _ACEOF
321@@ -1575,7 +1577,7 @@
322 mv -f conftest.er1 conftest.err
323 fi
324 $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
325- test $ac_status = 0; } >/dev/null && {
326+ test $ac_status = 0; } > conftest.i && {
327 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
328 test ! -s conftest.err
329 }; then :
330@@ -1599,10 +1601,10 @@
331 ac_fn_c_check_header_mongrel ()
332 {
333 as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
334- if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then :
335+ if eval "test \"\${$3+set}\"" = set; then :
336 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
337 $as_echo_n "checking for $2... " >&6; }
338-if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then :
339+if eval "test \"\${$3+set}\"" = set; then :
340 $as_echo_n "(cached) " >&6
341 fi
342 eval ac_res=\$$3
343@@ -1638,7 +1640,7 @@
344 else
345 ac_header_preproc=no
346 fi
347-rm -f conftest.err conftest.$ac_ext
348+rm -f conftest.err conftest.i conftest.$ac_ext
349 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_header_preproc" >&5
350 $as_echo "$ac_header_preproc" >&6; }
351
352@@ -1661,17 +1663,15 @@
353 $as_echo "$as_me: WARNING: $2: section \"Present But Cannot Be Compiled\"" >&2;}
354 { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: proceeding with the compiler's result" >&5
355 $as_echo "$as_me: WARNING: $2: proceeding with the compiler's result" >&2;}
356-( cat <<\_ASBOX
357-## -------------------------------------- ##
358+( $as_echo "## -------------------------------------- ##
359 ## Report this to http://bugs.python.org/ ##
360-## -------------------------------------- ##
361-_ASBOX
362+## -------------------------------------- ##"
363 ) | sed "s/^/$as_me: WARNING: /" >&2
364 ;;
365 esac
366 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
367 $as_echo_n "checking for $2... " >&6; }
368-if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then :
369+if eval "test \"\${$3+set}\"" = set; then :
370 $as_echo_n "(cached) " >&6
371 else
372 eval "$3=\$ac_header_compiler"
373@@ -1735,7 +1735,7 @@
374 as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
375 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
376 $as_echo_n "checking for $2... " >&6; }
377-if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then :
378+if eval "test \"\${$3+set}\"" = set; then :
379 $as_echo_n "(cached) " >&6
380 else
381 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
382@@ -1812,7 +1812,7 @@
383 as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
384 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
385 $as_echo_n "checking for $2... " >&6; }
386-if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then :
387+if eval "test \"\${$3+set}\"" = set; then :
388 $as_echo_n "(cached) " >&6
389 else
390 eval "$3=no"
391@@ -1866,7 +1866,7 @@
392 as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
393 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for uint$2_t" >&5
394 $as_echo_n "checking for uint$2_t... " >&6; }
395-if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then :
396+if eval "test \"\${$3+set}\"" = set; then :
397 $as_echo_n "(cached) " >&6
398 else
399 eval "$3=no"
400@@ -1896,8 +1896,7 @@
401 esac
402 fi
403 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
404- eval as_val=\$$3
405- if test "x$as_val" = x""no; then :
406+ if eval test \"x\$"$3"\" = x"no"; then :
407
408 else
409 break
410@@ -1920,7 +1919,7 @@
411 as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
412 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for int$2_t" >&5
413 $as_echo_n "checking for int$2_t... " >&6; }
414-if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then :
415+if eval "test \"\${$3+set}\"" = set; then :
416 $as_echo_n "(cached) " >&6
417 else
418 eval "$3=no"
419@@ -1971,8 +1970,7 @@
420 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
421 fi
422 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
423- eval as_val=\$$3
424- if test "x$as_val" = x""no; then :
425+ if eval test \"x\$"$3"\" = x"no"; then :
426
427 else
428 break
429@@ -2172,7 +2170,7 @@
430 as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
431 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
432 $as_echo_n "checking for $2... " >&6; }
433-if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then :
434+if eval "test \"\${$3+set}\"" = set; then :
435 $as_echo_n "(cached) " >&6
436 else
437 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
438@@ -2240,7 +2238,7 @@
439 as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
440 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2.$3" >&5
441 $as_echo_n "checking for $2.$3... " >&6; }
442-if { as_var=$4; eval "test \"\${$as_var+set}\" = set"; }; then :
443+if eval "test \"\${$4+set}\"" = set; then :
444 $as_echo_n "(cached) " >&6
445 else
446 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
447@@ -2288,15 +2286,18 @@
448
449 } # ac_fn_c_check_member
450
451-# ac_fn_c_check_decl LINENO SYMBOL VAR
452-# ------------------------------------
453-# Tests whether SYMBOL is declared, setting cache variable VAR accordingly.
454+# ac_fn_c_check_decl LINENO SYMBOL VAR INCLUDES
455+# ---------------------------------------------
456+# Tests whether SYMBOL is declared in INCLUDES, setting cache variable VAR
457+# accordingly.
458 ac_fn_c_check_decl ()
459 {
460 as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
461- { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $2 is declared" >&5
462-$as_echo_n "checking whether $2 is declared... " >&6; }
463-if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then :
464+ as_decl_name=`echo $2|sed 's/ *(.*//'`
465+ as_decl_use=`echo $2|sed -e 's/(/((/' -e 's/)/) 0&/' -e 's/,/) 0& (/g'`
466+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $as_decl_name is declared" >&5
467+$as_echo_n "checking whether $as_decl_name is declared... " >&6; }
468+if eval "test \"\${$3+set}\"" = set; then :
469 $as_echo_n "(cached) " >&6
470 else
471 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
472@@ -2305,8 +2306,12 @@
473 int
474 main ()
475 {
476-#ifndef $2
477- (void) $2;
478+#ifndef $as_decl_name
479+#ifdef __cplusplus
480+ (void) $as_decl_use;
481+#else
482+ (void) $as_decl_name;
483+#endif
484 #endif
485
486 ;
487@@ -2331,7 +2336,7 @@
488 running configure, to aid debugging if configure makes a mistake.
489
490 It was created by python $as_me 3.2, which was
491-generated by GNU Autoconf 2.65. Invocation command line was
492+generated by GNU Autoconf 2.67. Invocation command line was
493
494 $ $0 $@
495
496@@ -2441,11 +2446,9 @@
497 {
498 echo
499
500- cat <<\_ASBOX
501-## ---------------- ##
502+ $as_echo "## ---------------- ##
503 ## Cache variables. ##
504-## ---------------- ##
505-_ASBOX
506+## ---------------- ##"
507 echo
508 # The following way of writing the cache mishandles newlines in values,
509 (
510@@ -2479,11 +2482,9 @@
511 )
512 echo
513
514- cat <<\_ASBOX
515-## ----------------- ##
516+ $as_echo "## ----------------- ##
517 ## Output variables. ##
518-## ----------------- ##
519-_ASBOX
520+## ----------------- ##"
521 echo
522 for ac_var in $ac_subst_vars
523 do
524@@ -2496,11 +2497,9 @@
525 echo
526
527 if test -n "$ac_subst_files"; then
528- cat <<\_ASBOX
529-## ------------------- ##
530+ $as_echo "## ------------------- ##
531 ## File substitutions. ##
532-## ------------------- ##
533-_ASBOX
534+## ------------------- ##"
535 echo
536 for ac_var in $ac_subst_files
537 do
538@@ -2514,11 +2513,9 @@
539 fi
540
541 if test -s confdefs.h; then
542- cat <<\_ASBOX
543-## ----------- ##
544+ $as_echo "## ----------- ##
545 ## confdefs.h. ##
546-## ----------- ##
547-_ASBOX
548+## ----------- ##"
549 echo
550 cat confdefs.h
551 echo
552@@ -2573,7 +2570,12 @@
553 ac_site_file1=NONE
554 ac_site_file2=NONE
555 if test -n "$CONFIG_SITE"; then
556- ac_site_file1=$CONFIG_SITE
557+ # We do not want a PATH search for config.site.
558+ case $CONFIG_SITE in #((
559+ -*) ac_site_file1=./$CONFIG_SITE;;
560+ */*) ac_site_file1=$CONFIG_SITE;;
561+ *) ac_site_file1=./$CONFIG_SITE;;
562+ esac
563 elif test "x$prefix" != xNONE; then
564 ac_site_file1=$prefix/share/config.site
565 ac_site_file2=$prefix/etc/config.site
566@@ -2588,7 +2590,11 @@
567 { $as_echo "$as_me:${as_lineno-$LINENO}: loading site script $ac_site_file" >&5
568 $as_echo "$as_me: loading site script $ac_site_file" >&6;}
569 sed 's/^/| /' "$ac_site_file" >&5
570- . "$ac_site_file"
571+ . "$ac_site_file" \
572+ || { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
573+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
574+as_fn_error $? "failed to load site script $ac_site_file
575+See \`config.log' for more details" "$LINENO" 5 ; }
576 fi
577 done
578
579@@ -2664,7 +2670,7 @@
580 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
581 { $as_echo "$as_me:${as_lineno-$LINENO}: error: changes in the environment can compromise the build" >&5
582 $as_echo "$as_me: error: changes in the environment can compromise the build" >&2;}
583- as_fn_error "run \`make distclean' and/or \`rm $cache_file' and start over" "$LINENO" 5
584+ as_fn_error $? "run \`make distclean' and/or \`rm $cache_file' and start over" "$LINENO" 5
585 fi
586 ## -------------------- ##
587 ## Main body of script. ##
588@@ -2698,6 +2704,7 @@
589
590 VERSION=3.2
591
592+# Version number or Python's own shared library file.
593
594 SOVERSION=1.0
595
596@@ -2764,7 +2771,7 @@
597 UNIVERSALSDK=$enableval
598 if test ! -d "${UNIVERSALSDK}"
599 then
600- as_fn_error "--enable-universalsdk specifies non-existing SDK: ${UNIVERSALSDK}" "$LINENO" 5
601+ as_fn_error $? "--enable-universalsdk specifies non-existing SDK: ${UNIVERSALSDK}" "$LINENO" 5
602 fi
603 ;;
604 esac
605@@ -3156,7 +3163,7 @@
606 # If the user switches compilers, we can't believe the cache
607 if test ! -z "$ac_cv_prog_CC" -a ! -z "$CC" -a "$CC" != "$ac_cv_prog_CC"
608 then
609- as_fn_error "cached CC is different -- throw away $cache_file
610+ as_fn_error $? "cached CC is different -- throw away $cache_file
611 (it is also a good idea to do 'make clean' before compiling)" "$LINENO" 5
612 fi
613
614@@ -3466,8 +3473,8 @@
615
616 test -z "$CC" && { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
617 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
618-as_fn_error "no acceptable C compiler found in \$PATH
619-See \`config.log' for more details." "$LINENO" 5; }
620+as_fn_error $? "no acceptable C compiler found in \$PATH
621+See \`config.log' for more details" "$LINENO" 5 ; }
622
623 # Provide some information about the compiler.
624 $as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler version" >&5
625@@ -3581,9 +3588,8 @@
626
627 { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
628 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
629-{ as_fn_set_status 77
630-as_fn_error "C compiler cannot create executables
631-See \`config.log' for more details." "$LINENO" 5; }; }
632+as_fn_error 77 "C compiler cannot create executables
633+See \`config.log' for more details" "$LINENO" 5 ; }
634 else
635 { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
636 $as_echo "yes" >&6; }
637@@ -3625,8 +3631,8 @@
638 else
639 { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
640 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
641-as_fn_error "cannot compute suffix of executables: cannot compile and link
642-See \`config.log' for more details." "$LINENO" 5; }
643+as_fn_error $? "cannot compute suffix of executables: cannot compile and link
644+See \`config.log' for more details" "$LINENO" 5 ; }
645 fi
646 rm -f conftest conftest$ac_cv_exeext
647 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_exeext" >&5
648@@ -3683,9 +3689,9 @@
649 else
650 { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
651 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
652-as_fn_error "cannot run C compiled programs.
653+as_fn_error $? "cannot run C compiled programs.
654 If you meant to cross compile, use \`--host'.
655-See \`config.log' for more details." "$LINENO" 5; }
656+See \`config.log' for more details" "$LINENO" 5 ; }
657 fi
658 fi
659 fi
660@@ -3736,8 +3742,8 @@
661
662 { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
663 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
664-as_fn_error "cannot compute suffix of object files: cannot compile
665-See \`config.log' for more details." "$LINENO" 5; }
666+as_fn_error $? "cannot compute suffix of object files: cannot compile
667+See \`config.log' for more details" "$LINENO" 5 ; }
668 fi
669 rm -f conftest.$ac_cv_objext conftest.$ac_ext
670 fi
671@@ -4190,7 +4196,7 @@
672 # Broken: fails on valid input.
673 continue
674 fi
675-rm -f conftest.err conftest.$ac_ext
676+rm -f conftest.err conftest.i conftest.$ac_ext
677
678 # OK, works on sane cases. Now check whether nonexistent headers
679 # can be detected and how.
680@@ -4206,11 +4212,11 @@
681 ac_preproc_ok=:
682 break
683 fi
684-rm -f conftest.err conftest.$ac_ext
685+rm -f conftest.err conftest.i conftest.$ac_ext
686
687 done
688 # Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
689-rm -f conftest.err conftest.$ac_ext
690+rm -f conftest.i conftest.err conftest.$ac_ext
691 if $ac_preproc_ok; then :
692 break
693 fi
694@@ -4249,7 +4255,7 @@
695 # Broken: fails on valid input.
696 continue
697 fi
698-rm -f conftest.err conftest.$ac_ext
699+rm -f conftest.err conftest.i conftest.$ac_ext
700
701 # OK, works on sane cases. Now check whether nonexistent headers
702 # can be detected and how.
703@@ -4265,18 +4271,18 @@
704 ac_preproc_ok=:
705 break
706 fi
707-rm -f conftest.err conftest.$ac_ext
708+rm -f conftest.err conftest.i conftest.$ac_ext
709
710 done
711 # Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
712-rm -f conftest.err conftest.$ac_ext
713+rm -f conftest.i conftest.err conftest.$ac_ext
714 if $ac_preproc_ok; then :
715
716 else
717 { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
718 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
719-as_fn_error "C preprocessor \"$CPP\" fails sanity check
720-See \`config.log' for more details." "$LINENO" 5; }
721+as_fn_error $? "C preprocessor \"$CPP\" fails sanity check
722+See \`config.log' for more details" "$LINENO" 5 ; }
723 fi
724
725 ac_ext=c
726@@ -4337,7 +4343,7 @@
727 done
728 IFS=$as_save_IFS
729 if test -z "$ac_cv_path_GREP"; then
730- as_fn_error "no acceptable grep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5
731+ as_fn_error $? "no acceptable grep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5
732 fi
733 else
734 ac_cv_path_GREP=$GREP
735@@ -4403,7 +4409,7 @@
736 done
737 IFS=$as_save_IFS
738 if test -z "$ac_cv_path_EGREP"; then
739- as_fn_error "no acceptable egrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5
740+ as_fn_error $? "no acceptable egrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5
741 fi
742 else
743 ac_cv_path_EGREP=$EGREP
744@@ -4535,8 +4541,7 @@
745 as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
746 ac_fn_c_check_header_compile "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default
747 "
748-eval as_val=\$$as_ac_Header
749- if test "x$as_val" = x""yes; then :
750+if eval test \"x\$"$as_ac_Header"\" = x"yes"; then :
751 cat >>confdefs.h <<_ACEOF
752 #define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
753 _ACEOF
754@@ -5140,16 +5145,22 @@
755 esac
756 ac_aux_dir=
757 for ac_dir in "$srcdir" "$srcdir/.." "$srcdir/../.."; do
758- for ac_t in install-sh install.sh shtool; do
759- if test -f "$ac_dir/$ac_t"; then
760- ac_aux_dir=$ac_dir
761- ac_install_sh="$ac_aux_dir/$ac_t -c"
762- break 2
763- fi
764- done
765+ if test -f "$ac_dir/install-sh"; then
766+ ac_aux_dir=$ac_dir
767+ ac_install_sh="$ac_aux_dir/install-sh -c"
768+ break
769+ elif test -f "$ac_dir/install.sh"; then
770+ ac_aux_dir=$ac_dir
771+ ac_install_sh="$ac_aux_dir/install.sh -c"
772+ break
773+ elif test -f "$ac_dir/shtool"; then
774+ ac_aux_dir=$ac_dir
775+ ac_install_sh="$ac_aux_dir/shtool install -c"
776+ break
777+ fi
778 done
779 if test -z "$ac_aux_dir"; then
780- as_fn_error "cannot find install-sh, install.sh, or shtool in \"$srcdir\" \"$srcdir/..\" \"$srcdir/../..\"" "$LINENO" 5
781+ as_fn_error $? "cannot find install-sh, install.sh, or shtool in \"$srcdir\" \"$srcdir/..\" \"$srcdir/../..\"" "$LINENO" 5
782 fi
783
784 # These three variables are undocumented and unsupported,
785@@ -5264,6 +5275,9 @@
786 esac
787 fi
788
789+# For calculating the .so ABI tag.
790+SOABI_QUALIFIERS=""
791+
792 # Check for --with-pydebug
793 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for --with-pydebug" >&5
794 $as_echo_n "checking for --with-pydebug... " >&6; }
795@@ -5279,6 +5293,7 @@
796 { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
797 $as_echo "yes" >&6; };
798 Py_DEBUG='true'
799+ SOABI_QUALIFIERS="${SOABI_QUALIFIERS}d"
800 else { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
801 $as_echo "no" >&6; }; Py_DEBUG='false'
802 fi
803@@ -5482,7 +5497,7 @@
804 ARCH_RUN_32BIT="/usr/bin/arch -i386 -ppc"
805
806 else
807- as_fn_error "proper usage is --with-universal-arch=32-bit|64-bit|all|intel|3-way" "$LINENO" 5
808+ as_fn_error $? "proper usage is --with-universal-arch=32-bit|64-bit|all|intel|3-way" "$LINENO" 5
809
810 fi
811
812@@ -6059,8 +6074,7 @@
813 do :
814 as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
815 ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default"
816-eval as_val=\$$as_ac_Header
817- if test "x$as_val" = x""yes; then :
818+if eval test \"x\$"$as_ac_Header"\" = x"yes"; then :
819 cat >>confdefs.h <<_ACEOF
820 #define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
821 _ACEOF
822@@ -6074,7 +6088,7 @@
823 as_ac_Header=`$as_echo "ac_cv_header_dirent_$ac_hdr" | $as_tr_sh`
824 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_hdr that defines DIR" >&5
825 $as_echo_n "checking for $ac_hdr that defines DIR... " >&6; }
826-if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then :
827+if eval "test \"\${$as_ac_Header+set}\"" = set; then :
828 $as_echo_n "(cached) " >&6
829 else
830 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
831@@ -6101,8 +6115,7 @@
832 eval ac_res=\$$as_ac_Header
833 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
834 $as_echo "$ac_res" >&6; }
835-eval as_val=\$$as_ac_Header
836- if test "x$as_val" = x""yes; then :
837+if eval test \"x\$"$as_ac_Header"\" = x"yes"; then :
838 cat >>confdefs.h <<_ACEOF
839 #define `$as_echo "HAVE_$ac_hdr" | $as_tr_cpp` 1
840 _ACEOF
841@@ -6622,9 +6635,8 @@
842 if test "$ac_cv_type_int" = yes; then
843 { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
844 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
845-{ as_fn_set_status 77
846-as_fn_error "cannot compute sizeof (int)
847-See \`config.log' for more details." "$LINENO" 5; }; }
848+as_fn_error 77 "cannot compute sizeof (int)
849+See \`config.log' for more details" "$LINENO" 5 ; }
850 else
851 ac_cv_sizeof_int=0
852 fi
853@@ -6656,9 +6668,8 @@
854 if test "$ac_cv_type_long" = yes; then
855 { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
856 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
857-{ as_fn_set_status 77
858-as_fn_error "cannot compute sizeof (long)
859-See \`config.log' for more details." "$LINENO" 5; }; }
860+as_fn_error 77 "cannot compute sizeof (long)
861+See \`config.log' for more details" "$LINENO" 5 ; }
862 else
863 ac_cv_sizeof_long=0
864 fi
865@@ -6690,9 +6701,8 @@
866 if test "$ac_cv_type_void_p" = yes; then
867 { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
868 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
869-{ as_fn_set_status 77
870-as_fn_error "cannot compute sizeof (void *)
871-See \`config.log' for more details." "$LINENO" 5; }; }
872+as_fn_error 77 "cannot compute sizeof (void *)
873+See \`config.log' for more details" "$LINENO" 5 ; }
874 else
875 ac_cv_sizeof_void_p=0
876 fi
877@@ -6724,9 +6734,8 @@
878 if test "$ac_cv_type_short" = yes; then
879 { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
880 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
881-{ as_fn_set_status 77
882-as_fn_error "cannot compute sizeof (short)
883-See \`config.log' for more details." "$LINENO" 5; }; }
884+as_fn_error 77 "cannot compute sizeof (short)
885+See \`config.log' for more details" "$LINENO" 5 ; }
886 else
887 ac_cv_sizeof_short=0
888 fi
889@@ -6758,9 +6767,8 @@
890 if test "$ac_cv_type_float" = yes; then
891 { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
892 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
893-{ as_fn_set_status 77
894-as_fn_error "cannot compute sizeof (float)
895-See \`config.log' for more details." "$LINENO" 5; }; }
896+as_fn_error 77 "cannot compute sizeof (float)
897+See \`config.log' for more details" "$LINENO" 5 ; }
898 else
899 ac_cv_sizeof_float=0
900 fi
901@@ -6792,9 +6800,8 @@
902 if test "$ac_cv_type_double" = yes; then
903 { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
904 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
905-{ as_fn_set_status 77
906-as_fn_error "cannot compute sizeof (double)
907-See \`config.log' for more details." "$LINENO" 5; }; }
908+as_fn_error 77 "cannot compute sizeof (double)
909+See \`config.log' for more details" "$LINENO" 5 ; }
910 else
911 ac_cv_sizeof_double=0
912 fi
913@@ -6826,9 +6833,8 @@
914 if test "$ac_cv_type_fpos_t" = yes; then
915 { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
916 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
917-{ as_fn_set_status 77
918-as_fn_error "cannot compute sizeof (fpos_t)
919-See \`config.log' for more details." "$LINENO" 5; }; }
920+as_fn_error 77 "cannot compute sizeof (fpos_t)
921+See \`config.log' for more details" "$LINENO" 5 ; }
922 else
923 ac_cv_sizeof_fpos_t=0
924 fi
925@@ -6860,9 +6866,8 @@
926 if test "$ac_cv_type_size_t" = yes; then
927 { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
928 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
929-{ as_fn_set_status 77
930-as_fn_error "cannot compute sizeof (size_t)
931-See \`config.log' for more details." "$LINENO" 5; }; }
932+as_fn_error 77 "cannot compute sizeof (size_t)
933+See \`config.log' for more details" "$LINENO" 5 ; }
934 else
935 ac_cv_sizeof_size_t=0
936 fi
937@@ -6894,9 +6899,8 @@
938 if test "$ac_cv_type_pid_t" = yes; then
939 { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
940 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
941-{ as_fn_set_status 77
942-as_fn_error "cannot compute sizeof (pid_t)
943-See \`config.log' for more details." "$LINENO" 5; }; }
944+as_fn_error 77 "cannot compute sizeof (pid_t)
945+See \`config.log' for more details" "$LINENO" 5 ; }
946 else
947 ac_cv_sizeof_pid_t=0
948 fi
949@@ -6955,9 +6959,8 @@
950 if test "$ac_cv_type_long_long" = yes; then
951 { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
952 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
953-{ as_fn_set_status 77
954-as_fn_error "cannot compute sizeof (long long)
955-See \`config.log' for more details." "$LINENO" 5; }; }
956+as_fn_error 77 "cannot compute sizeof (long long)
957+See \`config.log' for more details" "$LINENO" 5 ; }
958 else
959 ac_cv_sizeof_long_long=0
960 fi
961@@ -7017,9 +7020,8 @@
962 if test "$ac_cv_type_long_double" = yes; then
963 { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
964 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
965-{ as_fn_set_status 77
966-as_fn_error "cannot compute sizeof (long double)
967-See \`config.log' for more details." "$LINENO" 5; }; }
968+as_fn_error 77 "cannot compute sizeof (long double)
969+See \`config.log' for more details" "$LINENO" 5 ; }
970 else
971 ac_cv_sizeof_long_double=0
972 fi
973@@ -7080,9 +7082,8 @@
974 if test "$ac_cv_type__Bool" = yes; then
975 { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
976 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
977-{ as_fn_set_status 77
978-as_fn_error "cannot compute sizeof (_Bool)
979-See \`config.log' for more details." "$LINENO" 5; }; }
980+as_fn_error 77 "cannot compute sizeof (_Bool)
981+See \`config.log' for more details" "$LINENO" 5 ; }
982 else
983 ac_cv_sizeof__Bool=0
984 fi
985@@ -7126,9 +7127,8 @@
986 if test "$ac_cv_type_uintptr_t" = yes; then
987 { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
988 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
989-{ as_fn_set_status 77
990-as_fn_error "cannot compute sizeof (uintptr_t)
991-See \`config.log' for more details." "$LINENO" 5; }; }
992+as_fn_error 77 "cannot compute sizeof (uintptr_t)
993+See \`config.log' for more details" "$LINENO" 5 ; }
994 else
995 ac_cv_sizeof_uintptr_t=0
996 fi
997@@ -7168,9 +7168,8 @@
998 if test "$ac_cv_type_off_t" = yes; then
999 { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
1000 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
1001-{ as_fn_set_status 77
1002-as_fn_error "cannot compute sizeof (off_t)
1003-See \`config.log' for more details." "$LINENO" 5; }; }
1004+as_fn_error 77 "cannot compute sizeof (off_t)
1005+See \`config.log' for more details" "$LINENO" 5 ; }
1006 else
1007 ac_cv_sizeof_off_t=0
1008 fi
1009@@ -7231,9 +7230,8 @@
1010 if test "$ac_cv_type_time_t" = yes; then
1011 { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
1012 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
1013-{ as_fn_set_status 77
1014-as_fn_error "cannot compute sizeof (time_t)
1015-See \`config.log' for more details." "$LINENO" 5; }; }
1016+as_fn_error 77 "cannot compute sizeof (time_t)
1017+See \`config.log' for more details" "$LINENO" 5 ; }
1018 else
1019 ac_cv_sizeof_time_t=0
1020 fi
1021@@ -7304,9 +7302,8 @@
1022 if test "$ac_cv_type_pthread_t" = yes; then
1023 { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
1024 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
1025-{ as_fn_set_status 77
1026-as_fn_error "cannot compute sizeof (pthread_t)
1027-See \`config.log' for more details." "$LINENO" 5; }; }
1028+as_fn_error 77 "cannot compute sizeof (pthread_t)
1029+See \`config.log' for more details" "$LINENO" 5 ; }
1030 else
1031 ac_cv_sizeof_pthread_t=0
1032 fi
1033@@ -7393,7 +7390,7 @@
1034 MACOSX_DEFAULT_ARCH="ppc"
1035 ;;
1036 *)
1037- as_fn_error "Unexpected output of 'arch' on OSX" "$LINENO" 5
1038+ as_fn_error $? "Unexpected output of 'arch' on OSX" "$LINENO" 5
1039 ;;
1040 esac
1041 else
1042@@ -7405,7 +7402,7 @@
1043 MACOSX_DEFAULT_ARCH="ppc64"
1044 ;;
1045 *)
1046- as_fn_error "Unexpected output of 'arch' on OSX" "$LINENO" 5
1047+ as_fn_error $? "Unexpected output of 'arch' on OSX" "$LINENO" 5
1048 ;;
1049 esac
1050
1051@@ -7431,7 +7428,7 @@
1052 $as_echo "yes" >&6; }
1053 if test $enable_shared = "yes"
1054 then
1055- as_fn_error "Specifying both --enable-shared and --enable-framework is not supported, use only --enable-framework instead" "$LINENO" 5
1056+ as_fn_error $? "Specifying both --enable-shared and --enable-framework is not supported, use only --enable-framework instead" "$LINENO" 5
1057 fi
1058 else
1059 { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
1060@@ -7461,36 +7458,6 @@
1061
1062
1063
1064-# SO is the extension of shared libraries `(including the dot!)
1065-# -- usually .so, .sl on HP-UX, .dll on Cygwin
1066-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking SO" >&5
1067-$as_echo_n "checking SO... " >&6; }
1068-if test -z "$SO"
1069-then
1070- case $ac_sys_system in
1071- hp*|HP*)
1072- case `uname -m` in
1073- ia64) SO=.so;;
1074- *) SO=.sl;;
1075- esac
1076- ;;
1077- CYGWIN*) SO=.dll;;
1078- *) SO=.so;;
1079- esac
1080-else
1081- # this might also be a termcap variable, see #610332
1082- echo
1083- echo '====================================================================='
1084- echo '+ +'
1085- echo '+ WARNING: You have set SO in your environment. +'
1086- echo '+ Do you really mean to change the extension for shared libraries? +'
1087- echo '+ Continuing in 10 seconds to let you to ponder. +'
1088- echo '+ +'
1089- echo '====================================================================='
1090- sleep 10
1091-fi
1092-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $SO" >&5
1093-$as_echo "$SO" >&6; }
1094
1095
1096 cat >>confdefs.h <<_ACEOF
1097@@ -8239,12 +8206,12 @@
1098 withval=$with_dbmliborder;
1099 if test x$with_dbmliborder = xyes
1100 then
1101-as_fn_error "proper usage is --with-dbmliborder=db1:db2:..." "$LINENO" 5
1102+as_fn_error $? "proper usage is --with-dbmliborder=db1:db2:..." "$LINENO" 5
1103 else
1104 for db in `echo $with_dbmliborder | sed 's/:/ /g'`; do
1105 if test x$db != xndbm && test x$db != xgdbm && test x$db != xbdb
1106 then
1107- as_fn_error "proper usage is --with-dbmliborder=db1:db2:..." "$LINENO" 5
1108+ as_fn_error $? "proper usage is --with-dbmliborder=db1:db2:..." "$LINENO" 5
1109 fi
1110 done
1111 fi
1112@@ -9210,7 +9177,9 @@
1113
1114
1115 if test -z "$with_pymalloc"
1116-then with_pymalloc="yes"
1117+then
1118+ with_pymalloc="yes"
1119+ SOABI_QUALIFIERS="${SOABI_QUALIFIERS}m"
1120 fi
1121 if test "$with_pymalloc" != "no"
1122 then
1123@@ -9241,7 +9210,7 @@
1124 $as_echo "#define WITH_VALGRIND 1" >>confdefs.h
1125
1126 else
1127- as_fn_error "Valgrind support requested but headers not available" "$LINENO" 5
1128+ as_fn_error $? "Valgrind support requested but headers not available" "$LINENO" 5
1129
1130 fi
1131
1132@@ -9358,8 +9327,7 @@
1133 do :
1134 as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
1135 ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var"
1136-eval as_val=\$$as_ac_var
1137- if test "x$as_val" = x""yes; then :
1138+if eval test \"x\$"$as_ac_var"\" = x"yes"; then :
1139 cat >>confdefs.h <<_ACEOF
1140 #define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
1141 _ACEOF
1142@@ -10293,35 +10261,53 @@
1143 do :
1144 as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
1145 ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var"
1146-eval as_val=\$$as_ac_var
1147- if test "x$as_val" = x""yes; then :
1148- cat >>confdefs.h <<_ACEOF
1149-#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
1150-_ACEOF
1151-
1152-fi
1153-done
1154-
1155-
1156-for ac_func in dup2 getcwd strdup
1157-do :
1158- as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
1159-ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var"
1160-eval as_val=\$$as_ac_var
1161- if test "x$as_val" = x""yes; then :
1162- cat >>confdefs.h <<_ACEOF
1163-#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
1164-_ACEOF
1165-
1166-else
1167- case " $LIBOBJS " in
1168- *" $ac_func.$ac_objext "* ) ;;
1169- *) LIBOBJS="$LIBOBJS $ac_func.$ac_objext"
1170- ;;
1171-esac
1172-
1173-fi
1174-done
1175+if eval test \"x\$"$as_ac_var"\" = x"yes"; then :
1176+ cat >>confdefs.h <<_ACEOF
1177+#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
1178+_ACEOF
1179+
1180+fi
1181+done
1182+
1183+
1184+ac_fn_c_check_func "$LINENO" "dup2" "ac_cv_func_dup2"
1185+if test "x$ac_cv_func_dup2" = x""yes; then :
1186+ $as_echo "#define HAVE_DUP2 1" >>confdefs.h
1187+
1188+else
1189+ case " $LIBOBJS " in
1190+ *" dup2.$ac_objext "* ) ;;
1191+ *) LIBOBJS="$LIBOBJS dup2.$ac_objext"
1192+ ;;
1193+esac
1194+
1195+fi
1196+
1197+ac_fn_c_check_func "$LINENO" "getcwd" "ac_cv_func_getcwd"
1198+if test "x$ac_cv_func_getcwd" = x""yes; then :
1199+ $as_echo "#define HAVE_GETCWD 1" >>confdefs.h
1200+
1201+else
1202+ case " $LIBOBJS " in
1203+ *" getcwd.$ac_objext "* ) ;;
1204+ *) LIBOBJS="$LIBOBJS getcwd.$ac_objext"
1205+ ;;
1206+esac
1207+
1208+fi
1209+
1210+ac_fn_c_check_func "$LINENO" "strdup" "ac_cv_func_strdup"
1211+if test "x$ac_cv_func_strdup" = x""yes; then :
1212+ $as_echo "#define HAVE_STRDUP 1" >>confdefs.h
1213+
1214+else
1215+ case " $LIBOBJS " in
1216+ *" strdup.$ac_objext "* ) ;;
1217+ *) LIBOBJS="$LIBOBJS strdup.$ac_objext"
1218+ ;;
1219+esac
1220+
1221+fi
1222
1223
1224 for ac_func in getpgrp
1225@@ -11530,7 +11516,7 @@
1226 then LIBM=$withval
1227 { $as_echo "$as_me:${as_lineno-$LINENO}: result: set LIBM=\"$withval\"" >&5
1228 $as_echo "set LIBM=\"$withval\"" >&6; }
1229-else as_fn_error "proper usage is --with-libm=STRING" "$LINENO" 5
1230+else as_fn_error $? "proper usage is --with-libm=STRING" "$LINENO" 5
1231 fi
1232 else
1233 { $as_echo "$as_me:${as_lineno-$LINENO}: result: default LIBM=\"$LIBM\"" >&5
1234@@ -11554,7 +11540,7 @@
1235 then LIBC=$withval
1236 { $as_echo "$as_me:${as_lineno-$LINENO}: result: set LIBC=\"$withval\"" >&5
1237 $as_echo "set LIBC=\"$withval\"" >&6; }
1238-else as_fn_error "proper usage is --with-libc=STRING" "$LINENO" 5
1239+else as_fn_error $? "proper usage is --with-libc=STRING" "$LINENO" 5
1240 fi
1241 else
1242 { $as_echo "$as_me:${as_lineno-$LINENO}: result: default LIBC=\"$LIBC\"" >&5
1243@@ -11850,8 +11836,7 @@
1244 do :
1245 as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
1246 ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var"
1247-eval as_val=\$$as_ac_var
1248- if test "x$as_val" = x""yes; then :
1249+if eval test \"x\$"$as_ac_var"\" = x"yes"; then :
1250 cat >>confdefs.h <<_ACEOF
1251 #define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
1252 _ACEOF
1253@@ -11863,8 +11848,7 @@
1254 do :
1255 as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
1256 ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var"
1257-eval as_val=\$$as_ac_var
1258- if test "x$as_val" = x""yes; then :
1259+if eval test \"x\$"$as_ac_var"\" = x"yes"; then :
1260 cat >>confdefs.h <<_ACEOF
1261 #define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
1262 _ACEOF
1263@@ -12032,7 +12016,7 @@
1264 15|30)
1265 ;;
1266 *)
1267- as_fn_error "bad value $enable_big_digits for --enable-big-digits; value should be 15 or 30" "$LINENO" 5 ;;
1268+ as_fn_error $? "bad value $enable_big_digits for --enable-big-digits; value should be 15 or 30" "$LINENO" 5 ;;
1269 esac
1270 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $enable_big_digits" >&5
1271 $as_echo "$enable_big_digits" >&6; }
1272@@ -12083,9 +12067,8 @@
1273 if test "$ac_cv_type_wchar_t" = yes; then
1274 { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
1275 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
1276-{ as_fn_set_status 77
1277-as_fn_error "cannot compute sizeof (wchar_t)
1278-See \`config.log' for more details." "$LINENO" 5; }; }
1279+as_fn_error 77 "cannot compute sizeof (wchar_t)
1280+See \`config.log' for more details" "$LINENO" 5 ; }
1281 else
1282 ac_cv_sizeof_wchar_t=0
1283 fi
1284@@ -12187,7 +12170,7 @@
1285 else
1286
1287 case "$have_ucs4_tcl" in
1288- yes) unicode_size="4" ;;
1289+ yes) unicode_size="4";;
1290 *) unicode_size="2" ;;
1291 esac
1292
1293@@ -12196,8 +12179,11 @@
1294
1295
1296 case "$unicode_size" in
1297- 4) $as_echo "#define Py_UNICODE_SIZE 4" >>confdefs.h
1298- ;;
1299+ 4)
1300+ $as_echo "#define Py_UNICODE_SIZE 4" >>confdefs.h
1301+
1302+ SOABI_QUALIFIERS="${SOABI_QUALIFIERS}u"
1303+ ;;
1304 *) $as_echo "#define Py_UNICODE_SIZE 2" >>confdefs.h
1305 ;;
1306 esac
1307@@ -12451,11 +12437,64 @@
1308
1309 ;; #(
1310 *)
1311- as_fn_error "unknown endianness
1312- presetting ac_cv_c_bigendian=no (or yes) will help" "$LINENO" 5 ;;
1313+ as_fn_error $? "unknown endianness
1314+ presetting ac_cv_c_bigendian=no (or yes) will help" "$LINENO" 5 ;;
1315 esac
1316
1317
1318+# ABI version string for Python extension modules. This appears between the
1319+# periods in shared library file names, e.g. foo.<SOABI>.so. It is calculated
1320+# from the following attributes which affect the ABI of this Python build (in
1321+# this order):
1322+#
1323+# * The Python implementation (always 'cpython-' for us)
1324+# * The major and minor version numbers
1325+# * --with-pydebug (adds a 'd')
1326+# * --with-pymalloc (adds a 'm')
1327+# * --with-wide-unicode (adds a 'u')
1328+#
1329+# Thus for example, Python 3.2 built with wide unicode, pydebug, and pymalloc,
1330+# would get a shared library ABI version tag of 'cpython-32udm' and shared
1331+# libraries would be named 'foo.cpython-32udm.so'.
1332+
1333+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking SOABI" >&5
1334+$as_echo_n "checking SOABI... " >&6; }
1335+SOABI='cpython-'`echo $VERSION | tr -d .`${SOABI_QUALIFIERS}
1336+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $SOABI" >&5
1337+$as_echo "$SOABI" >&6; }
1338+
1339+# SO is the extension of shared libraries `(including the dot!)
1340+# -- usually .so, .sl on HP-UX, .dll on Cygwin
1341+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking SO" >&5
1342+$as_echo_n "checking SO... " >&6; }
1343+if test -z "$SO"
1344+then
1345+ case $ac_sys_system in
1346+ hp*|HP*)
1347+ case `uname -m` in
1348+ ia64) SO=.so;;
1349+ *) SO=.sl;;
1350+ esac
1351+ ;;
1352+ CYGWIN*) SO=.dll;;
1353+ Linux*) SO=.${SOABI}.so;;
1354+ *) SO=.so;;
1355+ esac
1356+else
1357+ # this might also be a termcap variable, see #610332
1358+ echo
1359+ echo '====================================================================='
1360+ echo '+ +'
1361+ echo '+ WARNING: You have set SO in your environment. +'
1362+ echo '+ Do you really mean to change the extension for shared libraries? +'
1363+ echo '+ Continuing in 10 seconds to let you to ponder. +'
1364+ echo '+ +'
1365+ echo '====================================================================='
1366+ sleep 10
1367+fi
1368+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $SO" >&5
1369+$as_echo "$SO" >&6; }
1370+
1371 # Check whether right shifting a negative integer extends the sign bit
1372 # or fills with zeros (like the Cray J90, according to Tim Peters).
1373 { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether right shift extends the sign bit" >&5
1374@@ -12649,7 +12688,7 @@
1375 have_readline=no
1376
1377 fi
1378-rm -f conftest.err conftest.$ac_ext
1379+rm -f conftest.err conftest.i conftest.$ac_ext
1380 if test $have_readline = yes
1381 then
1382 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
1383@@ -12823,7 +12862,7 @@
1384 have_readline=no
1385
1386 fi
1387-rm -f conftest.err conftest.$ac_ext
1388+rm -f conftest.err conftest.i conftest.$ac_ext
1389 if test $have_readline = yes
1390 then
1391 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
1392@@ -13633,7 +13672,7 @@
1393
1394
1395 case $ac_sys_system in
1396- OSF*) as_fn_error "OSF* systems are deprecated unless somebody volunteers. Check http://bugs.python.org/issue8606" "$LINENO" 5 ;;
1397+ OSF*) as_fn_error $? "OSF* systems are deprecated unless somebody volunteers. Check http://bugs.python.org/issue8606" "$LINENO" 5 ;;
1398 esac
1399
1400
1401@@ -13743,6 +13782,7 @@
1402
1403 ac_libobjs=
1404 ac_ltlibobjs=
1405+U=
1406 for ac_i in : $LIBOBJS; do test "x$ac_i" = x: && continue
1407 # 1. Remove the extension, and $U if already installed.
1408 ac_script='s/\$U\././;s/\.o$//;s/\.obj$//'
1409@@ -13905,19 +13945,19 @@
1410 (unset CDPATH) >/dev/null 2>&1 && unset CDPATH
1411
1412
1413-# as_fn_error ERROR [LINENO LOG_FD]
1414-# ---------------------------------
1415+# as_fn_error STATUS ERROR [LINENO LOG_FD]
1416+# ----------------------------------------
1417 # Output "`basename $0`: error: ERROR" to stderr. If LINENO and LOG_FD are
1418 # provided, also output the error to LOG_FD, referencing LINENO. Then exit the
1419-# script with status $?, using 1 if that was 0.
1420+# script with STATUS, using 1 if that was 0.
1421 as_fn_error ()
1422 {
1423- as_status=$?; test $as_status -eq 0 && as_status=1
1424- if test "$3"; then
1425- as_lineno=${as_lineno-"$2"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
1426- $as_echo "$as_me:${as_lineno-$LINENO}: error: $1" >&$3
1427+ as_status=$1; test $as_status -eq 0 && as_status=1
1428+ if test "$4"; then
1429+ as_lineno=${as_lineno-"$3"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
1430+ $as_echo "$as_me:${as_lineno-$LINENO}: error: $2" >&$4
1431 fi
1432- $as_echo "$as_me: error: $1" >&2
1433+ $as_echo "$as_me: error: $2" >&2
1434 as_fn_exit $as_status
1435 } # as_fn_error
1436
1437@@ -14113,7 +14153,7 @@
1438 test -d "$as_dir" && break
1439 done
1440 test -z "$as_dirs" || eval "mkdir $as_dirs"
1441- } || test -d "$as_dir" || as_fn_error "cannot create directory $as_dir"
1442+ } || test -d "$as_dir" || as_fn_error $? "cannot create directory $as_dir"
1443
1444
1445 } # as_fn_mkdir_p
1446@@ -14167,7 +14207,7 @@
1447 # values after options handling.
1448 ac_log="
1449 This file was extended by python $as_me 3.2, which was
1450-generated by GNU Autoconf 2.65. Invocation command line was
1451+generated by GNU Autoconf 2.67. Invocation command line was
1452
1453 CONFIG_FILES = $CONFIG_FILES
1454 CONFIG_HEADERS = $CONFIG_HEADERS
1455@@ -14229,10 +14269,10 @@
1456 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
1457 ac_cs_version="\\
1458 python config.status 3.2
1459-configured by $0, generated by GNU Autoconf 2.65,
1460+configured by $0, generated by GNU Autoconf 2.67,
1461 with options \\"\$ac_cs_config\\"
1462
1463-Copyright (C) 2009 Free Software Foundation, Inc.
1464+Copyright (C) 2010 Free Software Foundation, Inc.
1465 This config.status script is free software; the Free Software Foundation
1466 gives unlimited permission to copy, distribute and modify it."
1467
1468@@ -14248,11 +14288,16 @@
1469 while test $# != 0
1470 do
1471 case $1 in
1472- --*=*)
1473+ --*=?*)
1474 ac_option=`expr "X$1" : 'X\([^=]*\)='`
1475 ac_optarg=`expr "X$1" : 'X[^=]*=\(.*\)'`
1476 ac_shift=:
1477 ;;
1478+ --*=)
1479+ ac_option=`expr "X$1" : 'X\([^=]*\)='`
1480+ ac_optarg=
1481+ ac_shift=:
1482+ ;;
1483 *)
1484 ac_option=$1
1485 ac_optarg=$2
1486@@ -14274,6 +14319,7 @@
1487 $ac_shift
1488 case $ac_optarg in
1489 *\'*) ac_optarg=`$as_echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"` ;;
1490+ '') as_fn_error $? "missing file argument" ;;
1491 esac
1492 as_fn_append CONFIG_FILES " '$ac_optarg'"
1493 ac_need_defaults=false;;
1494@@ -14286,7 +14332,7 @@
1495 ac_need_defaults=false;;
1496 --he | --h)
1497 # Conflict between --help and --header
1498- as_fn_error "ambiguous option: \`$1'
1499+ as_fn_error $? "ambiguous option: \`$1'
1500 Try \`$0 --help' for more information.";;
1501 --help | --hel | -h )
1502 $as_echo "$ac_cs_usage"; exit ;;
1503@@ -14295,7 +14341,7 @@
1504 ac_cs_silent=: ;;
1505
1506 # This is an error.
1507- -*) as_fn_error "unrecognized option: \`$1'
1508+ -*) as_fn_error $? "unrecognized option: \`$1'
1509 Try \`$0 --help' for more information." ;;
1510
1511 *) as_fn_append ac_config_targets " $1"
1512@@ -14353,7 +14399,7 @@
1513 "Modules/Setup.config") CONFIG_FILES="$CONFIG_FILES Modules/Setup.config" ;;
1514 "Misc/python.pc") CONFIG_FILES="$CONFIG_FILES Misc/python.pc" ;;
1515
1516- *) as_fn_error "invalid argument: \`$ac_config_target'" "$LINENO" 5;;
1517+ *) as_fn_error $? "invalid argument: \`$ac_config_target'" "$LINENO" 5 ;;
1518 esac
1519 done
1520
1521@@ -14390,7 +14436,7 @@
1522 {
1523 tmp=./conf$$-$RANDOM
1524 (umask 077 && mkdir "$tmp")
1525-} || as_fn_error "cannot create a temporary directory in ." "$LINENO" 5
1526+} || as_fn_error $? "cannot create a temporary directory in ." "$LINENO" 5
1527
1528 # Set up the scripts for CONFIG_FILES section.
1529 # No need to generate them if there are no CONFIG_FILES.
1530@@ -14407,7 +14453,7 @@
1531 fi
1532 ac_cs_awk_cr=`$AWK 'BEGIN { print "a\rb" }' </dev/null 2>/dev/null`
1533 if test "$ac_cs_awk_cr" = "a${ac_cr}b"; then
1534- ac_cs_awk_cr='\r'
1535+ ac_cs_awk_cr='\\r'
1536 else
1537 ac_cs_awk_cr=$ac_cr
1538 fi
1539@@ -14421,18 +14467,18 @@
1540 echo "$ac_subst_vars" | sed 's/.*/&!$&$ac_delim/' &&
1541 echo "_ACEOF"
1542 } >conf$$subs.sh ||
1543- as_fn_error "could not make $CONFIG_STATUS" "$LINENO" 5
1544-ac_delim_num=`echo "$ac_subst_vars" | grep -c '$'`
1545+ as_fn_error $? "could not make $CONFIG_STATUS" "$LINENO" 5
1546+ac_delim_num=`echo "$ac_subst_vars" | grep -c '^'`
1547 ac_delim='%!_!# '
1548 for ac_last_try in false false false false false :; do
1549 . ./conf$$subs.sh ||
1550- as_fn_error "could not make $CONFIG_STATUS" "$LINENO" 5
1551+ as_fn_error $? "could not make $CONFIG_STATUS" "$LINENO" 5
1552
1553 ac_delim_n=`sed -n "s/.*$ac_delim\$/X/p" conf$$subs.awk | grep -c X`
1554 if test $ac_delim_n = $ac_delim_num; then
1555 break
1556 elif $ac_last_try; then
1557- as_fn_error "could not make $CONFIG_STATUS" "$LINENO" 5
1558+ as_fn_error $? "could not make $CONFIG_STATUS" "$LINENO" 5
1559 else
1560 ac_delim="$ac_delim!$ac_delim _$ac_delim!! "
1561 fi
1562@@ -14521,20 +14567,28 @@
1563 else
1564 cat
1565 fi < "$tmp/subs1.awk" > "$tmp/subs.awk" \
1566- || as_fn_error "could not setup config files machinery" "$LINENO" 5
1567+ || as_fn_error $? "could not setup config files machinery" "$LINENO" 5
1568 _ACEOF
1569
1570-# VPATH may cause trouble with some makes, so we remove $(srcdir),
1571-# ${srcdir} and @srcdir@ from VPATH if srcdir is ".", strip leading and
1572+# VPATH may cause trouble with some makes, so we remove sole $(srcdir),
1573+# ${srcdir} and @srcdir@ entries from VPATH if srcdir is ".", strip leading and
1574 # trailing colons and then remove the whole line if VPATH becomes empty
1575 # (actually we leave an empty line to preserve line numbers).
1576 if test "x$srcdir" = x.; then
1577- ac_vpsub='/^[ ]*VPATH[ ]*=/{
1578-s/:*\$(srcdir):*/:/
1579-s/:*\${srcdir}:*/:/
1580-s/:*@srcdir@:*/:/
1581-s/^\([^=]*=[ ]*\):*/\1/
1582+ ac_vpsub='/^[ ]*VPATH[ ]*=[ ]*/{
1583+h
1584+s///
1585+s/^/:/
1586+s/[ ]*$/:/
1587+s/:\$(srcdir):/:/g
1588+s/:\${srcdir}:/:/g
1589+s/:@srcdir@:/:/g
1590+s/^:*//
1591 s/:*$//
1592+x
1593+s/\(=[ ]*\).*/\1/
1594+G
1595+s/\n//
1596 s/^[^=]*=[ ]*$//
1597 }'
1598 fi
1599@@ -14562,7 +14616,7 @@
1600 if test -z "$ac_t"; then
1601 break
1602 elif $ac_last_try; then
1603- as_fn_error "could not make $CONFIG_HEADERS" "$LINENO" 5
1604+ as_fn_error $? "could not make $CONFIG_HEADERS" "$LINENO" 5
1605 else
1606 ac_delim="$ac_delim!$ac_delim _$ac_delim!! "
1607 fi
1608@@ -14647,7 +14701,7 @@
1609 _ACAWK
1610 _ACEOF
1611 cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
1612- as_fn_error "could not setup config headers machinery" "$LINENO" 5
1613+ as_fn_error $? "could not setup config headers machinery" "$LINENO" 5
1614 fi # test -n "$CONFIG_HEADERS"
1615
1616
1617@@ -14660,7 +14714,7 @@
1618 esac
1619 case $ac_mode$ac_tag in
1620 :[FHL]*:*);;
1621- :L* | :C*:*) as_fn_error "invalid tag \`$ac_tag'" "$LINENO" 5;;
1622+ :L* | :C*:*) as_fn_error $? "invalid tag \`$ac_tag'" "$LINENO" 5 ;;
1623 :[FH]-) ac_tag=-:-;;
1624 :[FH]*) ac_tag=$ac_tag:$ac_tag.in;;
1625 esac
1626@@ -14688,7 +14742,7 @@
1627 [\\/$]*) false;;
1628 *) test -f "$srcdir/$ac_f" && ac_f="$srcdir/$ac_f";;
1629 esac ||
1630- as_fn_error "cannot find input file: \`$ac_f'" "$LINENO" 5;;
1631+ as_fn_error 1 "cannot find input file: \`$ac_f'" "$LINENO" 5 ;;
1632 esac
1633 case $ac_f in *\'*) ac_f=`$as_echo "$ac_f" | sed "s/'/'\\\\\\\\''/g"`;; esac
1634 as_fn_append ac_file_inputs " '$ac_f'"
1635@@ -14715,7 +14769,7 @@
1636
1637 case $ac_tag in
1638 *:-:* | *:-) cat >"$tmp/stdin" \
1639- || as_fn_error "could not create $ac_file" "$LINENO" 5 ;;
1640+ || as_fn_error $? "could not create $ac_file" "$LINENO" 5 ;;
1641 esac
1642 ;;
1643 esac
1644@@ -14846,22 +14900,22 @@
1645 $ac_datarootdir_hack
1646 "
1647 eval sed \"\$ac_sed_extra\" "$ac_file_inputs" | $AWK -f "$tmp/subs.awk" >$tmp/out \
1648- || as_fn_error "could not create $ac_file" "$LINENO" 5
1649+ || as_fn_error $? "could not create $ac_file" "$LINENO" 5
1650
1651 test -z "$ac_datarootdir_hack$ac_datarootdir_seen" &&
1652 { ac_out=`sed -n '/\${datarootdir}/p' "$tmp/out"`; test -n "$ac_out"; } &&
1653 { ac_out=`sed -n '/^[ ]*datarootdir[ ]*:*=/p' "$tmp/out"`; test -z "$ac_out"; } &&
1654 { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $ac_file contains a reference to the variable \`datarootdir'
1655-which seems to be undefined. Please make sure it is defined." >&5
1656+which seems to be undefined. Please make sure it is defined" >&5
1657 $as_echo "$as_me: WARNING: $ac_file contains a reference to the variable \`datarootdir'
1658-which seems to be undefined. Please make sure it is defined." >&2;}
1659+which seems to be undefined. Please make sure it is defined" >&2;}
1660
1661 rm -f "$tmp/stdin"
1662 case $ac_file in
1663 -) cat "$tmp/out" && rm -f "$tmp/out";;
1664 *) rm -f "$ac_file" && mv "$tmp/out" "$ac_file";;
1665 esac \
1666- || as_fn_error "could not create $ac_file" "$LINENO" 5
1667+ || as_fn_error $? "could not create $ac_file" "$LINENO" 5
1668 ;;
1669 :H)
1670 #
1671@@ -14872,19 +14926,19 @@
1672 $as_echo "/* $configure_input */" \
1673 && eval '$AWK -f "$tmp/defines.awk"' "$ac_file_inputs"
1674 } >"$tmp/config.h" \
1675- || as_fn_error "could not create $ac_file" "$LINENO" 5
1676+ || as_fn_error $? "could not create $ac_file" "$LINENO" 5
1677 if diff "$ac_file" "$tmp/config.h" >/dev/null 2>&1; then
1678 { $as_echo "$as_me:${as_lineno-$LINENO}: $ac_file is unchanged" >&5
1679 $as_echo "$as_me: $ac_file is unchanged" >&6;}
1680 else
1681 rm -f "$ac_file"
1682 mv "$tmp/config.h" "$ac_file" \
1683- || as_fn_error "could not create $ac_file" "$LINENO" 5
1684+ || as_fn_error $? "could not create $ac_file" "$LINENO" 5
1685 fi
1686 else
1687 $as_echo "/* $configure_input */" \
1688 && eval '$AWK -f "$tmp/defines.awk"' "$ac_file_inputs" \
1689- || as_fn_error "could not create -" "$LINENO" 5
1690+ || as_fn_error $? "could not create -" "$LINENO" 5
1691 fi
1692 ;;
1693
1694@@ -14899,7 +14953,7 @@
1695 ac_clean_files=$ac_clean_files_save
1696
1697 test $ac_write_fail = 0 ||
1698- as_fn_error "write failure creating $CONFIG_STATUS" "$LINENO" 5
1699+ as_fn_error $? "write failure creating $CONFIG_STATUS" "$LINENO" 5
1700
1701
1702 # configure is writing to config.log, and then calls config.status.
1703@@ -14920,7 +14974,7 @@
1704 exec 5>>config.log
1705 # Use ||, not &&, to avoid exiting from the if with $? = 1, which
1706 # would make configure fail if this is the last instruction.
1707- $ac_cs_success || as_fn_exit $?
1708+ $ac_cs_success || as_fn_exit 1
1709 fi
1710 if test -n "$ac_unrecognized_opts" && test "$enable_option_checking" != no; then
1711 { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: unrecognized options: $ac_unrecognized_opts" >&5
1712
1713=== modified file 'configure.in'
1714--- configure.in 2010-08-31 19:51:07 +0000
1715+++ configure.in 2010-09-03 17:02:41 +0000
1716@@ -12,7 +12,7 @@
1717 [],
1718 [m4_fatal([Autoconf version $1 is required for Python], 63)])
1719 ])
1720-version_required(2.65)
1721+AC_PREREQ(2.65)
1722
1723 AC_REVISION($Revision$)
1724 AC_INIT(python, PYTHON_VERSION, http://bugs.python.org/)
1725@@ -52,6 +52,7 @@
1726 AC_SUBST(VERSION)
1727 VERSION=PYTHON_VERSION
1728
1729+# Version number or Python's own shared library file.
1730 AC_SUBST(SOVERSION)
1731 SOVERSION=1.0
1732
1733@@ -817,6 +818,9 @@
1734 esac
1735 fi
1736
1737+# For calculating the .so ABI tag.
1738+SOABI_QUALIFIERS=""
1739+
1740 # Check for --with-pydebug
1741 AC_MSG_CHECKING(for --with-pydebug)
1742 AC_ARG_WITH(pydebug,
1743@@ -828,6 +832,7 @@
1744 [Define if you want to build an interpreter with many run-time checks.])
1745 AC_MSG_RESULT(yes);
1746 Py_DEBUG='true'
1747+ SOABI_QUALIFIERS="${SOABI_QUALIFIERS}d"
1748 else AC_MSG_RESULT(no); Py_DEBUG='false'
1749 fi],
1750 [AC_MSG_RESULT(no)])
1751@@ -1649,34 +1654,6 @@
1752 AC_SUBST(BLDSHARED)
1753 AC_SUBST(CCSHARED)
1754 AC_SUBST(LINKFORSHARED)
1755-# SO is the extension of shared libraries `(including the dot!)
1756-# -- usually .so, .sl on HP-UX, .dll on Cygwin
1757-AC_MSG_CHECKING(SO)
1758-if test -z "$SO"
1759-then
1760- case $ac_sys_system in
1761- hp*|HP*)
1762- case `uname -m` in
1763- ia64) SO=.so;;
1764- *) SO=.sl;;
1765- esac
1766- ;;
1767- CYGWIN*) SO=.dll;;
1768- *) SO=.so;;
1769- esac
1770-else
1771- # this might also be a termcap variable, see #610332
1772- echo
1773- echo '====================================================================='
1774- echo '+ +'
1775- echo '+ WARNING: You have set SO in your environment. +'
1776- echo '+ Do you really mean to change the extension for shared libraries? +'
1777- echo '+ Continuing in 10 seconds to let you to ponder. +'
1778- echo '+ +'
1779- echo '====================================================================='
1780- sleep 10
1781-fi
1782-AC_MSG_RESULT($SO)
1783
1784 AC_DEFINE_UNQUOTED(SHLIB_EXT, "$SO", [Define this to be extension of shared libraries (including the dot!).])
1785 # LDSHARED is the ld *command* used to create shared library
1786@@ -2487,7 +2464,9 @@
1787 AS_HELP_STRING([--with(out)-pymalloc], [disable/enable specialized mallocs]))
1788
1789 if test -z "$with_pymalloc"
1790-then with_pymalloc="yes"
1791+then
1792+ with_pymalloc="yes"
1793+ SOABI_QUALIFIERS="${SOABI_QUALIFIERS}m"
1794 fi
1795 if test "$with_pymalloc" != "no"
1796 then
1797@@ -3595,7 +3574,7 @@
1798 ],
1799 [
1800 case "$have_ucs4_tcl" in
1801- yes) unicode_size="4" ;;
1802+ yes) unicode_size="4";;
1803 *) unicode_size="2" ;;
1804 esac
1805 ])
1806@@ -3603,7 +3582,10 @@
1807 AH_TEMPLATE(Py_UNICODE_SIZE,
1808 [Define as the size of the unicode type.])
1809 case "$unicode_size" in
1810- 4) AC_DEFINE(Py_UNICODE_SIZE, 4) ;;
1811+ 4)
1812+ AC_DEFINE(Py_UNICODE_SIZE, 4)
1813+ SOABI_QUALIFIERS="${SOABI_QUALIFIERS}u"
1814+ ;;
1815 *) AC_DEFINE(Py_UNICODE_SIZE, 2) ;;
1816 esac
1817
1818@@ -3636,6 +3618,55 @@
1819 # check for endianness
1820 AC_C_BIGENDIAN
1821
1822+# ABI version string for Python extension modules. This appears between the
1823+# periods in shared library file names, e.g. foo.<SOABI>.so. It is calculated
1824+# from the following attributes which affect the ABI of this Python build (in
1825+# this order):
1826+#
1827+# * The Python implementation (always 'cpython-' for us)
1828+# * The major and minor version numbers
1829+# * --with-pydebug (adds a 'd')
1830+# * --with-pymalloc (adds a 'm')
1831+# * --with-wide-unicode (adds a 'u')
1832+#
1833+# Thus for example, Python 3.2 built with wide unicode, pydebug, and pymalloc,
1834+# would get a shared library ABI version tag of 'cpython-32udm' and shared
1835+# libraries would be named 'foo.cpython-32udm.so'.
1836+AC_SUBST(SOABI)
1837+AC_MSG_CHECKING(SOABI)
1838+SOABI='cpython-'`echo $VERSION | tr -d .`${SOABI_QUALIFIERS}
1839+AC_MSG_RESULT($SOABI)
1840+
1841+# SO is the extension of shared libraries `(including the dot!)
1842+# -- usually .so, .sl on HP-UX, .dll on Cygwin
1843+AC_MSG_CHECKING(SO)
1844+if test -z "$SO"
1845+then
1846+ case $ac_sys_system in
1847+ hp*|HP*)
1848+ case `uname -m` in
1849+ ia64) SO=.so;;
1850+ *) SO=.sl;;
1851+ esac
1852+ ;;
1853+ CYGWIN*) SO=.dll;;
1854+ Linux*) SO=.${SOABI}.so;;
1855+ *) SO=.so;;
1856+ esac
1857+else
1858+ # this might also be a termcap variable, see #610332
1859+ echo
1860+ echo '====================================================================='
1861+ echo '+ +'
1862+ echo '+ WARNING: You have set SO in your environment. +'
1863+ echo '+ Do you really mean to change the extension for shared libraries? +'
1864+ echo '+ Continuing in 10 seconds to let you to ponder. +'
1865+ echo '+ +'
1866+ echo '====================================================================='
1867+ sleep 10
1868+fi
1869+AC_MSG_RESULT($SO)
1870+
1871 # Check whether right shifting a negative integer extends the sign bit
1872 # or fills with zeros (like the Cray J90, according to Tim Peters).
1873 AC_MSG_CHECKING(whether right shift extends the sign bit)
1874
1875=== modified file 'pyconfig.h.in'
1876--- pyconfig.h.in 2010-08-31 19:51:07 +0000
1877+++ pyconfig.h.in 2010-09-03 17:02:41 +0000
1878@@ -1040,7 +1040,7 @@
1879 /* Define to 1 if your <sys/time.h> declares `struct tm'. */
1880 #undef TM_IN_SYS_TIME
1881
1882-/* Define to 0 if you don't want to use computed gotos in ceval.c. */
1883+/* Define if you want to use computed gotos in ceval.c. */
1884 #undef USE_COMPUTED_GOTOS
1885
1886 /* Define if the compiler supports the inline keyword */

Subscribers

People subscribed via source and target branches

to all changes: