From 0ef0b910ce974f296667671ec7d34783ea1d9bd0 Mon Sep 17 00:00:00 2001
From: Mark Dickinson <dickinsm@gmail.com>
Date: Thu, 31 Dec 2009 21:11:48 +0000
Subject: [PATCH] More configure fixes: avoid sh 'integer argument expected'
 error when 'long long' type doesn't exist.

---
 configure    | 13 +++++++++----
 configure.in | 10 +++++++---
 2 files changed, 16 insertions(+), 7 deletions(-)

diff --git a/configure b/configure
index 27fe217fd1e..6f17eb7b0cc 100755
--- a/configure
+++ b/configure
@@ -1,5 +1,5 @@
 #! /bin/sh
-# From configure.in Revision: 77169 .
+# From configure.in Revision: 77189 .
 # Guess values for system-dependent variables and create Makefiles.
 # Generated by GNU Autoconf 2.61 for python 2.7.
 #
@@ -13465,8 +13465,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
@@ -13479,6 +13480,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
 
 { echo "$as_me:$LINENO: checking for time_t" >&5
 echo $ECHO_N "checking for time_t... $ECHO_C" >&6; }
@@ -21038,7 +21043,7 @@ fi
 
 fi
 
-if test $have_getaddrinfo = no -o $ac_cv_buggy_getaddrinfo = yes
+if test $have_getaddrinfo = no -o "$ac_cv_buggy_getaddrinfo" = yes
 then
 	if test $ipv6 = yes
 	then
diff --git a/configure.in b/configure.in
index 8f7d28a36fc..637490b9e2f 100644
--- a/configure.in
+++ b/configure.in
@@ -1457,8 +1457,9 @@ AC_CHECK_SIZEOF(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
@@ -1469,6 +1470,9 @@ if test "$have_long_long" = yes -a \
 else
   AC_MSG_RESULT(no)
 fi
+else
+  AC_MSG_RESULT(no)
+fi
 
 AC_CHECK_SIZEOF(time_t, [], [
 #ifdef HAVE_SYS_TYPES_H
@@ -2967,7 +2971,7 @@ int main()
     ac_cv_buggy_getaddrinfo=yes))
 fi
 
-if test $have_getaddrinfo = no -o $ac_cv_buggy_getaddrinfo = yes
+if test $have_getaddrinfo = no -o "$ac_cv_buggy_getaddrinfo" = yes
 then
 	if test $ipv6 = yes
 	then