[Python-checkins] CVS: python/dist/src configure,1.121,1.122 configure.in,1.130,1.131

2000年6月30日 09:21:06 -0700

Update of /cvsroot/python/python/dist/src
In directory slayer.i.sourceforge.net:/tmp/cvs-serv31678
Modified Files:
	configure configure.in 
Log Message:
Enable the garbage collection module by default. --without-cycle-gc
disables it. The gc test is moved to just after the thread test, as
is the wctype-functions test.
Modules/Setup.config is generated instead of Modules/Setup.thread.
Applied SF patch #100684 (loewis) to fix help alignment bug.
Index: configure
===================================================================
RCS file: /cvsroot/python/python/dist/src/configure,v
retrieving revision 1.121
retrieving revision 1.122
diff -C2 -r1.121 -r1.122
*** configure	2000年06月30日 04:57:55	1.121
--- configure	2000年06月30日 16:21:00	1.122
***************
*** 1,5 ****
 #! /bin/sh
 
! # From configure.in Revision: 1.129 
 
 # Guess values for system-dependent variables and create Makefiles.
--- 1,5 ----
 #! /bin/sh
 
! # From configure.in Revision: 1.130 
 
[...1824 lines suppressed...]
*** 5837,5841 ****
 s%@LIBM@%$LIBM%g
 s%@LIBC@%$LIBC%g
- s%@USE_GC_MODULE@%$USE_GC_MODULE%g
 
 CEOF
--- 5843,5846 ----
***************
*** 5884,5888 ****
 Python/Makefile \
 Modules/Makefile.pre \
! Modules/Setup.thread"}
 EOF
 cat >> $CONFIG_STATUS <<\EOF
--- 5889,5893 ----
 Python/Makefile \
 Modules/Makefile.pre \
! Modules/Setup.config"}
 EOF
 cat >> $CONFIG_STATUS <<\EOF
Index: configure.in
===================================================================
RCS file: /cvsroot/python/python/dist/src/configure.in,v
retrieving revision 1.130
retrieving revision 1.131
diff -C2 -r1.130 -r1.131
*** configure.in	2000年06月30日 04:57:55	1.130
--- configure.in	2000年06月30日 16:21:01	1.131
***************
*** 723,726 ****
--- 723,754 ----
 fi
 
+ # Check for GC support
+ AC_SUBST(USE_GC_MODULE)
+ USE_GC_MODULE=""
+ AC_MSG_CHECKING(for --with-cycle-gc)
+ AC_ARG_WITH(cycle-gc,
+ [ --with(out)-cycle-gc disable/enable garbage collection])
+ 
+ if test -z "$with_cycle_gc"
+ then with_cycle_gc="yes"
+ fi
+ if test "$with_cycle_gc" = "no"
+ then
+ USE_GC_MODULE="#"
+ else
+ AC_DEFINE(WITH_CYCLE_GC)
+ fi
+ AC_MSG_RESULT($with_cycle_gc)
+ 
+ # Check for --with-wctype-functions
+ AC_MSG_CHECKING(for --with-wctype-functions)
+ AC_ARG_WITH(wctype-functions, 
+ [ --with-wctype-functions use wctype.h functions], [
+ if test "$withval" != no
+ then AC_DEFINE(WANT_WCTYPE_FUNCTIONS) AC_MSG_RESULT(yes)
+ else AC_MSG_RESULT(no)
+ fi],
+ [AC_MSG_RESULT(no)])
+ 
 # -I${DLINCLDIR} is added to the compile rule for importdl.o
 AC_SUBST(DLINCLDIR)
***************
*** 1107,1131 ****
 AC_C_BIGENDIAN
 
- # Check for --with-wctype-functions
- AC_MSG_CHECKING(for --with-wctype-functions)
- AC_ARG_WITH(wctype-functions, 
- [ --with-wctype-functions use wctype.h functions], [
- if test "$withval" != no
- then AC_DEFINE(WANT_WCTYPE_FUNCTIONS) AC_MSG_RESULT(yes)
- else AC_MSG_RESULT(no)
- fi],
- [AC_MSG_RESULT(no)])
- 
- # Check for GC support
- AC_SUBST(USE_GC_MODULE)
- USE_GC_MODULE="#"
- AC_MSG_CHECKING(for --with-cycle-gc)
- AC_ARG_WITH(cycle-gc, [--with-cycle-gc enable garbage collection], [
- AC_MSG_RESULT($withval)
- AC_DEFINE(WITH_CYCLE_GC)
- USE_GC_MODULE=
- ],
- AC_MSG_RESULT(no))
- 
 # THIS MUST BE LAST, IT CAN BREAK OTHER TESTS!
 # Add sys/socket.h to confdefs.h
--- 1135,1138 ----
***************
*** 1143,1145 ****
 Python/Makefile \
 Modules/Makefile.pre \
! Modules/Setup.thread)
--- 1150,1152 ----
 Python/Makefile \
 Modules/Makefile.pre \
! Modules/Setup.config)