[Python-checkins] python/dist/src configure,1.279.6.17,1.279.6.18 configure.in,1.288.6.17,1.288.6.18
nnorwitz@users.sourceforge.net
nnorwitz@users.sourceforge.net
Sun, 23 Feb 2003 15:34:40 -0800
Update of /cvsroot/python/python/dist/src
In directory sc8-pr-cvs1:/tmp/cvs-serv19433
Modified Files:
Tag: release22-maint
configure configure.in
Log Message:
Backport relevant portions of:
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.279.6.17
retrieving revision 1.279.6.18
diff -C2 -d -r1.279.6.17 -r1.279.6.18
*** configure 7 Feb 2003 15:54:27 -0000 1.279.6.17
--- configure 23 Feb 2003 23:34:32 -0000 1.279.6.18
***************
*** 1,5 ****
#! /bin/sh
! # From configure.in Revision: 1.288.6.15
# Guess values for system-dependent variables and create Makefiles.
--- 1,5 ----
#! /bin/sh
! # From configure.in Revision: 1.288.6.17
# Guess values for system-dependent variables and create Makefiles.
***************
*** 2452,2461 ****
#include "confdefs.h"
#include <stdio.h>
! main()
{
FILE *f=fopen("conftestval", "w");
! if (!f) exit(1);
fprintf(f, "%d\n", sizeof(int));
! exit(0);
}
EOF
--- 2452,2461 ----
#include "confdefs.h"
#include <stdio.h>
! int main()
{
FILE *f=fopen("conftestval", "w");
! if (!f) return(1);
fprintf(f, "%d\n", sizeof(int));
! return(0);
}
EOF
***************
*** 2491,2500 ****
#include "confdefs.h"
#include <stdio.h>
! main()
{
FILE *f=fopen("conftestval", "w");
! if (!f) exit(1);
fprintf(f, "%d\n", sizeof(long));
! exit(0);
}
EOF
--- 2491,2500 ----
#include "confdefs.h"
#include <stdio.h>
! int main()
{
FILE *f=fopen("conftestval", "w");
! if (!f) return(1);
fprintf(f, "%d\n", sizeof(long));
! return(0);
}
EOF
***************
*** 2530,2539 ****
#include "confdefs.h"
#include <stdio.h>
! main()
{
FILE *f=fopen("conftestval", "w");
! if (!f) exit(1);
fprintf(f, "%d\n", sizeof(void *));
! exit(0);
}
EOF
--- 2530,2539 ----
#include "confdefs.h"
#include <stdio.h>
! int main()
{
FILE *f=fopen("conftestval", "w");
! if (!f) return(1);
fprintf(f, "%d\n", sizeof(void *));
! return(0);
}
EOF
***************
*** 2569,2578 ****
#include "confdefs.h"
#include <stdio.h>
! main()
{
FILE *f=fopen("conftestval", "w");
! if (!f) exit(1);
fprintf(f, "%d\n", sizeof(char));
! exit(0);
}
EOF
--- 2569,2578 ----
#include "confdefs.h"
#include <stdio.h>
! int main()
{
FILE *f=fopen("conftestval", "w");
! if (!f) return(1);
fprintf(f, "%d\n", sizeof(char));
! return(0);
}
EOF
***************
*** 2608,2617 ****
#include "confdefs.h"
#include <stdio.h>
! main()
{
FILE *f=fopen("conftestval", "w");
! if (!f) exit(1);
fprintf(f, "%d\n", sizeof(short));
! exit(0);
}
EOF
--- 2608,2617 ----
#include "confdefs.h"
#include <stdio.h>
! int main()
{
FILE *f=fopen("conftestval", "w");
! if (!f) return(1);
fprintf(f, "%d\n", sizeof(short));
! return(0);
}
EOF
***************
*** 2647,2656 ****
#include "confdefs.h"
#include <stdio.h>
! main()
{
FILE *f=fopen("conftestval", "w");
! if (!f) exit(1);
fprintf(f, "%d\n", sizeof(float));
! exit(0);
}
EOF
--- 2647,2656 ----
#include "confdefs.h"
#include <stdio.h>
! int main()
{
FILE *f=fopen("conftestval", "w");
! if (!f) return(1);
fprintf(f, "%d\n", sizeof(float));
! return(0);
}
EOF
***************
*** 2686,2695 ****
#include "confdefs.h"
#include <stdio.h>
! main()
{
FILE *f=fopen("conftestval", "w");
! if (!f) exit(1);
fprintf(f, "%d\n", sizeof(double));
! exit(0);
}
EOF
--- 2686,2695 ----
#include "confdefs.h"
#include <stdio.h>
! int main()
{
FILE *f=fopen("conftestval", "w");
! if (!f) return(1);
fprintf(f, "%d\n", sizeof(double));
! return(0);
}
EOF
***************
*** 2725,2734 ****
#include "confdefs.h"
#include <stdio.h>
! main()
{
FILE *f=fopen("conftestval", "w");
! if (!f) exit(1);
fprintf(f, "%d\n", sizeof(fpos_t));
! exit(0);
}
EOF
--- 2725,2734 ----
#include "confdefs.h"
#include <stdio.h>
! int main()
{
FILE *f=fopen("conftestval", "w");
! if (!f) return(1);
fprintf(f, "%d\n", sizeof(fpos_t));
! return(0);
}
EOF
***************
*** 2789,2798 ****
#include "confdefs.h"
#include <stdio.h>
! main()
{
FILE *f=fopen("conftestval", "w");
! if (!f) exit(1);
fprintf(f, "%d\n", sizeof(long long));
! exit(0);
}
EOF
--- 2789,2798 ----
#include "confdefs.h"
#include <stdio.h>
! int main()
{
FILE *f=fopen("conftestval", "w");
! if (!f) return(1);
fprintf(f, "%d\n", sizeof(long long));
! return(0);
}
EOF
***************
*** 2854,2863 ****
#include "confdefs.h"
#include <stdio.h>
! main()
{
FILE *f=fopen("conftestval", "w");
! if (!f) exit(1);
fprintf(f, "%d\n", sizeof(uintptr_t));
! exit(0);
}
EOF
--- 2854,2863 ----
#include "confdefs.h"
#include <stdio.h>
! int main()
{
FILE *f=fopen("conftestval", "w");
! if (!f) return(1);
fprintf(f, "%d\n", sizeof(uintptr_t));
! return(0);
}
EOF
***************
*** 3023,3027 ****
#include "confdefs.h"
#include <stdio.h>
! #include <pthread.h>
main()
{
--- 3023,3027 ----
#include "confdefs.h"
#include <stdio.h>
! #include <pthread.h>
main()
{
***************
*** 3715,3721 ****
#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
Index: configure.in
===================================================================
RCS file: /cvsroot/python/python/dist/src/configure.in,v
retrieving revision 1.288.6.17
retrieving revision 1.288.6.18
diff -C2 -d -r1.288.6.17 -r1.288.6.18
*** configure.in 7 Feb 2003 15:54:52 -0000 1.288.6.17
--- configure.in 23 Feb 2003 23:34:37 -0000 1.288.6.18
***************
*** 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)