From a1a84e7d4f7b493bb6fa5415ce55d3f722221470 Mon Sep 17 00:00:00 2001
From: Fred Drake <fdrake@acm.org>
Date: Tue, 6 Mar 2001 05:52:16 +0000
Subject: [PATCH] Move all knowledge that $(MAINOBJ) is built in the Modules/
 directory into Makefile.pre.in; the configure script will only determine the
 basename of the file.

This fixes installation of a Python built using C++, reported by Greg
Wilson.
---
 Makefile.pre.in | 9 +++++----
 configure       | 8 ++++----
 configure.in    | 4 ++--
 3 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/Makefile.pre.in b/Makefile.pre.in
index 8876d2fa117..2006092b25c 100644
--- a/Makefile.pre.in
+++ b/Makefile.pre.in
@@ -272,8 +272,9 @@ LIBRARY_OBJS=	\
 all:		$(PYTHON) oldsharedmods sharedmods 
 
 # Build the interpreter
-$(PYTHON):	$(MAINOBJ) $(LDLIBRARY)
-		$(LINKCC) $(LDFLAGS) $(LINKFORSHARED) -o $@ $(MAINOBJ) \
+$(PYTHON):	Modules/$(MAINOBJ) $(LDLIBRARY)
+		$(LINKCC) $(LDFLAGS) $(LINKFORSHARED) -o $@ \
+			Modules/$(MAINOBJ) \
 			$(LDLIBRARY) $(LIBS) $(MODLIBS) $(SYSLIBS) $(LDLAST)
 
 platform: $(PYTHON)
@@ -451,7 +452,7 @@ PYTHON_HEADERS= \
 		Include/abstract.h \
 		Include/pyfpe.h
 
-$(LIBRARY_OBJS) $(MODOBJS) $(MAINOBJ): $(PYTHON_HEADERS)
+$(LIBRARY_OBJS) $(MODOBJS) Modules/$(MAINOBJ): $(PYTHON_HEADERS)
 
 
 ######################################################################
@@ -661,7 +662,7 @@ libainstall:	all
 		$(RANLIB) $(LIBPL)/$(LDLIBRARY) ; \
 	fi
 	$(INSTALL_DATA) Modules/config.c $(LIBPL)/config.c
-	$(INSTALL_DATA) Modules/python.o $(LIBPL)/python.o
+	$(INSTALL_DATA) Modules/$(MAINOBJ) $(LIBPL)/$(MAINOBJ)
 	$(INSTALL_DATA) $(srcdir)/Modules/config.c.in $(LIBPL)/config.c.in
 	$(INSTALL_DATA) Makefile $(LIBPL)/Makefile
 	$(INSTALL_DATA) Modules/Setup $(LIBPL)/Setup
diff --git a/configure b/configure
index b7ad64aa43c..bab3fff339d 100755
--- a/configure
+++ b/configure
@@ -1,6 +1,6 @@
 #! /bin/sh
 
-# From configure.in Revision: 1.207 
+# From configure.in Revision: 1.208 
 
 # Guess values for system-dependent variables and create Makefiles.
 # Generated automatically using autoconf version 2.13 
@@ -717,7 +717,7 @@ echo "$ac_t""$without_gcc" 1>&6
 
 
 
-MAINOBJ=Modules/python.o
+MAINOBJ=python.o
 echo $ac_n "checking for --with-cxx=<compiler>""... $ac_c" 1>&6
 echo "configure:723: checking for --with-cxx=<compiler>" >&5
 # Check whether --with-cxx or --without-cxx was given.
@@ -729,7 +729,7 @@ if test "${with_cxx+set}" = set; then
 	no)	CXX=
 		with_cxx=no;;
 	*)	CXX=$withval
-		MAINOBJ=Modules/ccpython.o
+		MAINOBJ=ccpython.o
 		with_cxx=$withval;;
 	esac
 else
@@ -5041,7 +5041,7 @@ else
 int main() {
 
 /* Ultrix mips cc rejects this.  */
-typedef int charset[2]; const charset x = {0,0};
+typedef int charset[2]; const charset x;
 /* SunOS 4.1.1 cc rejects this.  */
 char const *const *ccp;
 char **p;
diff --git a/configure.in b/configure.in
index bb439c754d9..92a5b4605bd 100644
--- a/configure.in
+++ b/configure.in
@@ -128,7 +128,7 @@ AC_MSG_RESULT($without_gcc)
 
 AC_SUBST(CXX)
 AC_SUBST(MAINOBJ)
-MAINOBJ=Modules/python.o
+MAINOBJ=python.o
 AC_MSG_CHECKING(for --with-cxx=<compiler>)
 AC_ARG_WITH(cxx, [  --with-cxx=<compiler>           enable C++ support],[
 	check_cxx=no
@@ -136,7 +136,7 @@ AC_ARG_WITH(cxx, [  --with-cxx=<compiler>           enable C++ support],[
 	no)	CXX=
 		with_cxx=no;;
 	*)	CXX=$withval
-		MAINOBJ=Modules/ccpython.o
+		MAINOBJ=ccpython.o
 		with_cxx=$withval;;
 	esac], [
 	with_cxx=no