summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMartin v. Löwis <martin@v.loewis.de>2002-11-11 13:37:28 (GMT)
committerMartin v. Löwis <martin@v.loewis.de>2002-11-11 13:37:28 (GMT)
commitbddf5a57ca94b93d251492b5adc50814e891e7f2 (patch)
treefb0b509d9eb4c44bd96ec4895bb7539fc54f188b
parente981a4eb3607f8b18acc1c715a6789f7aa7ac07c (diff)
downloadcpython-bddf5a57ca94b93d251492b5adc50814e891e7f2.zip
cpython-bddf5a57ca94b93d251492b5adc50814e891e7f2.tar.gz
cpython-bddf5a57ca94b93d251492b5adc50814e891e7f2.tar.bz2
Protect pyconfig.h from multiple inclusions.
-rwxr-xr-xconfigure4
-rw-r--r--configure.in6
-rw-r--r--pyconfig.h.in7
3 files changed, 16 insertions, 1 deletions
diff --git a/configure b/configure
index 32b00b2..3c902f8 100755
--- a/configure
+++ b/configure
@@ -1,5 +1,5 @@
#! /bin/sh
-# From configure.in Revision: 1.365 .
+# From configure.in Revision: 1.366 .
# Guess values for system-dependent variables and create Makefiles.
# Generated by GNU Autoconf 2.53 for python 2.3.
#
@@ -1237,6 +1237,8 @@ ac_config_headers="$ac_config_headers pyconfig.h"
+
+
VERSION=2.3
diff --git a/configure.in b/configure.in
index 79ace17..07f452d 100644
--- a/configure.in
+++ b/configure.in
@@ -11,11 +11,17 @@ 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
+#define Py_PYCONFIG_H
+])
AH_BOTTOM([
/* Define the macros needed if on a UnixWare 7.x system. */
#if defined(__USLC__) && defined(__SCO_VERSION__)
#define STRICT_SYSV_CURSES /* Don't use ncurses extensions */
#endif
+
+#endif /*Py_PYCONFIG_H*/
])
AC_SUBST(VERSION)
diff --git a/pyconfig.h.in b/pyconfig.h.in
index a8bede8..a6f7e83 100644
--- a/pyconfig.h.in
+++ b/pyconfig.h.in
@@ -1,5 +1,10 @@
/* pyconfig.h.in. Generated from configure.in by autoheader. */
+
+#ifndef Py_PYCONFIG_H
+#define Py_PYCONFIG_H
+
+
/* Define for AIX if your compiler is a genuine IBM xlC/xlC_r and you want
support for AIX C++ shared extension modules. */
#undef AIX_GENUINE_CPLUSPLUS
@@ -852,3 +857,5 @@
#define STRICT_SYSV_CURSES /* Don't use ncurses extensions */
#endif
+#endif /*Py_PYCONFIG_H*/
+