[Python-checkins] r52358 - in python/branches/release24-maint: Misc/NEWS configure configure.in
anthony.baxter
python-checkins at python.org
Tue Oct 17 18:03:41 CEST 2006
Author: anthony.baxter
Date: Tue Oct 17 18:03:36 2006
New Revision: 52358
Modified:
python/branches/release24-maint/Misc/NEWS
python/branches/release24-maint/configure
python/branches/release24-maint/configure.in
Log:
- Bug #1578513: Cross compilation was broken by a change to configure.
Repair so that it's back to how it was in 2.4.3.
Needs to be forward-ported to 2.5 branch and trunk.
Modified: python/branches/release24-maint/Misc/NEWS
==============================================================================
--- python/branches/release24-maint/Misc/NEWS (original)
+++ python/branches/release24-maint/Misc/NEWS Tue Oct 17 18:03:36 2006
@@ -9,6 +9,17 @@
*Release date: 11-OCT-2006*
+Build
+-----
+
+- Bug #1578513: Cross compilation was broken by a change to configure.
+Repair so that it's back to how it was in 2.4.3.
+
+What's New in Python 2.4.4c1?
+=============================
+
+*Release date: 11-OCT-2006*
+
Core and builtins
-----------------
Modified: python/branches/release24-maint/configure
==============================================================================
--- python/branches/release24-maint/configure (original)
+++ python/branches/release24-maint/configure Tue Oct 17 18:03:36 2006
@@ -1,5 +1,5 @@
#! /bin/sh
-# From configure.in Revision: 52098 .
+# From configure.in Revision: 52231 .
# Guess values for system-dependent variables and create Makefiles.
# Generated by GNU Autoconf 2.59 for python 2.4.
#
@@ -20565,55 +20565,38 @@
echo "$as_me:$LINENO: checking for /dev/ptmx" >&5
echo $ECHO_N "checking for /dev/ptmx... $ECHO_C" >&6
-if test "${ac_cv_file__dev_ptmx+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
-else
- test "$cross_compiling" = yes &&
- { { echo "$as_me:$LINENO: error: cannot check for file existence when cross compiling" >&5
-echo "$as_me: error: cannot check for file existence when cross compiling" >&2;}
- { (exit 1); exit 1; }; }
-if test -r "/dev/ptmx"; then
- ac_cv_file__dev_ptmx=yes
-else
- ac_cv_file__dev_ptmx=no
-fi
-fi
-echo "$as_me:$LINENO: result: $ac_cv_file__dev_ptmx" >&5
-echo "${ECHO_T}$ac_cv_file__dev_ptmx" >&6
-if test $ac_cv_file__dev_ptmx = yes; then
+
+if test -r /dev/ptmx
+then
+ echo "$as_me:$LINENO: result: yes" >&5
+echo "${ECHO_T}yes" >&6
cat >>confdefs.h <<\_ACEOF
#define HAVE_DEV_PTMX 1
_ACEOF
+else
+ echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6
fi
echo "$as_me:$LINENO: checking for /dev/ptc" >&5
echo $ECHO_N "checking for /dev/ptc... $ECHO_C" >&6
-if test "${ac_cv_file__dev_ptc+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
-else
- test "$cross_compiling" = yes &&
- { { echo "$as_me:$LINENO: error: cannot check for file existence when cross compiling" >&5
-echo "$as_me: error: cannot check for file existence when cross compiling" >&2;}
- { (exit 1); exit 1; }; }
-if test -r "/dev/ptc"; then
- ac_cv_file__dev_ptc=yes
-else
- ac_cv_file__dev_ptc=no
-fi
-fi
-echo "$as_me:$LINENO: result: $ac_cv_file__dev_ptc" >&5
-echo "${ECHO_T}$ac_cv_file__dev_ptc" >&6
-if test $ac_cv_file__dev_ptc = yes; then
+
+if test -r /dev/ptc
+then
+ echo "$as_me:$LINENO: result: yes" >&5
+echo "${ECHO_T}yes" >&6
cat >>confdefs.h <<\_ACEOF
#define HAVE_DEV_PTC 1
_ACEOF
+else
+ echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6
fi
-
echo "$as_me:$LINENO: checking for socklen_t" >&5
echo $ECHO_N "checking for socklen_t... $ECHO_C" >&6
if test "${ac_cv_type_socklen_t+set}" = set; then
Modified: python/branches/release24-maint/configure.in
==============================================================================
--- python/branches/release24-maint/configure.in (original)
+++ python/branches/release24-maint/configure.in Tue Oct 17 18:03:36 2006
@@ -3202,8 +3202,27 @@
[Define if WINDOW in curses.h offers a field _flags.])
fi
-AC_CHECK_FILE(/dev/ptmx, AC_DEFINE(HAVE_DEV_PTMX, 1, [Define if we have /dev/ptmx.]))
-AC_CHECK_FILE(/dev/ptc, AC_DEFINE(HAVE_DEV_PTC, 1, [Define if we have /dev/ptc.]))
+AC_MSG_CHECKING(for /dev/ptmx)
+
+if test -r /dev/ptmx
+then
+ AC_MSG_RESULT(yes)
+ AC_DEFINE(HAVE_DEV_PTMX, 1,
+ [Define if we have /dev/ptmx.])
+else
+ AC_MSG_RESULT(no)
+fi
+
+AC_MSG_CHECKING(for /dev/ptc)
+
+if test -r /dev/ptc
+then
+ AC_MSG_RESULT(yes)
+ AC_DEFINE(HAVE_DEV_PTC, 1,
+ [Define if we have /dev/ptc.])
+else
+ AC_MSG_RESULT(no)
+fi
AC_CHECK_TYPE(socklen_t,,
AC_DEFINE(socklen_t,int,
More information about the Python-checkins
mailing list