Mirror
/
cpython
mirror of https://github.com/python/cpython
4
1
Fork 0
Code Issues Releases Wiki Activity

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.
........
This commit is contained in:
Mark Dickinson 2009-12-31 21:22:50 +00:00
parent 89d7d41602
commit 2df5d28155
2 changed files with 16 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
configure vendored
View File

@ -1,5 +1,5 @@
#! /bin/sh
# From configure.in Revision: 77170 .
# From configure.in Revision: 77190 .
# Guess values for system-dependent variables and create Makefiles.
# Generated by GNU Autoconf 2.61 for python 3.2.
#
@ -13391,8 +13391,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
@ -13405,6 +13406,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; }
@ -20347,7 +20352,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

10
configure.in
View File

@ -1396,8 +1396,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
@ -1408,6 +1409,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
@ -2837,7 +2841,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