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.
  ........
................

diff --git a/configure b/configure
index f97d834d4bd3093edf5bde658b90dd5c075c3bed..9b30edfb685cccd43c97ed0d77b4198204f931f1 100755 (executable)
--- a/configure
+++ b/configure
@@ -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 67f3be6da7de4467da15f730c62311cf24a11a04..f5fe9233b0a6bd9a166f049eba757d8a013bc257 100644 (file)
--- 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)