From 4e08379891ba67b93fb9d238e4c064ab92c81787 Mon Sep 17 00:00:00 2001
From: Guido van Rossum <guido@python.org>
Date: Thu, 16 Dec 1999 17:52:08 +0000
Subject: [PATCH] Patch and new file by Geoff Furnish for C++ compilation.

---
 Modules/Makefile.pre.in |  8 ++++++--
 Modules/ccpython.cc     | 11 +++++++++++
 2 files changed, 17 insertions(+), 2 deletions(-)
 create mode 100644 Modules/ccpython.cc

diff --git a/Modules/Makefile.pre.in b/Modules/Makefile.pre.in
index f25f2049eba..389227c5617 100644
--- a/Modules/Makefile.pre.in
+++ b/Modules/Makefile.pre.in
@@ -17,7 +17,7 @@ VERSION=	@VERSION@
 srcdir=		@srcdir@
 VPATH=		@srcdir@
 
-@SET_CCC@
+@SET_CXX@
 CC=		@CC@
 RANLIB=		@RANLIB@
 AR=		@AR@
@@ -95,7 +95,8 @@ MAKESETUP=	$(srcdir)/makesetup
 FIXOBJS=	config.o getpath.o main.o getbuildinfo.o
 OBJS=		$(MODOBJS) $(FIXOBJS)
 
-MAINOBJ=	python.o
+#MAINOBJ=	python.o
+MAINOBJ=	@MAINOBJ@
 
 SYSLIBS=	$(LIBM) $(LIBC)
 
@@ -243,4 +244,7 @@ $(DESTSHARED):
 			fi; \
 		done
 
+ccpython.o: ccpython.cc
+	$(CXX) $(CFLAGS) -c $*.cc
+
 # Stuff is appended here by makesetup and make depend
diff --git a/Modules/ccpython.cc b/Modules/ccpython.cc
new file mode 100644
index 00000000000..a6e97ff6a50
--- /dev/null
+++ b/Modules/ccpython.cc
@@ -0,0 +1,11 @@
+/* Minimal main program -- everything is loaded from the library */
+
+#include "Python.h"
+
+extern "C"
+DL_EXPORT(int) Py_Main( int argc, char *argv[] );
+
+int main( int argc, char *argv[] )
+{
+	return Py_Main(argc, argv);
+}