Bump version number to 2.5.
Fix term.h check so that HAVE_TERM_H is actually generated.
diff --git a/configure b/configure
index 82af2e6..6bc1c4e 100755
--- a/configure
+++ b/configure
@@ -1,7 +1,7 @@
#! /bin/sh
-# From configure.in Revision: 1.474 .
+# From configure.in Revision: 1.475 .
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.59 for python 2.4.
+# Generated by GNU Autoconf 2.59 for python 2.5.
#
# Copyright (C) 2003 Free Software Foundation, Inc.
# This configure script is free software; the Free Software Foundation
@@ -268,8 +268,8 @@
# Identity of this package.
PACKAGE_NAME='python'
PACKAGE_TARNAME='python'
-PACKAGE_VERSION='2.4'
-PACKAGE_STRING='python 2.4'
+PACKAGE_VERSION='2.5'
+PACKAGE_STRING='python 2.5'
PACKAGE_BUGREPORT=''
ac_unique_file="Include/object.h"
@@ -779,7 +779,7 @@
# Omit some internal or obsolete options to make the list less imposing.
# This message is too long to be a string in the A/UX 3.1 sh.
cat <<_ACEOF
-\`configure' configures python 2.4 to adapt to many kinds of systems.
+\`configure' configures python 2.5 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -836,7 +836,7 @@
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of python 2.4:";;
+ short | recursive ) echo "Configuration of python 2.5:";;
esac
cat <<\_ACEOF
@@ -983,7 +983,7 @@
test -n "$ac_init_help" && exit 0
if $ac_init_version; then
cat <<\_ACEOF
-python configure 2.4
+python configure 2.5
generated by GNU Autoconf 2.59
Copyright (C) 2003 Free Software Foundation, Inc.
@@ -997,7 +997,7 @@
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
-It was created by python $as_me 2.4, which was
+It was created by python $as_me 2.5, which was
generated by GNU Autoconf 2.59. Invocation command line was
$ $0 $@
@@ -1349,7 +1349,7 @@
mv confdefs.h.new confdefs.h
-VERSION=2.4
+VERSION=2.5
SOVERSION=1.0
@@ -5382,9 +5382,13 @@
# On Solaris, term.h requires curses.h
-echo "$as_me:$LINENO: checking for term.h" >&5
-echo $ECHO_N "checking for term.h... $ECHO_C" >&6
-if test "${ac_cv_header_term_h+set}" = set; then
+
+for ac_header in term.h
+do
+as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+echo "$as_me:$LINENO: checking for $ac_header" >&5
+echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
+if eval "test \"\${$as_ac_Header+set}\" = set"; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
cat >conftest.$ac_ext <<_ACEOF
@@ -5399,7 +5403,7 @@
#endif
-#include <term.h>
+#include <$ac_header>
_ACEOF
rm -f conftest.$ac_objext
if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
@@ -5423,18 +5427,25 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
- ac_cv_header_term_h=yes
+ eval "$as_ac_Header=yes"
else
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
-ac_cv_header_term_h=no
+eval "$as_ac_Header=no"
fi
rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
fi
-echo "$as_me:$LINENO: result: $ac_cv_header_term_h" >&5
-echo "${ECHO_T}$ac_cv_header_term_h" >&6
+echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
+echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
+if test `eval echo '${'$as_ac_Header'}'` = yes; then
+ cat >>confdefs.h <<_ACEOF
+#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
+_ACEOF
+fi
+
+done
# checks for typedefs
@@ -20524,7 +20535,7 @@
} >&5
cat >&5 <<_CSEOF
-This file was extended by python $as_me 2.4, which was
+This file was extended by python $as_me 2.5, which was
generated by GNU Autoconf 2.59. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -20584,7 +20595,7 @@
cat >>$CONFIG_STATUS <<_ACEOF
ac_cs_version="\\
-python config.status 2.4
+python config.status 2.5
configured by $0, generated by GNU Autoconf 2.59,
with options \\"`echo "$ac_configure_args" | sed 's/[\\""\`\$]/\\\\&/g'`\\"