[Python-checkins] python/dist/src configure,1.379,1.380 configure.in,1.390,1.391

[nnorwitz@users.sourceforge.net]

Update of /cvsroot/python/python/dist/src
In directory sc8-pr-cvs1:/tmp/cvs-serv16229

Modified Files:
	configure configure.in 
Log Message:
Fix SF bug #691793, Python 2.3a2 build fails on Tru64

Need to make sure that preprocessor directives start in first column.
This means we can't indent code which has preprocessor directives,
nor have a space between [ #include for example.


Index: configure
===================================================================
RCS file: /cvsroot/python/python/dist/src/configure,v
retrieving revision 1.379
retrieving revision 1.380
diff -C2 -d -r1.379 -r1.380
*** configure	23 Feb 2003 22:59:01 -0000	1.379
--- configure	23 Feb 2003 23:28:08 -0000	1.380
***************
*** 1,4 ****
  #! /bin/sh
! # From configure.in Revision: 1.389 .
  # Guess values for system-dependent variables and create Makefiles.
  # Generated by GNU Autoconf 2.53 for python 2.3.
--- 1,4 ----
  #! /bin/sh
! # From configure.in Revision: 1.390 .
  # Guess values for system-dependent variables and create Makefiles.
  # Generated by GNU Autoconf 2.53 for python 2.3.
***************
*** 4747,4751 ****
  #line $LINENO "configure"
  #include "confdefs.h"
!  #include <sys/types.h>
  #ifdef F77_DUMMY_MAIN
  #  ifdef __cplusplus
--- 4747,4751 ----
  #line $LINENO "configure"
  #include "confdefs.h"
! #include <sys/types.h>
  #ifdef F77_DUMMY_MAIN
  #  ifdef __cplusplus
***************
*** 4787,4792 ****
  #include "confdefs.h"
  
!     #define _OSF_SOURCE 1
!     #include <sys/types.h>
  
  #ifdef F77_DUMMY_MAIN
--- 4787,4792 ----
  #include "confdefs.h"
  
! #define _OSF_SOURCE 1
! #include <sys/types.h>
  
  #ifdef F77_DUMMY_MAIN
***************
*** 9160,9164 ****
  #include "confdefs.h"
  #include <stdio.h>
!   #include <pthread.h>
    main()
    {
--- 9160,9164 ----
  #include "confdefs.h"
  #include <stdio.h>
! #include <pthread.h>
    main()
    {
***************
*** 10129,10136 ****
  #line $LINENO "configure"
  #include "confdefs.h"
  #include <unistd.h>
!      #ifdef _POSIX_THREADS
!      yes
!      #endif
  
  _ACEOF
--- 10129,10137 ----
  #line $LINENO "configure"
  #include "confdefs.h"
+ 
  #include <unistd.h>
! #ifdef _POSIX_THREADS
! yes
! #endif
  
  _ACEOF
***************
*** 13190,13200 ****
  #include "confdefs.h"
  
!   #if defined(MAJOR_IN_MKDEV)
!   #include <sys/mkdev.h>
!   #elif defined(MAJOR_IN_SYSMACROS)
!   #include <sys/sysmacros.h>
!   #else
!   #include <sys/types.h>
!   #endif
  
  #ifdef F77_DUMMY_MAIN
--- 13191,13201 ----
  #include "confdefs.h"
  
! #if defined(MAJOR_IN_MKDEV)
! #include <sys/mkdev.h>
! #elif defined(MAJOR_IN_SYSMACROS)
! #include <sys/sysmacros.h>
! #else
! #include <sys/types.h>
! #endif
  
  #ifdef F77_DUMMY_MAIN

Index: configure.in
===================================================================
RCS file: /cvsroot/python/python/dist/src/configure.in,v
retrieving revision 1.390
retrieving revision 1.391
diff -C2 -d -r1.390 -r1.391
*** configure.in	23 Feb 2003 22:59:00 -0000	1.390
--- configure.in	23 Feb 2003 23:28:15 -0000	1.391
***************
*** 764,768 ****
  # Check whether using makedev requires defining _OSF_SOURCE
  AC_MSG_CHECKING(for makedev)
! AC_TRY_LINK([ #include <sys/types.h> ],
  	    [ makedev(0, 0) ],
  	    ac_cv_has_makedev=yes,
--- 764,768 ----
  # Check whether using makedev requires defining _OSF_SOURCE
  AC_MSG_CHECKING(for makedev)
! AC_TRY_LINK([#include <sys/types.h> ],
  	    [ makedev(0, 0) ],
  	    ac_cv_has_makedev=yes,
***************
*** 771,776 ****
      # we didn't link, try if _OSF_SOURCE will allow us to link
      AC_TRY_LINK([
!     #define _OSF_SOURCE 1
!     #include <sys/types.h>
      ],
      [ makedev(0, 0) ],
--- 771,776 ----
      # we didn't link, try if _OSF_SOURCE will allow us to link
      AC_TRY_LINK([
! #define _OSF_SOURCE 1
! #include <sys/types.h>
      ],
      [ makedev(0, 0) ],
***************
*** 930,934 ****
    AC_CACHE_VAL(ac_cv_sizeof_pthread_t,
    [AC_TRY_RUN([#include <stdio.h>
!   #include <pthread.h>
    main()
    {
--- 930,934 ----
    AC_CACHE_VAL(ac_cv_sizeof_pthread_t,
    [AC_TRY_RUN([#include <stdio.h>
! #include <pthread.h>
    main()
    {
***************
*** 1358,1365 ****
      AC_MSG_CHECKING(for _POSIX_THREADS in unistd.h)
      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)
--- 1358,1366 ----
      AC_MSG_CHECKING(for _POSIX_THREADS in unistd.h)
      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)
***************
*** 1928,1938 ****
  AC_MSG_CHECKING(for major, minor, and makedev)
  AC_TRY_LINK([
!   #if defined(MAJOR_IN_MKDEV)
!   #include <sys/mkdev.h>
!   #elif defined(MAJOR_IN_SYSMACROS)
!   #include <sys/sysmacros.h>
!   #else
!   #include <sys/types.h>
!   #endif
  ],[
    makedev(major(0),minor(0));
--- 1929,1939 ----
  AC_MSG_CHECKING(for major, minor, and makedev)
  AC_TRY_LINK([
! #if defined(MAJOR_IN_MKDEV)
! #include <sys/mkdev.h>
! #elif defined(MAJOR_IN_SYSMACROS)
! #include <sys/sysmacros.h>
! #else
! #include <sys/types.h>
! #endif
  ],[
    makedev(major(0),minor(0));