traverseda
/
cpython
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Explicitly undefine PACKAGE_ variables. Fixes #746012.

This commit is contained in:
Martin v. Löwis 2003-06-14 07:48:07 +00:00
parent ba8f5ff76c
commit 8316feb155
2 changed files with 15 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
configure vendored
View File

@ -1,5 +1,5 @@
#! /bin/sh #! /bin/sh
# From configure.in Revision: 1.413 . # From configure.in Revision: 1.414 .
# Guess values for system-dependent variables and create Makefiles. # Guess values for system-dependent variables and create Makefiles.
# Generated by GNU Autoconf 2.53 for python 2.3. # Generated by GNU Autoconf 2.53 for python 2.3.
# #
@ -1231,13 +1231,17 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
ac_config_headers="$ac_config_headers pyconfig.h" ac_config_headers="$ac_config_headers pyconfig.h"
# This is for stuff that absolutely must end up in pyconfig.h.
# Please use pyport.h instead, if possible.
# 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
VERSION=2.3 VERSION=2.3

10
configure.in
View File

@ -9,8 +9,8 @@ AC_INIT(python, PYTHON_VERSION)
AC_CONFIG_SRCDIR([Include/object.h]) AC_CONFIG_SRCDIR([Include/object.h])
AC_CONFIG_HEADER(pyconfig.h) AC_CONFIG_HEADER(pyconfig.h)
# This is for stuff that absolutely must end up in pyconfig.h. dnl This is for stuff that absolutely must end up in pyconfig.h.
# Please use pyport.h instead, if possible. dnl Please use pyport.h instead, if possible.
AH_TOP([ AH_TOP([
#ifndef Py_PYCONFIG_H #ifndef Py_PYCONFIG_H
#define Py_PYCONFIG_H #define Py_PYCONFIG_H
@ -24,6 +24,12 @@ AH_BOTTOM([
#endif /*Py_PYCONFIG_H*/ #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) AC_SUBST(VERSION)
VERSION=PYTHON_VERSION VERSION=PYTHON_VERSION