[Python-checkins] python/dist/src configure.in,1.414,1.415 configure,1.403,1.404

2003年6月14日 00:48:12 -0700

Update of /cvsroot/python/python/dist/src
In directory sc8-pr-cvs1:/tmp/cvs-serv31086
Modified Files:
	configure.in configure 
Log Message:
Explicitly undefine PACKAGE_ variables. Fixes #746012.
Index: configure.in
===================================================================
RCS file: /cvsroot/python/python/dist/src/configure.in,v
retrieving revision 1.414
retrieving revision 1.415
diff -C2 -d -r1.414 -r1.415
*** configure.in	31 May 2003 07:58:45 -0000	1.414
--- configure.in	14 Jun 2003 07:48:05 -0000	1.415
***************
*** 10,15 ****
 AC_CONFIG_HEADER(pyconfig.h)
 
! # This is for stuff that absolutely must end up in pyconfig.h.
! # Please use pyport.h instead, if possible.
 AH_TOP([
 #ifndef Py_PYCONFIG_H
--- 10,15 ----
 AC_CONFIG_HEADER(pyconfig.h)
 
! dnl This is for stuff that absolutely must end up in pyconfig.h.
! dnl Please use pyport.h instead, if possible.
 AH_TOP([
 #ifndef Py_PYCONFIG_H
***************
*** 24,27 ****
--- 24,33 ----
 #endif /*Py_PYCONFIG_H*/
 ])
+ 
+ # We don't use PACKAGE_ variables, and they cause conflicts
+ # with other autoconf-based packages that include Python.h
+ grep -v 'define PACKAGE_' <confdefs.h >confdefs.h.new
+ rm confdefs.h
+ mv confdefs.h.new confdefs.h
 
 AC_SUBST(VERSION)
Index: configure
===================================================================
RCS file: /cvsroot/python/python/dist/src/configure,v
retrieving revision 1.403
retrieving revision 1.404
diff -C2 -d -r1.403 -r1.404
*** configure	31 May 2003 07:58:41 -0000	1.403
--- configure	14 Jun 2003 07:48:07 -0000	1.404
***************
*** 1,4 ****
 #! /bin/sh
! # From configure.in Revision: 1.413 .
 # Guess values for system-dependent variables and create Makefiles.
 # Generated by GNU Autoconf 2.53 for python 2.3.
--- 1,4 ----
 #! /bin/sh
! # From configure.in Revision: 1.414 .
 # Guess values for system-dependent variables and create Makefiles.
 # Generated by GNU Autoconf 2.53 for python 2.3.
***************
*** 1232,1241 ****
 
 
- # This is for stuff that absolutely must end up in pyconfig.h.
- # Please use pyport.h instead, if possible.
 
 
 
 
 
 
--- 1232,1245 ----
 
 
 
 
 
 
+ 
+ # We don't use PACKAGE_ variables, and they cause conflicts
+ # with other autoconf-based packages that include Python.h
+ grep -v 'define PACKAGE_' <confdefs.h >confdefs.h.new
+ rm confdefs.h
+ mv confdefs.h.new confdefs.h