[Python-checkins] CVS: python/dist/src configure,1.104,1.105 configure.in,1.112,1.113

[Guido van Rossum]

Update of /projects/cvsroot/python/dist/src
In directory eric:/projects/python/develop/guido/src

Modified Files:
	configure configure.in 
Log Message:
Patch by Geoff Furnish to make compiling with C++ more gentle.
(The configure script is regenerated, not from his patch.)


Index: configure
===================================================================
RCS file: /projects/cvsroot/python/dist/src/configure,v
retrieving revision 1.104
retrieving revision 1.105
diff -C2 -r1.104 -r1.105
*** configure	1999/12/14 21:11:46	1.104
--- configure	1999/12/16 17:50:52	1.105
***************
*** 1,5 ****
  #! /bin/sh
  
! # From configure.in Revision: 1.111 
  
  # Guess values for system-dependent variables and create Makefiles.
--- 1,5 ----
  #! /bin/sh
  
! # From configure.in Revision: 1.113 
  
[...3156 lines suppressed...]
--- 4703,4707 ----
  }
  EOF
! if { (eval echo configure:4706: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
  then
    ac_cv_malloc_zero=nonnull
***************
*** 4824,4828 ****
  s%@MACHDEP@%$MACHDEP%g
  s%@SGI_ABI@%$SGI_ABI%g
! s%@SET_CCC@%$SET_CCC%g
  s%@CC@%$CC%g
  s%@MAKE_LDLIBRARY@%$MAKE_LDLIBRARY%g
--- 4867,4872 ----
  s%@MACHDEP@%$MACHDEP%g
  s%@SGI_ABI@%$SGI_ABI%g
! s%@SET_CXX@%$SET_CXX%g
! s%@MAINOBJ@%$MAINOBJ%g
  s%@CC@%$CC%g
  s%@MAKE_LDLIBRARY@%$MAKE_LDLIBRARY%g

Index: configure.in
===================================================================
RCS file: /projects/cvsroot/python/dist/src/configure.in,v
retrieving revision 1.112
retrieving revision 1.113
diff -C2 -r1.112 -r1.113
*** configure.in	1999/12/14 21:11:47	1.112
--- configure.in	1999/12/16 17:50:52	1.113
***************
*** 1,4 ****
  dnl Process this file with autoconf 2.0 or later to make a configure script.
! AC_REVISION($Revision: 1.112 $)
  AC_PREREQ(2.0)
  AC_INIT(Include/object.h)
--- 1,4 ----
  dnl Process this file with autoconf 2.0 or later to make a configure script.
! AC_REVISION($Revision: 1.113 $)
  AC_PREREQ(2.0)
  AC_INIT(Include/object.h)
***************
*** 83,99 ****
  # Not all make programs have this predefined.
  #
! AC_SUBST(SET_CCC)
! AC_MSG_CHECKING(CCC)
! if test -z "$CCC"
! then
! 	case $ac_sys_system in
! 	IRIX*)	SET_CCC="CCC= CC ${SGI_ABI}";;
! 	Linux*) SET_CCC="CCC= g++";;
! 	*)	SET_CCC=""
! 	esac
! else
!         SET_CCC="CCC= ${CCC}"
! fi
! AC_MSG_RESULT($SET_CCC)
  
  
--- 83,99 ----
  # Not all make programs have this predefined.
  #
! #AC_SUBST(SET_CCC)
! #AC_MSG_CHECKING(CCC)
! #if test -z "$CCC"
! #then
! #	case $ac_sys_system in
! #	IRIX*)	SET_CCC="CCC= CC ${SGI_ABI}";;
! #	Linux*) SET_CCC="CCC= g++";;
! #	*)	SET_CCC=""
! #	esac
! #else
! #        SET_CCC="CCC= ${CCC}"
! #fi
! #AC_MSG_RESULT($SET_CCC)
  
  
***************
*** 153,156 ****
--- 153,186 ----
  AC_MSG_RESULT($without_gcc)
  
+ AC_SUBST(SET_CXX)
+ AC_SUBST(MAINOBJ)
+ MAINOBJ=python.o
+ AC_MSG_CHECKING(for --with-cxx=<compiler>)
+ AC_ARG_WITH(cxx, [--with-cxx=<compiler>     enable C++ support],[
+ 	case $withval in
+ 	no)	CXX=
+ 		with_cxx=no;;
+ 	*)	CXX=$withval
+ 		MAINOBJ=ccpython.o
+ 		with_cxx=$withval;;
+ 	esac], [
+ 	with_cxx=no
+ ])
+ AC_MSG_RESULT($with_cxx)
+ SET_CXX="CXX = $CXX"
+ 
+ #AC_MSG_CHECKING(CCC)
+ #if test -z "$CCC"
+ #then
+ #	case $ac_sys_system in
+ #	IRIX*)	SET_CCC="CCC= CC ${SGI_ABI}";;
+ #	Linux*) SET_CCC="CCC= g++";;
+ #	*)	SET_CCC=""
+ #	esac
+ #else
+ #        SET_CCC="CCC= ${CCC}"
+ #fi
+ #AC_MSG_RESULT($SET_CCC)
+ 
  # If the user switches compilers, we can't believe the cache
  if test ! -z "$ac_cv_prog_CC" -a ! -z "$CC" -a "$CC" != "$ac_cv_prog_CC"
***************
*** 193,196 ****
--- 223,230 ----
  AC_SUBST(LINKCC)
  AC_MSG_CHECKING(LINKCC)
+ if test -z "$LINKCC" -a ! -z "$CXX"
+ then
+     LINKCC="$CXX"
+ fi
  if test -z "$LINKCC"
  then