Update of /cvsroot/python/python/dist/src In directory sc8-pr-cvs1:/tmp/cvs-serv23108 Modified Files: Tag: release23-maint configure Added Files: Tag: release23-maint aclocal.m4 Log Message: fix for bug #811160 - autoconf vs. hp/ux system header files. --- NEW FILE: aclocal.m4 --- # Code swiped wholesale from the GCC project, see # http://gcc.gnu.org/bugzilla/show_bug.cgi?id=12100 # This file can go away once autoconf 2.58 is out and being used - # it's reported that this is fixed in the autoconf cvs already. # AC_LANG_FUNC_LINK_TRY(C)(FUNCTION) # ---------------------------------- # Don't include <ctype.h> because on OSF/1 3.0 it includes # <sys/types.h> which includes <sys/select.h> which contains a # prototype for select. Similarly for bzero. # # A similar problem afflicts HP/UX, but it also hits <sys/time.h> # # This test used to merely assign f=$1 in main(), but that was # optimized away by HP unbundled cc A.05.36 for ia64 under +O3, # presumably on the basis that there's no need to do that store if the # program is about to exit. Conversely, the AIX linker optimizes an # unused external declaration that initializes f=$1. So this test # program has both an external initialization of f, and a use of f in # main that affects the exit status. # m4_define([AC_LANG_FUNC_LINK_TRY(C)], [AC_LANG_PROGRAM( [/* System header to define __stub macros and hopefully few prototypes, which can conflict with char $1 (); below. Prefer <limits.h> to <assert.h> if __STDC__ is defined, since <limits.h> exists even on freestanding compilers. Under hpux, including <limits.h> includes <sys/time.h> and causes problems checking for functions defined therein. */ #if defined (__STDC__) && !defined (_HPUX_SOURCE) # include <limits.h> #else # include <assert.h> #endif /* Override any gcc2 internal prototype to avoid an error. */ #ifdef __cplusplus extern "C" { #endif /* We use char because int might match the return type of a gcc2 builtin and then its argument prototype would still apply. */ char $1 (); /* The GNU C library defines this for functions which it implements to always fail with ENOSYS. Some functions are actually named something starting with __ and the normal name is an alias. */ #if defined (__stub_$1) || defined (__stub___$1) choke me #else char (*f) () = $1; #endif #ifdef __cplusplus } #endif ], [return f != $1;])]) Index: configure =================================================================== RCS file: /cvsroot/python/python/dist/src/configure,v retrieving revision 1.416.4.6 retrieving revision 1.416.4.7 diff -C2 -d -r1.416.4.6 -r1.416.4.7 *** configure 25 Sep 2003 15:20:55 -0000 1.416.4.6 --- configure 27 Sep 2003 08:58:55 -0000 1.416.4.7 *************** *** 1,4 **** #! /bin/sh ! # From configure.in Revision: 1.427.4.5 . # Guess values for system-dependent variables and create Makefiles. # Generated by GNU Autoconf 2.57 for python 2.3. --- 1,4 ---- #! /bin/sh ! # From configure.in Revision: 1.427.4.6 . # Guess values for system-dependent variables and create Makefiles. # Generated by GNU Autoconf 2.57 for python 2.3. *************** *** 11350,11355 **** which can conflict with char pthread_detach (); below. Prefer <limits.h> to <assert.h> if __STDC__ is defined, since ! <limits.h> exists even on freestanding compilers. */ ! #ifdef __STDC__ # include <limits.h> #else --- 11350,11357 ---- which can conflict with char pthread_detach (); below. Prefer <limits.h> to <assert.h> if __STDC__ is defined, since ! <limits.h> exists even on freestanding compilers. Under hpux, ! including <limits.h> includes <sys/time.h> and causes problems ! checking for functions defined therein. */ ! #if defined (__STDC__) && !defined (_HPUX_SOURCE) # include <limits.h> #else *************** *** 12301,12306 **** which can conflict with char $ac_func (); below. Prefer <limits.h> to <assert.h> if __STDC__ is defined, since ! <limits.h> exists even on freestanding compilers. */ ! #ifdef __STDC__ # include <limits.h> #else --- 12303,12310 ---- which can conflict with char $ac_func (); below. Prefer <limits.h> to <assert.h> if __STDC__ is defined, since ! <limits.h> exists even on freestanding compilers. Under hpux, ! including <limits.h> includes <sys/time.h> and causes problems ! checking for functions defined therein. */ ! #if defined (__STDC__) && !defined (_HPUX_SOURCE) # include <limits.h> #else *************** *** 12886,12891 **** which can conflict with char $ac_func (); below. Prefer <limits.h> to <assert.h> if __STDC__ is defined, since ! <limits.h> exists even on freestanding compilers. */ ! #ifdef __STDC__ # include <limits.h> #else --- 12890,12897 ---- which can conflict with char $ac_func (); below. Prefer <limits.h> to <assert.h> if __STDC__ is defined, since ! <limits.h> exists even on freestanding compilers. Under hpux, ! including <limits.h> includes <sys/time.h> and causes problems ! checking for functions defined therein. */ ! #if defined (__STDC__) && !defined (_HPUX_SOURCE) # include <limits.h> #else *************** *** 13101,13106 **** which can conflict with char $ac_func (); below. Prefer <limits.h> to <assert.h> if __STDC__ is defined, since ! <limits.h> exists even on freestanding compilers. */ ! #ifdef __STDC__ # include <limits.h> #else --- 13107,13114 ---- which can conflict with char $ac_func (); below. Prefer <limits.h> to <assert.h> if __STDC__ is defined, since ! <limits.h> exists even on freestanding compilers. Under hpux, ! including <limits.h> includes <sys/time.h> and causes problems ! checking for functions defined therein. */ ! #if defined (__STDC__) && !defined (_HPUX_SOURCE) # include <limits.h> #else *************** *** 13999,14004 **** which can conflict with char $ac_func (); below. Prefer <limits.h> to <assert.h> if __STDC__ is defined, since ! <limits.h> exists even on freestanding compilers. */ ! #ifdef __STDC__ # include <limits.h> #else --- 14007,14014 ---- which can conflict with char $ac_func (); below. Prefer <limits.h> to <assert.h> if __STDC__ is defined, since ! <limits.h> exists even on freestanding compilers. Under hpux, ! including <limits.h> includes <sys/time.h> and causes problems ! checking for functions defined therein. */ ! #if defined (__STDC__) && !defined (_HPUX_SOURCE) # include <limits.h> #else *************** *** 14145,14150 **** which can conflict with char $ac_func (); below. Prefer <limits.h> to <assert.h> if __STDC__ is defined, since ! <limits.h> exists even on freestanding compilers. */ ! #ifdef __STDC__ # include <limits.h> #else --- 14155,14162 ---- which can conflict with char $ac_func (); below. Prefer <limits.h> to <assert.h> if __STDC__ is defined, since ! <limits.h> exists even on freestanding compilers. Under hpux, ! including <limits.h> includes <sys/time.h> and causes problems ! checking for functions defined therein. */ ! #if defined (__STDC__) && !defined (_HPUX_SOURCE) # include <limits.h> #else *************** *** 14298,14303 **** which can conflict with char $ac_func (); below. Prefer <limits.h> to <assert.h> if __STDC__ is defined, since ! <limits.h> exists even on freestanding compilers. */ ! #ifdef __STDC__ # include <limits.h> #else --- 14310,14317 ---- which can conflict with char $ac_func (); below. Prefer <limits.h> to <assert.h> if __STDC__ is defined, since ! <limits.h> exists even on freestanding compilers. Under hpux, ! including <limits.h> includes <sys/time.h> and causes problems ! checking for functions defined therein. */ ! #if defined (__STDC__) && !defined (_HPUX_SOURCE) # include <limits.h> #else *************** *** 14387,14392 **** which can conflict with char $ac_func (); below. Prefer <limits.h> to <assert.h> if __STDC__ is defined, since ! <limits.h> exists even on freestanding compilers. */ ! #ifdef __STDC__ # include <limits.h> #else --- 14401,14408 ---- which can conflict with char $ac_func (); below. Prefer <limits.h> to <assert.h> if __STDC__ is defined, since ! <limits.h> exists even on freestanding compilers. Under hpux, ! including <limits.h> includes <sys/time.h> and causes problems ! checking for functions defined therein. */ ! #if defined (__STDC__) && !defined (_HPUX_SOURCE) # include <limits.h> #else *************** *** 14474,14479 **** which can conflict with char $ac_func (); below. Prefer <limits.h> to <assert.h> if __STDC__ is defined, since ! <limits.h> exists even on freestanding compilers. */ ! #ifdef __STDC__ # include <limits.h> #else --- 14490,14497 ---- which can conflict with char $ac_func (); below. Prefer <limits.h> to <assert.h> if __STDC__ is defined, since ! <limits.h> exists even on freestanding compilers. Under hpux, ! including <limits.h> includes <sys/time.h> and causes problems ! checking for functions defined therein. */ ! #if defined (__STDC__) && !defined (_HPUX_SOURCE) # include <limits.h> #else *************** *** 14598,14603 **** which can conflict with char $ac_func (); below. Prefer <limits.h> to <assert.h> if __STDC__ is defined, since ! <limits.h> exists even on freestanding compilers. */ ! #ifdef __STDC__ # include <limits.h> #else --- 14616,14623 ---- which can conflict with char $ac_func (); below. Prefer <limits.h> to <assert.h> if __STDC__ is defined, since ! <limits.h> exists even on freestanding compilers. Under hpux, ! including <limits.h> includes <sys/time.h> and causes problems ! checking for functions defined therein. */ ! #if defined (__STDC__) && !defined (_HPUX_SOURCE) # include <limits.h> #else *************** *** 14722,14727 **** which can conflict with char $ac_func (); below. Prefer <limits.h> to <assert.h> if __STDC__ is defined, since ! <limits.h> exists even on freestanding compilers. */ ! #ifdef __STDC__ # include <limits.h> #else --- 14742,14749 ---- which can conflict with char $ac_func (); below. Prefer <limits.h> to <assert.h> if __STDC__ is defined, since ! <limits.h> exists even on freestanding compilers. Under hpux, ! including <limits.h> includes <sys/time.h> and causes problems ! checking for functions defined therein. */ ! #if defined (__STDC__) && !defined (_HPUX_SOURCE) # include <limits.h> #else *************** *** 15102,15107 **** which can conflict with char $ac_func (); below. Prefer <limits.h> to <assert.h> if __STDC__ is defined, since ! <limits.h> exists even on freestanding compilers. */ ! #ifdef __STDC__ # include <limits.h> #else --- 15124,15131 ---- which can conflict with char $ac_func (); below. Prefer <limits.h> to <assert.h> if __STDC__ is defined, since ! <limits.h> exists even on freestanding compilers. Under hpux, ! including <limits.h> includes <sys/time.h> and causes problems ! checking for functions defined therein. */ ! #if defined (__STDC__) && !defined (_HPUX_SOURCE) # include <limits.h> #else *************** *** 16467,16472 **** which can conflict with char gethostbyname_r (); below. Prefer <limits.h> to <assert.h> if __STDC__ is defined, since ! <limits.h> exists even on freestanding compilers. */ ! #ifdef __STDC__ # include <limits.h> #else --- 16491,16498 ---- which can conflict with char gethostbyname_r (); below. Prefer <limits.h> to <assert.h> if __STDC__ is defined, since ! <limits.h> exists even on freestanding compilers. Under hpux, ! including <limits.h> includes <sys/time.h> and causes problems ! checking for functions defined therein. */ ! #if defined (__STDC__) && !defined (_HPUX_SOURCE) # include <limits.h> #else *************** *** 16742,16747 **** which can conflict with char $ac_func (); below. Prefer <limits.h> to <assert.h> if __STDC__ is defined, since ! <limits.h> exists even on freestanding compilers. */ ! #ifdef __STDC__ # include <limits.h> #else --- 16768,16775 ---- which can conflict with char $ac_func (); below. Prefer <limits.h> to <assert.h> if __STDC__ is defined, since ! <limits.h> exists even on freestanding compilers. Under hpux, ! including <limits.h> includes <sys/time.h> and causes problems ! checking for functions defined therein. */ ! #if defined (__STDC__) && !defined (_HPUX_SOURCE) # include <limits.h> #else *************** *** 16835,16840 **** which can conflict with char __fpu_control (); below. Prefer <limits.h> to <assert.h> if __STDC__ is defined, since ! <limits.h> exists even on freestanding compilers. */ ! #ifdef __STDC__ # include <limits.h> #else --- 16863,16870 ---- which can conflict with char __fpu_control (); below. Prefer <limits.h> to <assert.h> if __STDC__ is defined, since ! <limits.h> exists even on freestanding compilers. Under hpux, ! including <limits.h> includes <sys/time.h> and causes problems ! checking for functions defined therein. */ ! #if defined (__STDC__) && !defined (_HPUX_SOURCE) # include <limits.h> #else *************** *** 17067,17072 **** which can conflict with char $ac_func (); below. Prefer <limits.h> to <assert.h> if __STDC__ is defined, since ! <limits.h> exists even on freestanding compilers. */ ! #ifdef __STDC__ # include <limits.h> #else --- 17097,17104 ---- which can conflict with char $ac_func (); below. Prefer <limits.h> to <assert.h> if __STDC__ is defined, since ! <limits.h> exists even on freestanding compilers. Under hpux, ! including <limits.h> includes <sys/time.h> and causes problems ! checking for functions defined therein. */ ! #if defined (__STDC__) && !defined (_HPUX_SOURCE) # include <limits.h> #else