[Python-checkins] CVS: python/dist/src configure.in,1.193,1.194

[Guido van Rossum]

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

Modified Files:
	configure.in 
Log Message:
Fix some make errors during "make clobber" or "make distclean", caused
by weird and (hopefully) unnecessary SET_CXX and SET_DLLLIBRARY macros
that occurr at the start of Makefile.in files.

- Also removed the already-commented-out SET_CCC macro cruft.


Index: configure.in
===================================================================
RCS file: /cvsroot/python/python/dist/src/configure.in,v
retrieving revision 1.193
retrieving revision 1.194
diff -C2 -r1.193 -r1.194
*** configure.in	2001/01/17 21:59:33	1.193
--- configure.in	2001/01/23 01:52:26	1.194
***************
*** 83,106 ****
  AC_MSG_RESULT($MACHDEP)
  
- #
- # CCC is the command that compiles C++ programs
- #
- # 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)
  
- 
  # checks for alternative programs
  AC_MSG_CHECKING(for --without-gcc)
--- 83,87 ----
***************
*** 149,153 ****
  AC_MSG_RESULT($without_gcc)
  
! AC_SUBST(SET_CXX)
  AC_SUBST(MAINOBJ)
  MAINOBJ=python.o
--- 130,134 ----
  AC_MSG_RESULT($without_gcc)
  
! AC_SUBST(CXX)
  AC_SUBST(MAINOBJ)
  MAINOBJ=python.o
***************
*** 183,201 ****
  fi
  
- 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
--- 164,167 ----
***************
*** 242,248 ****
  AC_SUBST(MAKE_LDLIBRARY)
  AC_SUBST(LDLIBRARY)
! AC_SUBST(SET_DLLLIBRARY)
  LDLIBRARY=''
! SET_DLLLIBRARY=''
  
  # LINKCC is the command that links the python executable -- default is $(CC).
--- 208,214 ----
  AC_SUBST(MAKE_LDLIBRARY)
  AC_SUBST(LDLIBRARY)
! AC_SUBST(DLLLIBRARY)
  LDLIBRARY=''
! DLLLIBRARY=''
  
  # LINKCC is the command that links the python executable -- default is $(CC).
***************
*** 289,293 ****
  cygwin*)
        LDLIBRARY='libpython$(VERSION).dll.a'
!       SET_DLLLIBRARY='DLLLIBRARY=	$(basename $(LDLIBRARY))'
        ;;
  esac
--- 255,259 ----
  cygwin*)
        LDLIBRARY='libpython$(VERSION).dll.a'
!       DLLLIBRARY='$(basename $(LDLIBRARY))'
        ;;
  esac