[Python-checkins] CVS: python/dist/src configure.in,1.180,1.181 configure,1.172,1.173
Martin v. Löwis
python-dev@python.org
Wed, 13 Dec 2000 09:37:05 -0800
Update of /cvsroot/python/python/dist/src
In directory slayer.i.sourceforge.net:/tmp/cvs-serv15143
Modified Files:
configure.in configure
Log Message:
Set CXX even when --with-cxx is not specified. Closes bug 14782.
Index: configure.in
===================================================================
RCS file: /cvsroot/python/python/dist/src/configure.in,v
retrieving revision 1.180
retrieving revision 1.181
diff -C2 -r1.180 -r1.181
*** configure.in 2000/11/29 02:44:05 1.180
--- configure.in 2000/12/13 17:37:02 1.181
***************
*** 154,157 ****
--- 154,158 ----
AC_MSG_CHECKING(for --with-cxx=<compiler>)
AC_ARG_WITH(cxx, [ --with-cxx=<compiler> enable C++ support],[
+ check_cxx=no
case $withval in
no) CXX=
***************
*** 162,168 ****
--- 163,188 ----
esac], [
with_cxx=no
+ check_cxx=yes
])
AC_MSG_RESULT($with_cxx)
+
+ dnl The following fragment works similar to AC_PROG_CXX.
+ dnl It does not fail if CXX is not found, and it is not executed if
+ dnl --with-cxx was given.
+ dnl Finally, it does not test whether CXX is g++.
+
+ if test "$check_cxx" = "yes"
+ then
+ AC_CHECK_PROGS(CXX, $CCC c++ g++ gcc CC cxx cc++ cl, notfound)
+ if test "$CXX" = "notfound"
+ then
+ CXX=
+ else
+ AC_PROG_CXX_WORKS
+ fi
+ fi
+
SET_CXX="CXX=$CXX"
+
#AC_MSG_CHECKING(CCC)
Index: configure
===================================================================
RCS file: /cvsroot/python/python/dist/src/configure,v
retrieving revision 1.172
retrieving revision 1.173
diff -C2 -r1.172 -r1.173
*** configure 2000/11/29 02:44:05 1.172
--- configure 2000/12/13 17:37:02 1.173
***************
*** 1,5 ****
#! /bin/sh
! # From configure.in Revision: 1.179
# Guess values for system-dependent variables and create Makefiles.
--- 1,5 ----
#! /bin/sh
! # From configure.in Revision: 1.180
[...3997 lines suppressed...]
*** 5896,5900 ****
echo $ac_n "checking for Modules/Setup""... $ac_c" 1>&6
! echo "configure:5899: checking for Modules/Setup" >&5
if test ! -f Modules/Setup ; then
if test ! -d Modules ; then
--- 5992,5996 ----
echo $ac_n "checking for Modules/Setup""... $ac_c" 1>&6
! echo "configure:5995: checking for Modules/Setup" >&5
if test ! -f Modules/Setup ; then
if test ! -d Modules ; then
***************
*** 6051,6054 ****
--- 6147,6151 ----
s%@SET_CXX@%$SET_CXX%g
s%@MAINOBJ@%$MAINOBJ%g
+ s%@CXX@%$CXX%g
s%@CC@%$CC%g
s%@EXE@%$EXE%g