[Stackless-checkins] CVS: slpdev/src/2.2/src .cvsignore, 1.5, 1.6 configure, 1.10, 1.11 configure.in, 1.3, 1.4

Christian Tismer tismer at centera.de
Sat May 1 00:11:29 CEST 2004


Update of /home/cvs/slpdev/src/2.2/src
In directory centera.de:/tmp/cvs-serv13270/src

Modified Files:
	.cvsignore configure configure.in 
Log Message:
checking Python 2.2.3 back in, almost unmodified.
The only modifications are in PCbuild, and the additon of the
new Stackless for 2.3.3 trunk.

Purpose: I will apply all current changes to 2.3.3 back to 2.2.3.
Since I'm unsure how to do this on the current dev trunk by CVS,
and since I never imported 2.2.3 before, I prefer to do it this
way, using the merge program explicitly.


Index: .cvsignore
===================================================================
RCS file: /home/cvs/slpdev/src/2.2/src/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** .cvsignore	25 Aug 2002 16:36:49 -0000	1.5
--- .cvsignore	30 Apr 2004 22:11:26 -0000	1.6
***************
*** 5,12 ****
  Makefile
  buildno
  build
  Makefile.pre
  platform
  pyconfig.h
- *.pyo
- *.pyc
--- 5,11 ----
  Makefile
  buildno
+ python
  build
  Makefile.pre
  platform
  pyconfig.h

Index: configure
===================================================================
RCS file: /home/cvs/slpdev/src/2.2/src/configure,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** configure	25 Jan 2004 18:50:25 -0000	1.10
--- configure	30 Apr 2004 22:11:26 -0000	1.11
***************
*** 648,655 ****
  fi
  
- # Execute stackless script
- 
- . $srcdir/Stackless/slpconf.sh
- 
  #
  # SGI compilers allow the specification of the both the ABI and the
--- 648,651 ----
***************
*** 3027,3031 ****
  #include "confdefs.h"
  #include <stdio.h>
!   #include <pthread.h>
    main()
    {
--- 3023,3027 ----
  #include "confdefs.h"
  #include <stdio.h>
! #include <pthread.h>
    main()
    {
***************
*** 3719,3725 ****
  #include "confdefs.h"
  #include <unistd.h>
!      #ifdef _POSIX_THREADS
!      yes
!      #endif
      
  EOF
--- 3715,3721 ----
  #include "confdefs.h"
  #include <unistd.h>
! #ifdef _POSIX_THREADS
! yes
! #endif
      
  EOF
***************
*** 7631,7635 ****
  
  
! SRCDIRS="Parser Grammar Objects Python Modules Stackless"
  echo $ac_n "checking for build directories""... $ac_c" 1>&6
  echo "configure:7632: checking for build directories" >&5
--- 7627,7631 ----
  
  
! SRCDIRS="Parser Grammar Objects Python Modules"
  echo $ac_n "checking for build directories""... $ac_c" 1>&6
  echo "configure:7632: checking for build directories" >&5
***************
*** 7827,7831 ****
  s%@THREADHEADERS@%$THREADHEADERS%g
  s%@SRCDIRS@%$SRCDIRS%g
- s%@SLPFLAGS@%$SLPFLAGS%g
  
  CEOF
--- 7823,7826 ----

Index: configure.in
===================================================================
RCS file: /home/cvs/slpdev/src/2.2/src/configure.in,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** configure.in	27 Sep 2003 16:52:07 -0000	1.3
--- configure.in	30 Apr 2004 22:11:26 -0000	1.4
***************
*** 670,674 ****
    AC_CACHE_VAL(ac_cv_sizeof_pthread_t,
    [AC_TRY_RUN([#include <stdio.h>
!   #include <pthread.h>
    main()
    {
--- 670,674 ----
    AC_CACHE_VAL(ac_cv_sizeof_pthread_t,
    [AC_TRY_RUN([#include <stdio.h>
! #include <pthread.h>
    main()
    {
***************
*** 1060,1066 ****
      AC_EGREP_CPP(yes,
      [#include <unistd.h>
!      #ifdef _POSIX_THREADS
!      yes
!      #endif
      ], unistd_defines_pthreads=yes, unistd_defines_pthreads=no)
      AC_MSG_RESULT($unistd_defines_pthreads)
--- 1060,1066 ----
      AC_EGREP_CPP(yes,
      [#include <unistd.h>
! #ifdef _POSIX_THREADS
! yes
! #endif
      ], unistd_defines_pthreads=yes, unistd_defines_pthreads=no)
      AC_MSG_RESULT($unistd_defines_pthreads)
***************
*** 2119,2123 ****
  
  AC_SUBST(SRCDIRS)
! SRCDIRS="Parser Grammar Objects Python Modules Stackless"
  AC_MSG_CHECKING(for build directories)
  for dir in $SRCDIRS; do
--- 2119,2123 ----
  
  AC_SUBST(SRCDIRS)
! SRCDIRS="Parser Grammar Objects Python Modules"
  AC_MSG_CHECKING(for build directories)
  for dir in $SRCDIRS; do


_______________________________________________
Stackless-checkins mailing list
Stackless-checkins at stackless.com
http://www.stackless.com/mailman/listinfo/stackless-checkins



More information about the Stackless-checkins mailing list