From 9fe1720507ec31cd0fa40331fedf1b9410c50757 Mon Sep 17 00:00:00 2001 From: Anthony Baxter Date: Sat, 27 Sep 2003 08:58:55 +0000 Subject: fix for bug #811160 - autoconf vs. hp/ux system header files. --- aclocal.m4 | 57 ++++++++++++++++++++++++++++++++++++ configure | 98 +++++++++++++++++++++++++++++++++++++++++--------------------- 2 files changed, 122 insertions(+), 33 deletions(-) create mode 100644 aclocal.m4 diff --git a/aclocal.m4 b/aclocal.m4 new file mode 100644 index 0000000..0ba8813 --- /dev/null +++ b/aclocal.m4 @@ -0,0 +1,57 @@ +# 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 because on OSF/1 3.0 it includes +# which includes which contains a +# prototype for select. Similarly for bzero. +# +# A similar problem afflicts HP/UX, but it also hits +# +# 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 to if __STDC__ is defined, since + exists even on freestanding compilers. Under hpux, + including includes and causes problems + checking for functions defined therein. */ +#if defined (__STDC__) && !defined (_HPUX_SOURCE) +# include +#else +# include +#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;])]) + + diff --git a/configure b/configure index 2113c2f..c9ee053 100755 --- a/configure +++ b/configure @@ -1,5 +1,5 @@ #! /bin/sh -# From configure.in Revision: 1.427.4.5 . +# 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. # @@ -11349,8 +11349,10 @@ cat >>conftest.$ac_ext <<_ACEOF /* System header to define __stub macros and hopefully few prototypes, which can conflict with char pthread_detach (); below. Prefer to if __STDC__ is defined, since - exists even on freestanding compilers. */ -#ifdef __STDC__ + exists even on freestanding compilers. Under hpux, + including includes and causes problems + checking for functions defined therein. */ +#if defined (__STDC__) && !defined (_HPUX_SOURCE) # include #else # include @@ -12300,8 +12302,10 @@ cat >>conftest.$ac_ext <<_ACEOF /* System header to define __stub macros and hopefully few prototypes, which can conflict with char $ac_func (); below. Prefer to if __STDC__ is defined, since - exists even on freestanding compilers. */ -#ifdef __STDC__ + exists even on freestanding compilers. Under hpux, + including includes and causes problems + checking for functions defined therein. */ +#if defined (__STDC__) && !defined (_HPUX_SOURCE) # include #else # include @@ -12885,8 +12889,10 @@ cat >>conftest.$ac_ext <<_ACEOF /* System header to define __stub macros and hopefully few prototypes, which can conflict with char $ac_func (); below. Prefer to if __STDC__ is defined, since - exists even on freestanding compilers. */ -#ifdef __STDC__ + exists even on freestanding compilers. Under hpux, + including includes and causes problems + checking for functions defined therein. */ +#if defined (__STDC__) && !defined (_HPUX_SOURCE) # include #else # include @@ -13100,8 +13106,10 @@ cat >>conftest.$ac_ext <<_ACEOF /* System header to define __stub macros and hopefully few prototypes, which can conflict with char $ac_func (); below. Prefer to if __STDC__ is defined, since - exists even on freestanding compilers. */ -#ifdef __STDC__ + exists even on freestanding compilers. Under hpux, + including includes and causes problems + checking for functions defined therein. */ +#if defined (__STDC__) && !defined (_HPUX_SOURCE) # include #else # include @@ -13998,8 +14006,10 @@ cat >>conftest.$ac_ext <<_ACEOF /* System header to define __stub macros and hopefully few prototypes, which can conflict with char $ac_func (); below. Prefer to if __STDC__ is defined, since - exists even on freestanding compilers. */ -#ifdef __STDC__ + exists even on freestanding compilers. Under hpux, + including includes and causes problems + checking for functions defined therein. */ +#if defined (__STDC__) && !defined (_HPUX_SOURCE) # include #else # include @@ -14144,8 +14154,10 @@ cat >>conftest.$ac_ext <<_ACEOF /* System header to define __stub macros and hopefully few prototypes, which can conflict with char $ac_func (); below. Prefer to if __STDC__ is defined, since - exists even on freestanding compilers. */ -#ifdef __STDC__ + exists even on freestanding compilers. Under hpux, + including includes and causes problems + checking for functions defined therein. */ +#if defined (__STDC__) && !defined (_HPUX_SOURCE) # include #else # include @@ -14297,8 +14309,10 @@ cat >>conftest.$ac_ext <<_ACEOF /* System header to define __stub macros and hopefully few prototypes, which can conflict with char $ac_func (); below. Prefer to if __STDC__ is defined, since - exists even on freestanding compilers. */ -#ifdef __STDC__ + exists even on freestanding compilers. Under hpux, + including includes and causes problems + checking for functions defined therein. */ +#if defined (__STDC__) && !defined (_HPUX_SOURCE) # include #else # include @@ -14386,8 +14400,10 @@ cat >>conftest.$ac_ext <<_ACEOF /* System header to define __stub macros and hopefully few prototypes, which can conflict with char $ac_func (); below. Prefer to if __STDC__ is defined, since - exists even on freestanding compilers. */ -#ifdef __STDC__ + exists even on freestanding compilers. Under hpux, + including includes and causes problems + checking for functions defined therein. */ +#if defined (__STDC__) && !defined (_HPUX_SOURCE) # include #else # include @@ -14473,8 +14489,10 @@ cat >>conftest.$ac_ext <<_ACEOF /* System header to define __stub macros and hopefully few prototypes, which can conflict with char $ac_func (); below. Prefer to if __STDC__ is defined, since - exists even on freestanding compilers. */ -#ifdef __STDC__ + exists even on freestanding compilers. Under hpux, + including includes and causes problems + checking for functions defined therein. */ +#if defined (__STDC__) && !defined (_HPUX_SOURCE) # include #else # include @@ -14597,8 +14615,10 @@ cat >>conftest.$ac_ext <<_ACEOF /* System header to define __stub macros and hopefully few prototypes, which can conflict with char $ac_func (); below. Prefer to if __STDC__ is defined, since - exists even on freestanding compilers. */ -#ifdef __STDC__ + exists even on freestanding compilers. Under hpux, + including includes and causes problems + checking for functions defined therein. */ +#if defined (__STDC__) && !defined (_HPUX_SOURCE) # include #else # include @@ -14721,8 +14741,10 @@ cat >>conftest.$ac_ext <<_ACEOF /* System header to define __stub macros and hopefully few prototypes, which can conflict with char $ac_func (); below. Prefer to if __STDC__ is defined, since - exists even on freestanding compilers. */ -#ifdef __STDC__ + exists even on freestanding compilers. Under hpux, + including includes and causes problems + checking for functions defined therein. */ +#if defined (__STDC__) && !defined (_HPUX_SOURCE) # include #else # include @@ -15101,8 +15123,10 @@ cat >>conftest.$ac_ext <<_ACEOF /* System header to define __stub macros and hopefully few prototypes, which can conflict with char $ac_func (); below. Prefer to if __STDC__ is defined, since - exists even on freestanding compilers. */ -#ifdef __STDC__ + exists even on freestanding compilers. Under hpux, + including includes and causes problems + checking for functions defined therein. */ +#if defined (__STDC__) && !defined (_HPUX_SOURCE) # include #else # include @@ -16466,8 +16490,10 @@ cat >>conftest.$ac_ext <<_ACEOF /* System header to define __stub macros and hopefully few prototypes, which can conflict with char gethostbyname_r (); below. Prefer to if __STDC__ is defined, since - exists even on freestanding compilers. */ -#ifdef __STDC__ + exists even on freestanding compilers. Under hpux, + including includes and causes problems + checking for functions defined therein. */ +#if defined (__STDC__) && !defined (_HPUX_SOURCE) # include #else # include @@ -16741,8 +16767,10 @@ cat >>conftest.$ac_ext <<_ACEOF /* System header to define __stub macros and hopefully few prototypes, which can conflict with char $ac_func (); below. Prefer to if __STDC__ is defined, since - exists even on freestanding compilers. */ -#ifdef __STDC__ + exists even on freestanding compilers. Under hpux, + including includes and causes problems + checking for functions defined therein. */ +#if defined (__STDC__) && !defined (_HPUX_SOURCE) # include #else # include @@ -16834,8 +16862,10 @@ cat >>conftest.$ac_ext <<_ACEOF /* System header to define __stub macros and hopefully few prototypes, which can conflict with char __fpu_control (); below. Prefer to if __STDC__ is defined, since - exists even on freestanding compilers. */ -#ifdef __STDC__ + exists even on freestanding compilers. Under hpux, + including includes and causes problems + checking for functions defined therein. */ +#if defined (__STDC__) && !defined (_HPUX_SOURCE) # include #else # include @@ -17066,8 +17096,10 @@ cat >>conftest.$ac_ext <<_ACEOF /* System header to define __stub macros and hopefully few prototypes, which can conflict with char $ac_func (); below. Prefer to if __STDC__ is defined, since - exists even on freestanding compilers. */ -#ifdef __STDC__ + exists even on freestanding compilers. Under hpux, + including includes and causes problems + checking for functions defined therein. */ +#if defined (__STDC__) && !defined (_HPUX_SOURCE) # include #else # include -- cgit v0.12