summaryrefslogtreecommitdiffstats
path: root/configure
diff options
context:
space:
mode:
authorMartin v. Löwis <martin@v.loewis.de>2003-06-14 07:48:07 (GMT)
committerMartin v. Löwis <martin@v.loewis.de>2003-06-14 07:48:07 (GMT)
commit8316feb155c3db0114259eab86a7a19cf345cd2e (patch)
tree047590c9a9abb1cfb4c6f48f284503c4b7ea0f9a /configure
parentba8f5ff76c8e0aa7767a9a7c59f25a2db95f5d57 (diff)
downloadcpython-8316feb155c3db0114259eab86a7a19cf345cd2e.zip
cpython-8316feb155c3db0114259eab86a7a19cf345cd2e.tar.gz
cpython-8316feb155c3db0114259eab86a7a19cf345cd2e.tar.bz2
Explicitly undefine PACKAGE_ variables. Fixes #746012.
Diffstat (limited to 'configure')
-rwxr-xr-xconfigure10
1 files changed, 7 insertions, 3 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