[Python-checkins] r77197 - in python/branches/release31-maint: configure configure.in
mark.dickinson
python-checkins at python.org
Thu Dec 31 22:25:02 CET 2009
Author: mark.dickinson
Date: Thu Dec 31 22:25:02 2009
New Revision: 77197
Log:
Merged revisions 77196 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/branches/py3k
................
r77196 | mark.dickinson | 2009-12-31 21:22:50 +0000 (Thu, 31 Dec 2009) | 9 lines
Merged revisions 77193 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
r77193 | mark.dickinson | 2009-12-31 21:11:48 +0000 (Thu, 31 Dec 2009) | 1 line
More configure fixes: avoid sh 'integer argument expected' error when 'long long' type doesn't exist.
........
................
Modified:
python/branches/release31-maint/ (props changed)
python/branches/release31-maint/configure
python/branches/release31-maint/configure.in
Modified: python/branches/release31-maint/configure
==============================================================================
--- python/branches/release31-maint/configure (original)
+++ python/branches/release31-maint/configure Thu Dec 31 22:25:02 2009
@@ -1,5 +1,5 @@
#! /bin/sh
-# From configure.in Revision: 76567 .
+# From configure.in Revision: 76821 .
# Guess values for system-dependent variables and create Makefiles.
# Generated by GNU Autoconf 2.61 for python 3.1.
#
@@ -13033,8 +13033,9 @@
{ echo "$as_me:$LINENO: checking whether to enable large file support" >&5
echo $ECHO_N "checking whether to enable large file support... $ECHO_C" >&6; }
-if test "$have_long_long" = yes -a \
- "$ac_cv_sizeof_off_t" -gt "$ac_cv_sizeof_long" -a \
+if test "$have_long_long" = yes
+then
+if test "$ac_cv_sizeof_off_t" -gt "$ac_cv_sizeof_long" -a \
"$ac_cv_sizeof_long_long" -ge "$ac_cv_sizeof_off_t"; then
cat >>confdefs.h <<\_ACEOF
@@ -13047,6 +13048,10 @@
{ echo "$as_me:$LINENO: result: no" >&5
echo "${ECHO_T}no" >&6; }
fi
+else
+ { echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6; }
+fi
# AC_CHECK_SIZEOF() doesn't include <time.h>.
{ echo "$as_me:$LINENO: checking size of time_t" >&5
Modified: python/branches/release31-maint/configure.in
==============================================================================
--- python/branches/release31-maint/configure.in (original)
+++ python/branches/release31-maint/configure.in Thu Dec 31 22:25:02 2009
@@ -1415,8 +1415,9 @@
[The number of bytes in an off_t.])
AC_MSG_CHECKING(whether to enable large file support)
-if test "$have_long_long" = yes -a \
- "$ac_cv_sizeof_off_t" -gt "$ac_cv_sizeof_long" -a \
+if test "$have_long_long" = yes
+then
+if test "$ac_cv_sizeof_off_t" -gt "$ac_cv_sizeof_long" -a \
"$ac_cv_sizeof_long_long" -ge "$ac_cv_sizeof_off_t"; then
AC_DEFINE(HAVE_LARGEFILE_SUPPORT, 1,
[Defined to enable large file support when an off_t is bigger than a long
@@ -1427,6 +1428,9 @@
else
AC_MSG_RESULT(no)
fi
+else
+ AC_MSG_RESULT(no)
+fi
# AC_CHECK_SIZEOF() doesn't include <time.h>.
AC_MSG_CHECKING(size of time_t)
More information about the Python-checkins
mailing list