summaryrefslogtreecommitdiffstats
path: root/configure
diff options
context:
space:
mode:
authorBenjamin Peterson <benjamin@python.org>2009-12-13 02:10:36 (GMT)
committerBenjamin Peterson <benjamin@python.org>2009-12-13 02:10:36 (GMT)
commit8f326b23695dc4996327da8477e11aad42c61953 (patch)
tree4e958dc9812fe6417eb75ea30a1bd409e2341c73 /configure
parent0496c9ee0a6937eaa94800a74749086add28e27f (diff)
downloadcpython-8f326b23695dc4996327da8477e11aad42c61953.zip
cpython-8f326b23695dc4996327da8477e11aad42c61953.tar.gz
cpython-8f326b23695dc4996327da8477e11aad42c61953.tar.bz2
Merged revisions 76052,76522,76591,76689,76697,76733 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk ........ r76052 | gregory.p.smith | 2009-11-01 20:02:38 -0600 (Sun, 01 Nov 2009) | 5 lines see issue1006238, this merges in the following patch to ease cross compiling the printf %zd check. http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-lang/python/files/python-2.5-cross-printf.patch?rev=1.1&view=markup ........ r76522 | barry.warsaw | 2009-11-25 12:38:32 -0600 (Wed, 25 Nov 2009) | 2 lines Add mktime_tz to __all__. It's documented as being available in email.utils. ........ r76591 | benjamin.peterson | 2009-11-29 16:26:26 -0600 (Sun, 29 Nov 2009) | 4 lines now that deepcopy can handle instance methods, this hack can be removed #7409 Thanks Robert Collins ........ r76689 | benjamin.peterson | 2009-12-06 11:37:48 -0600 (Sun, 06 Dec 2009) | 1 line rewrite translate_newlines for clarity ........ r76697 | benjamin.peterson | 2009-12-06 15:24:30 -0600 (Sun, 06 Dec 2009) | 2 lines fix test_parser from tokenizer tweak ........ r76733 | benjamin.peterson | 2009-12-09 21:37:59 -0600 (Wed, 09 Dec 2009) | 1 line substitute PyDict_Check() for PyObject_IsInstance ........
Diffstat (limited to 'configure')
-rwxr-xr-xconfigure10
1 files changed, 4 insertions, 6 deletions
diff --git a/configure b/configure
index e4c88f4..f6a675e 100755
--- a/configure
+++ b/configure
@@ -1,5 +1,5 @@
#! /bin/sh
-# From configure.in Revision: 76637 .
+# From configure.in Revision: 76645 .
# Guess values for system-dependent variables and create Makefiles.
# Generated by GNU Autoconf 2.61 for python 3.2.
#
@@ -26672,7 +26672,8 @@ if test "${ac_cv_have_size_t_format+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
if test "$cross_compiling" = yes; then
- ac_cv_have_size_t_format=no
+ ac_cv_have_size_t_format="cross -- assuming yes"
+
else
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
@@ -26750,13 +26751,10 @@ rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$a
fi
-
fi
-
{ echo "$as_me:$LINENO: result: $ac_cv_have_size_t_format" >&5
echo "${ECHO_T}$ac_cv_have_size_t_format" >&6; }
-if test $ac_cv_have_size_t_format = yes
-then
+if test "$ac_cv_have_size_t_format" != no ; then
cat >>confdefs.h <<\_ACEOF
#define PY_FORMAT_SIZE_T "z"