mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-08-03 00:23:06 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 6

Merged revisions 77196 via svnmerge from

Browse source 
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.
  ........
................
This commit is contained in:
Mark Dickinson 2009-12-31 21:25:02 +00:00
parent 35326bc5a2
commit b87f0d00c3
2 changed files with 14 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

11
configure vendored
View file

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

8
configure.in
View file

@ -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)