Patch #623771: Properly use autoconf 2.5x macros.

diff --git a/configure b/configure
index 35071dc0cea9317fc641617f2ba101821d7d748a..200479130bca4160dcbad76d59fd8107c9713ceb 100755 (executable)
--- a/configure
+++ b/configure
@@ -1,7 +1,7 @@
 #! /bin/sh
-# From configure.in Revision: 1.358 .
+# From configure.in Revision: 1.359 .
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.53.
+# Generated by GNU Autoconf 2.53 for python 2.3.
 #
 # Copyright 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, 2002
 # Free Software Foundation, Inc.
@@ -253,11 +253,11 @@ SHELL=${CONFIG_SHELL-/bin/sh}
 : ${ac_max_here_lines=38}
 
 # Identity of this package.
-PACKAGE_NAME=
-PACKAGE_TARNAME=
-PACKAGE_VERSION=
-PACKAGE_STRING=
-PACKAGE_BUGREPORT=
+PACKAGE_NAME='python'
+PACKAGE_TARNAME='python'
+PACKAGE_VERSION='2.3'
+PACKAGE_STRING='python 2.3'
+PACKAGE_BUGREPORT=''
 
 ac_unique_file="Include/object.h"
 # Factoring default headers for most tests.
@@ -761,7 +761,7 @@ if test "$ac_init_help" = "long"; then
   # 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 this package to adapt to many kinds of systems.
+\`configure' configures python 2.3 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -817,7 +817,9 @@ _ACEOF
 fi
 
 if test -n "$ac_init_help"; then
-
+  case $ac_init_help in
+     short | recursive ) echo "Configuration of python 2.3:";;
+   esac
   cat <<\_ACEOF
 
 Optional Features:
@@ -927,6 +929,8 @@ fi
 test -n "$ac_init_help" && exit 0
 if $ac_init_version; then
   cat <<\_ACEOF
+python configure 2.3
+generated by GNU Autoconf 2.53
 
 Copyright 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, 2002
 Free Software Foundation, Inc.
@@ -940,7 +944,7 @@ cat >&5 <<_ACEOF
 This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
 
-It was created by $as_me, which was
+It was created by python $as_me 2.3, which was
 generated by GNU Autoconf 2.53.  Invocation command line was
 
   $ $0 $@
@@ -1203,6 +1207,15 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
 
 
 
+
+
+
+
+
+
+
+
+
 
 
 
@@ -1218,7 +1231,6 @@ ac_config_headers="$ac_config_headers pyconfig.h"
 
 
 
-# Set VERSION so we only need to edit in one place (i.e., here)
 
 VERSION=2.3
 
@@ -9874,7 +9886,7 @@ else
 echo "${ECHO_T}no" >&6
 fi;
 
-# Determine if signalmodule should be used.
+# Determine isignalmodule should be used.
 
 
 echo "$as_me:$LINENO: checking for --with-signal-module" >&5
@@ -16439,6 +16451,7 @@ echo "${ECHO_T}done" >&6
 
 # generate output files
 ac_config_files="$ac_config_files Makefile.pre Modules/Setup.config"
+
 cat >confcache <<\_ACEOF
 # This file is a shell script that caches the results of configure
 # tests run on this system so they can be shared between configure
@@ -16764,7 +16777,7 @@ _ASBOX
 } >&5
 cat >&5 <<_CSEOF
 
-This file was extended by $as_me, which was
+This file was extended by python $as_me 2.3, which was
 generated by GNU Autoconf 2.53.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -16823,7 +16836,7 @@ _ACEOF
 
 cat >>$CONFIG_STATUS <<_ACEOF
 ac_cs_version="\\
-config.status
+python config.status 2.3
 configured by $0, generated by GNU Autoconf 2.53,
   with options \\"`echo "$ac_configure_args" | sed 's/[\\""\`\$]/\\\\&/g'`\\"
 

diff --git a/configure.in b/configure.in
index a3b726c8cab07765ce9d2a431e7816a7604b80aa..a7f6ac227dbca73b781ec4631d88294f00bd92b0 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -1,7 +1,12 @@
 dnl Process this file with autoconf 2.0 or later to make a configure script.
+
+# Set VERSION so we only need to edit in one place (i.e., here)
+m4_define(PYTHON_VERSION, 2.3)
+
 AC_REVISION($Revision$)
 AC_PREREQ(2.53)
-AC_INIT(Include/object.h)
+AC_INIT(python, PYTHON_VERSION)
+AC_CONFIG_SRCDIR([Include/object.h])
 AC_CONFIG_HEADER(pyconfig.h)
 
 # This is for stuff that absolutely must end up in pyconfig.h.
@@ -13,9 +18,8 @@ AH_BOTTOM([
 #endif
 ])
 
-# Set VERSION so we only need to edit in one place (i.e., here)
 AC_SUBST(VERSION)
-VERSION=2.3
+VERSION=PYTHON_VERSION
 
 AC_SUBST(SOVERSION)
 SOVERSION=1.0
@@ -2397,7 +2401,8 @@ done
 AC_MSG_RESULT(done)
 
 # generate output files
-AC_OUTPUT(Makefile.pre Modules/Setup.config)
+AC_CONFIG_FILES(Makefile.pre Modules/Setup.config)
+AC_OUTPUT
 
 echo "creating Setup"
 if test ! -f Modules/Setup