diff options
| author | Mark Dickinson <dickinsm@gmail.com> | 2009-12-31 21:25:02 (GMT) |
|---|---|---|
| committer | Mark Dickinson <dickinsm@gmail.com> | 2009-12-31 21:25:02 (GMT) |
| commit | b87f0d00c37d38c45d0da3cf2df907d22bbd6f56 (patch) | |
| tree | 9e76ab57704bf5db2b58b42dea202d6beea31e64 | |
| parent | 35326bc5a2c7a224a40f27ca006ebdd3fe40de78 (diff) | |
| download | cpython-b87f0d00c37d38c45d0da3cf2df907d22bbd6f56.zip cpython-b87f0d00c37d38c45d0da3cf2df907d22bbd6f56.tar.gz cpython-b87f0d00c37d38c45d0da3cf2df907d22bbd6f56.tar.bz2 | |
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.
........
................
| -rwxr-xr-x | configure | 11 | ||||
| -rw-r--r-- | configure.in | 8 |
2 files changed, 14 insertions, 5 deletions
@@ -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 @@ _ACEOF { 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 @@ else { 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 diff --git a/configure.in b/configure.in index 67f3be6..f5fe923 100644 --- a/configure.in +++ b/configure.in @@ -1415,8 +1415,9 @@ AC_DEFINE_UNQUOTED(SIZEOF_OFF_T, $ac_cv_sizeof_off_t, [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 @@ if test "$have_long_long" = yes -a \ 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) |