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 225720245496de74e7e269842ed2a23bfabca70d..7a5d55aec24f51bc9c13b81225658128df928d82 100755 (executable)
--- 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 <time.h>.
 { echo "$as_me:$LINENO: checking size of time_t" >&5

diff --git a/configure.in b/configure.in
index 42af0f810e99288821c4dfef6a76ba34e5670afa..6b9d00cd88f7c9356767b89d2fd13780b759d81f 100644 (file)
--- 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 <time.h>.
 AC_MSG_CHECKING(size of time_t)