[Python-checkins] CVS: python/dist/src Makefile.pre.in,1.28,1.29 configure.in,1.208,1.209 configure,1.200,1.201

[Fred L. Drake]

Update of /cvsroot/python/python/dist/src
In directory usw-pr-cvs1:/tmp/cvs-serv12130

Modified Files:
	Makefile.pre.in configure.in configure 
Log Message:

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.


Index: Makefile.pre.in
===================================================================
RCS file: /cvsroot/python/python/dist/src/Makefile.pre.in,v
retrieving revision 1.28
retrieving revision 1.29
diff -C2 -r1.28 -r1.29
*** Makefile.pre.in	2001/03/03 04:14:21	1.28
--- Makefile.pre.in	2001/03/06 05:52:16	1.29
***************
*** 273,278 ****
  
  # Build the interpreter
! $(PYTHON):	$(MAINOBJ) $(LDLIBRARY)
! 		$(LINKCC) $(LDFLAGS) $(LINKFORSHARED) -o $@ $(MAINOBJ) \
  			$(LDLIBRARY) $(LIBS) $(MODLIBS) $(SYSLIBS) $(LDLAST)
  
--- 273,279 ----
  
  # Build the interpreter
! $(PYTHON):	Modules/$(MAINOBJ) $(LDLIBRARY)
! 		$(LINKCC) $(LDFLAGS) $(LINKFORSHARED) -o $@ \
! 			Modules/$(MAINOBJ) \
  			$(LDLIBRARY) $(LIBS) $(MODLIBS) $(SYSLIBS) $(LDLAST)
  
***************
*** 452,456 ****
  		Include/pyfpe.h
  
! $(LIBRARY_OBJS) $(MODOBJS) $(MAINOBJ): $(PYTHON_HEADERS)
  
  
--- 453,457 ----
  		Include/pyfpe.h
  
! $(LIBRARY_OBJS) $(MODOBJS) Modules/$(MAINOBJ): $(PYTHON_HEADERS)
  
  
***************
*** 662,666 ****
  	fi
  	$(INSTALL_DATA) Modules/config.c $(LIBPL)/config.c
! 	$(INSTALL_DATA) Modules/python.o $(LIBPL)/python.o
  	$(INSTALL_DATA) $(srcdir)/Modules/config.c.in $(LIBPL)/config.c.in
  	$(INSTALL_DATA) Makefile $(LIBPL)/Makefile
--- 663,667 ----
  	fi
  	$(INSTALL_DATA) Modules/config.c $(LIBPL)/config.c
! 	$(INSTALL_DATA) Modules/$(MAINOBJ) $(LIBPL)/$(MAINOBJ)
  	$(INSTALL_DATA) $(srcdir)/Modules/config.c.in $(LIBPL)/config.c.in
  	$(INSTALL_DATA) Makefile $(LIBPL)/Makefile

Index: configure.in
===================================================================
RCS file: /cvsroot/python/python/dist/src/configure.in,v
retrieving revision 1.208
retrieving revision 1.209
diff -C2 -r1.208 -r1.209
*** configure.in	2001/03/04 06:39:33	1.208
--- configure.in	2001/03/06 05:52:16	1.209
***************
*** 129,133 ****
  AC_SUBST(CXX)
  AC_SUBST(MAINOBJ)
! MAINOBJ=Modules/python.o
  AC_MSG_CHECKING(for --with-cxx=<compiler>)
  AC_ARG_WITH(cxx, [  --with-cxx=<compiler>           enable C++ support],[
--- 129,133 ----
  AC_SUBST(CXX)
  AC_SUBST(MAINOBJ)
! MAINOBJ=python.o
  AC_MSG_CHECKING(for --with-cxx=<compiler>)
  AC_ARG_WITH(cxx, [  --with-cxx=<compiler>           enable C++ support],[
***************
*** 137,141 ****
  		with_cxx=no;;
  	*)	CXX=$withval
! 		MAINOBJ=Modules/ccpython.o
  		with_cxx=$withval;;
  	esac], [
--- 137,141 ----
  		with_cxx=no;;
  	*)	CXX=$withval
! 		MAINOBJ=ccpython.o
  		with_cxx=$withval;;
  	esac], [

Index: configure
===================================================================
RCS file: /cvsroot/python/python/dist/src/configure,v
retrieving revision 1.200
retrieving revision 1.201
diff -C2 -r1.200 -r1.201
*** configure	2001/03/04 06:39:33	1.200
--- configure	2001/03/06 05:52:16	1.201
***************
*** 1,5 ****
  #! /bin/sh
  
! # From configure.in Revision: 1.207 
  
  # Guess values for system-dependent variables and create Makefiles.
--- 1,5 ----
  #! /bin/sh
  
! # From configure.in Revision: 1.208 
  
  # Guess values for system-dependent variables and create Makefiles.
***************
*** 718,722 ****
  
  
! MAINOBJ=Modules/python.o
  echo $ac_n "checking for --with-cxx=<compiler>""... $ac_c" 1>&6
  echo "configure:723: checking for --with-cxx=<compiler>" >&5
--- 718,722 ----
  
  
! MAINOBJ=python.o
  echo $ac_n "checking for --with-cxx=<compiler>""... $ac_c" 1>&6
  echo "configure:723: checking for --with-cxx=<compiler>" >&5
***************
*** 730,734 ****
  		with_cxx=no;;
  	*)	CXX=$withval
! 		MAINOBJ=Modules/ccpython.o
  		with_cxx=$withval;;
  	esac
--- 730,734 ----
  		with_cxx=no;;
  	*)	CXX=$withval
! 		MAINOBJ=ccpython.o
  		with_cxx=$withval;;
  	esac
***************
*** 5042,5046 ****
  
  /* Ultrix mips cc rejects this.  */
! typedef int charset[2]; const charset x = {0,0};
  /* SunOS 4.1.1 cc rejects this.  */
  char const *const *ccp;
--- 5042,5046 ----
  
  /* Ultrix mips cc rejects this.  */
! typedef int charset[2]; const charset x;
  /* SunOS 4.1.1 cc rejects this.  */
  char const *const *ccp;