From caa44c057ace6a3b36119b62ddb1bd24427e4f85 Mon Sep 17 00:00:00 2001 From: Mark Dickinson Date: Thu, 31 Dec 2009 21:20:06 +0000 Subject: [PATCH] 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. ........ --- configure | 9 +++++++-- configure.in | 8 ++++++-- 2 files changed, 13 insertions(+), 4 deletions(-) diff --git a/configure b/configure index 2257202454..7a5d55aec2 100755 --- a/configure +++ b/configure @@ -12696,8 +12696,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 @@ -12710,6 +12711,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 . { echo "$as_me:$LINENO: checking size of time_t" >&5 diff --git a/configure.in b/configure.in index 42af0f810e..6b9d00cd88 100644 --- a/configure.in +++ b/configure.in @@ -1448,8 +1448,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 @@ -1460,6 +1461,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 . AC_MSG_CHECKING(size of time_t) -- 2.40.0