[Python-checkins] CVS: python/dist/src Makefile.pre.in,1.67,1.68 configure.in,1.282,1.283 configure,1.273,1.274

2001年12月02日 05:02:36 -0800

Update of /cvsroot/python/python/dist/src
In directory usw-pr-cvs1:/tmp/cvs-serv4991
Modified Files:
	Makefile.pre.in configure.in configure 
Log Message:
Compute thread headers through shell expansion in configure.
Fixes #485679.
Index: Makefile.pre.in
===================================================================
RCS file: /cvsroot/python/python/dist/src/Makefile.pre.in,v
retrieving revision 1.67
retrieving revision 1.68
diff -C2 -d -r1.67 -r1.68
*** Makefile.pre.in	2001年11月24日 09:39:05	1.67
--- Makefile.pre.in	2001年12月02日 13:02:32	1.68
***************
*** 895,899 ****
 # Dependencies
 
! Python/thread.o: $(srcdir)/Python/thread_*.h
 
 # IF YOU PUT ANYTHING HERE IT WILL GO AWAY
--- 895,899 ----
 # Dependencies
 
! Python/thread.o: @THREADHEADERS@
 
 # IF YOU PUT ANYTHING HERE IT WILL GO AWAY
Index: configure.in
===================================================================
RCS file: /cvsroot/python/python/dist/src/configure.in,v
retrieving revision 1.282
retrieving revision 1.283
diff -C2 -d -r1.282 -r1.283
*** configure.in	2001年12月02日 10:15:37	1.282
--- configure.in	2001年12月02日 13:02:32	1.283
***************
*** 2019,2022 ****
--- 2019,2029 ----
 #fi
 
+ AC_SUBST(THREADHEADERS)
+ 
+ for h in `(cd $srcdir;echo Python/thread_*.h)`
+ do
+ THREADHEADERS="$THREADHEADERS \$(srcdir)/$h"
+ done
+ 
 AC_SUBST(SRCDIRS)
 SRCDIRS="Parser Grammar Objects Python Modules"
Index: configure
===================================================================
RCS file: /cvsroot/python/python/dist/src/configure,v
retrieving revision 1.273
retrieving revision 1.274
diff -C2 -d -r1.273 -r1.274
*** configure	2001年12月02日 10:15:36	1.273
--- configure	2001年12月02日 13:02:32	1.274
***************
*** 1,5 ****
 #! /bin/sh
 
! # From configure.in Revision: 1.281 
 
 # Guess values for system-dependent variables and create Makefiles.
--- 1,5 ----
 #! /bin/sh
 
! # From configure.in Revision: 1.282 
 
 # Guess values for system-dependent variables and create Makefiles.
***************
*** 7514,7520 ****
 
 
 SRCDIRS="Parser Grammar Objects Python Modules"
 echo $ac_n "checking for build directories""... $ac_c" 1>&6
! echo "configure:7519: checking for build directories" >&5
 for dir in $SRCDIRS; do
 if test ! -d $dir; then
--- 7514,7527 ----
 
 
+ 
+ for h in `(cd $srcdir;echo Python/thread_*.h)`
+ do
+ THREADHEADERS="$THREADHEADERS \$(srcdir)/$h"
+ done
+ 
+ 
 SRCDIRS="Parser Grammar Objects Python Modules"
 echo $ac_n "checking for build directories""... $ac_c" 1>&6
! echo "configure:7526: checking for build directories" >&5
 for dir in $SRCDIRS; do
 if test ! -d $dir; then
***************
*** 7707,7710 ****
--- 7714,7718 ----
 s%@LIBC@%$LIBC%g
 s%@UNICODE_OBJS@%$UNICODE_OBJS%g
+ s%@THREADHEADERS@%$THREADHEADERS%g
 s%@SRCDIRS@%$SRCDIRS%g