From 9c1133678652e7c43f10f29cb3fa204665316860 Mon Sep 17 00:00:00 2001 From: Mark Dickinson Date: Sat, 5 Sep 2009 10:36:23 +0000 Subject: [PATCH] Merged revisions 74667 via svnmerge from svn+ssh://pythondev@svn.python.org/python/trunk ........ r74667 | mark.dickinson | 2009-09-05 11:27:00 +0100 (Sat, 05 Sep 2009) | 2 lines Add configure-time checks for gamma and error functions. ........ --- configure | 102 +++++++++++++++++++++++++++++++++++++++++++++++++- configure.in | 3 +- pyconfig.h.in | 15 ++++++++ 3 files changed, 117 insertions(+), 3 deletions(-) diff --git a/configure b/configure index f36bc1c44ba..cdf9d8657cd 100755 --- a/configure +++ b/configure @@ -1,5 +1,5 @@ #! /bin/sh -# From configure.in Revision: 74045 . +# From configure.in Revision: 74073 . # Guess values for system-dependent variables and create Makefiles. # Generated by GNU Autoconf 2.61 for python 3.2. # @@ -23281,7 +23281,105 @@ fi -for ac_func in acosh asinh atanh copysign expm1 finite hypot log1p round +for ac_func in acosh asinh atanh copysign erf erfc expm1 finite gamma +do +as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh` +{ echo "$as_me:$LINENO: checking for $ac_func" >&5 +echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6; } +if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +/* Define $ac_func to an innocuous variant, in case declares $ac_func. + For example, HP-UX 11i declares gettimeofday. */ +#define $ac_func innocuous_$ac_func + +/* 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__ +# include +#else +# include +#endif + +#undef $ac_func + +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ +#ifdef __cplusplus +extern "C" +#endif +char $ac_func (); +/* 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_$ac_func || defined __stub___$ac_func +choke me +#endif + +int +main () +{ +return $ac_func (); + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext conftest$ac_exeext +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_link") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest$ac_exeext && + $as_test_x conftest$ac_exeext; then + eval "$as_ac_var=yes" +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + eval "$as_ac_var=no" +fi + +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ + conftest$ac_exeext conftest.$ac_ext +fi +ac_res=`eval echo '${'$as_ac_var'}'` + { echo "$as_me:$LINENO: result: $ac_res" >&5 +echo "${ECHO_T}$ac_res" >&6; } +if test `eval echo '${'$as_ac_var'}'` = yes; then + cat >>confdefs.h <<_ACEOF +#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1 +_ACEOF + +fi +done + + + + + + +for ac_func in hypot lgamma log1p round tgamma do as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh` { echo "$as_me:$LINENO: checking for $ac_func" >&5 diff --git a/configure.in b/configure.in index f503a09ef03..2c5fa696153 100644 --- a/configure.in +++ b/configure.in @@ -3260,7 +3260,8 @@ then [Define if tanh(-0.) is -0., or if platform doesn't have signed zeros]) fi -AC_CHECK_FUNCS([acosh asinh atanh copysign expm1 finite hypot log1p round]) +AC_CHECK_FUNCS([acosh asinh atanh copysign erf erfc expm1 finite gamma]) +AC_CHECK_FUNCS([hypot lgamma log1p round tgamma]) AC_CHECK_DECLS([isinf, isnan, isfinite], [], [], [[#include ]]) LIBS=$LIBS_SAVE diff --git a/pyconfig.h.in b/pyconfig.h.in index a3e27ce220c..5225c7c9eb2 100644 --- a/pyconfig.h.in +++ b/pyconfig.h.in @@ -178,6 +178,12 @@ /* Define if you have the 'epoll' functions. */ #undef HAVE_EPOLL +/* Define to 1 if you have the `erf' function. */ +#undef HAVE_ERF + +/* Define to 1 if you have the `erfc' function. */ +#undef HAVE_ERFC + /* Define to 1 if you have the header file. */ #undef HAVE_ERRNO_H @@ -244,6 +250,9 @@ /* Define to 1 if you have the `gai_strerror' function. */ #undef HAVE_GAI_STRERROR +/* Define to 1 if you have the `gamma' function. */ +#undef HAVE_GAMMA + /* Define if we can use gcc inline assembler to get and set x87 control word */ #undef HAVE_GCC_ASM_FOR_X87 @@ -374,6 +383,9 @@ /* Define to 1 if you have the `lchown' function. */ #undef HAVE_LCHOWN +/* Define to 1 if you have the `lgamma' function. */ +#undef HAVE_LGAMMA + /* Define to 1 if you have the `dl' library (-ldl). */ #undef HAVE_LIBDL @@ -774,6 +786,9 @@ /* Define to 1 if you have the header file. */ #undef HAVE_TERM_H +/* Define to 1 if you have the `tgamma' function. */ +#undef HAVE_TGAMMA + /* Define to 1 if you have the header file. */ #undef HAVE_THREAD_H