[Python-checkins] python/dist/src configure,1.348,1.349 configure.in,1.359,1.360

Sat, 26 Oct 2002 06:47:46 -0700

Update of /cvsroot/python/python/dist/src
In directory usw-pr-cvs1:/tmp/cvs-serv12551

Modified Files:
	configure configure.in 
Log Message:
Patch #623771: Properly use autoconf 2.5x macros.

Index: configure
===================================================================
RCS file: /cvsroot/python/python/dist/src/configure,v
retrieving revision 1.348
retrieving revision 1.349
diff -C2 -d -r1.348 -r1.349
*** configure	26 Oct 2002 13:32:58 -0000	1.348
--- configure	26 Oct 2002 13:47:43 -0000	1.349
***************
*** 1,6 ****
  #! /bin/sh
! # From configure.in Revision: 1.358 .
  # Guess values for system-dependent variables and create Makefiles.
! # Generated by GNU Autoconf 2.53.
  #
  # Copyright 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, 2002
--- 1,6 ----
  #! /bin/sh
! # From configure.in Revision: 1.359 .
  # Guess values for system-dependent variables and create Makefiles.
! # Generated by GNU Autoconf 2.53 for python 2.3.
  #
  # Copyright 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, 2002
***************
*** 254,262 ****

  # Identity of this package.
! PACKAGE_NAME=
! PACKAGE_TARNAME=
! PACKAGE_VERSION=
! PACKAGE_STRING=
! PACKAGE_BUGREPORT=

  ac_unique_file="Include/object.h"
--- 254,262 ----

  # Identity of this package.
! PACKAGE_NAME='python'
! PACKAGE_TARNAME='python'
! PACKAGE_VERSION='2.3'
! PACKAGE_STRING='python 2.3'
! PACKAGE_BUGREPORT=''

  ac_unique_file="Include/object.h"
***************
*** 762,766 ****
    # 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.

  Usage: $0 [OPTION]... [VAR=VALUE]...
--- 762,766 ----
    # This message is too long to be a string in the A/UX 3.1 sh.
    cat <<_ACEOF
! \`configure' configures python 2.3 to adapt to many kinds of systems.

  Usage: $0 [OPTION]... [VAR=VALUE]...
***************
*** 818,822 ****

  if test -n "$ac_init_help"; then
! 
    cat <<\_ACEOF

--- 818,824 ----

  if test -n "$ac_init_help"; then
!   case $ac_init_help in
!      short | recursive ) echo "Configuration of python 2.3:";;
!    esac
    cat <<\_ACEOF

***************
*** 928,931 ****
--- 930,935 ----
  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
***************
*** 941,945 ****
  running configure, to aid debugging if configure makes a mistake.

! It was created by $as_me, which was
  generated by GNU Autoconf 2.53.  Invocation command line was

--- 945,949 ----
  running configure, to aid debugging if configure makes a mistake.

! It was created by python $as_me 2.3, which was
  generated by GNU Autoconf 2.53.  Invocation command line was

***************
*** 1211,1214 ****
--- 1215,1227 ----

+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
  ac_config_headers="$ac_config_headers pyconfig.h"

***************
*** 1219,1223 ****

- # Set VERSION so we only need to edit in one place (i.e., here)

  VERSION=2.3
--- 1232,1235 ----
***************
*** 9875,9879 ****
  fi;

! # Determine if signalmodule should be used.

--- 9887,9891 ----
  fi;

! # Determine isignalmodule should be used.

***************
*** 16440,16443 ****
--- 16452,16456 ----
  # 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
***************
*** 16765,16769 ****
  cat >&5 <<_CSEOF

! This file was extended by $as_me, which was
  generated by GNU Autoconf 2.53.  Invocation command line was

--- 16778,16782 ----
  cat >&5 <<_CSEOF

! This file was extended by python $as_me 2.3, which was
  generated by GNU Autoconf 2.53.  Invocation command line was

***************
*** 16824,16828 ****
  cat >>$CONFIG_STATUS <<_ACEOF
  ac_cs_version="\\
! config.status
  configured by $0, generated by GNU Autoconf 2.53,
    with options \\"`echo "$ac_configure_args" | sed 's/[\\""\`\$]/\\\\&/g'`\\"
--- 16837,16841 ----
  cat >>$CONFIG_STATUS <<_ACEOF
  ac_cs_version="\\
! python config.status 2.3
  configured by $0, generated by GNU Autoconf 2.53,
    with options \\"`echo "$ac_configure_args" | sed 's/[\\""\`\$]/\\\\&/g'`\\"

Index: configure.in
===================================================================
RCS file: /cvsroot/python/python/dist/src/configure.in,v
retrieving revision 1.359
retrieving revision 1.360
diff -C2 -d -r1.359 -r1.360
*** configure.in	26 Oct 2002 13:33:00 -0000	1.359
--- configure.in	26 Oct 2002 13:47:44 -0000	1.360
***************
*** 1,6 ****
  dnl Process this file with autoconf 2.0 or later to make a configure script.
  AC_REVISION($Revision$)
  AC_PREREQ(2.53)
! AC_INIT(Include/object.h)
  AC_CONFIG_HEADER(pyconfig.h)

--- 1,11 ----
  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(python, PYTHON_VERSION)
! AC_CONFIG_SRCDIR([Include/object.h])
  AC_CONFIG_HEADER(pyconfig.h)

***************
*** 14,20 ****
  ])

- # Set VERSION so we only need to edit in one place (i.e., here)
  AC_SUBST(VERSION)
! VERSION=2.3

  AC_SUBST(SOVERSION)
--- 19,24 ----
  ])

  AC_SUBST(VERSION)
! VERSION=PYTHON_VERSION

  AC_SUBST(SOVERSION)
***************
*** 2398,2402 ****

  # generate output files
! AC_OUTPUT(Makefile.pre Modules/Setup.config)

  echo "creating Setup"
--- 2402,2407 ----

  # generate output files
! AC_CONFIG_FILES(Makefile.pre Modules/Setup.config)
! AC_OUTPUT

  echo "creating Setup"