Explicitly undefine PACKAGE_ variables. Fixes #746012.

2 files changed, 15 insertions, 5 deletions

diff --git a/configure b/configure
index 5439d26..5db96b3 100755
--- a/configure
+++ b/configure
@@ -1,5 +1,5 @@
 #! /bin/sh
-# From configure.in Revision: 1.413 .
+# 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.
 #
@@ -1231,13 +1231,17 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
 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
 
diff --git a/configure.in b/configure.in
index a5de444..963c664 100644
--- a/configure.in
+++ b/configure.in
@@ -9,8 +9,8 @@ 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.
-# Please use pyport.h instead, if possible.
+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
 #define Py_PYCONFIG_H
@@ -24,6 +24,12 @@ AH_BOTTOM([
 #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)
 VERSION=PYTHON_VERSION