Thanks to visit codestin.com
Credit goes to github.com

Skip to content

Commit 0f63257

Browse files
committed
Merged revisions 68312 via svnmerge from
svn+ssh://[email protected]/python/trunk ........ r68312 | mark.dickinson | 2009-01-04 20:19:41 +0000 (Sun, 04 Jan 2009) | 4 lines It's wrong to use AC_REPLACE_FUNCS for hypot, since there's no longer any Python/hypot.c replacement file. Use AC_CHECK_FUNCS instead. This change should be backported to 2.6 and 3.0. ........
1 parent 52144f5 commit 0f63257

2 files changed

Lines changed: 3 additions & 107 deletions

File tree

configure

Lines changed: 2 additions & 104 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
#! /bin/sh
2-
# From configure.in Revision: 68245 .
2+
# From configure.in Revision: 68300 .
33
# Guess values for system-dependent variables and create Makefiles.
44
# Generated by GNU Autoconf 2.61 for python 3.1.
55
#
@@ -21379,116 +21379,14 @@ _ACEOF
2137921379
fi
2138021380

2138121381

21382-
for ac_func in hypot
21383-
do
21384-
as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
21385-
{ echo "$as_me:$LINENO: checking for $ac_func" >&5
21386-
echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6; }
21387-
if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
21388-
echo $ECHO_N "(cached) $ECHO_C" >&6
21389-
else
21390-
cat >conftest.$ac_ext <<_ACEOF
21391-
/* confdefs.h. */
21392-
_ACEOF
21393-
cat confdefs.h >>conftest.$ac_ext
21394-
cat >>conftest.$ac_ext <<_ACEOF
21395-
/* end confdefs.h. */
21396-
/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func.
21397-
For example, HP-UX 11i <limits.h> declares gettimeofday. */
21398-
#define $ac_func innocuous_$ac_func
21399-
21400-
/* System header to define __stub macros and hopefully few prototypes,
21401-
which can conflict with char $ac_func (); below.
21402-
Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
21403-
<limits.h> exists even on freestanding compilers. */
21404-
21405-
#ifdef __STDC__
21406-
# include <limits.h>
21407-
#else
21408-
# include <assert.h>
21409-
#endif
21410-
21411-
#undef $ac_func
21412-
21413-
/* Override any GCC internal prototype to avoid an error.
21414-
Use char because int might match the return type of a GCC
21415-
builtin and then its argument prototype would still apply. */
21416-
#ifdef __cplusplus
21417-
extern "C"
21418-
#endif
21419-
char $ac_func ();
21420-
/* The GNU C library defines this for functions which it implements
21421-
to always fail with ENOSYS. Some functions are actually named
21422-
something starting with __ and the normal name is an alias. */
21423-
#if defined __stub_$ac_func || defined __stub___$ac_func
21424-
choke me
21425-
#endif
21426-
21427-
int
21428-
main ()
21429-
{
21430-
return $ac_func ();
21431-
;
21432-
return 0;
21433-
}
21434-
_ACEOF
21435-
rm -f conftest.$ac_objext conftest$ac_exeext
21436-
if { (ac_try="$ac_link"
21437-
case "(($ac_try" in
21438-
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
21439-
*) ac_try_echo=$ac_try;;
21440-
esac
21441-
eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
21442-
(eval "$ac_link") 2>conftest.er1
21443-
ac_status=$?
21444-
grep -v '^ *+' conftest.er1 >conftest.err
21445-
rm -f conftest.er1
21446-
cat conftest.err >&5
21447-
echo "$as_me:$LINENO: \$? = $ac_status" >&5
21448-
(exit $ac_status); } && {
21449-
test -z "$ac_c_werror_flag" ||
21450-
test ! -s conftest.err
21451-
} && test -s conftest$ac_exeext &&
21452-
$as_test_x conftest$ac_exeext; then
21453-
eval "$as_ac_var=yes"
21454-
else
21455-
echo "$as_me: failed program was:" >&5
21456-
sed 's/^/| /' conftest.$ac_ext >&5
21457-
21458-
eval "$as_ac_var=no"
21459-
fi
21460-
21461-
rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
21462-
conftest$ac_exeext conftest.$ac_ext
21463-
fi
21464-
ac_res=`eval echo '${'$as_ac_var'}'`
21465-
{ echo "$as_me:$LINENO: result: $ac_res" >&5
21466-
echo "${ECHO_T}$ac_res" >&6; }
21467-
if test `eval echo '${'$as_ac_var'}'` = yes; then
21468-
cat >>confdefs.h <<_ACEOF
21469-
#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
21470-
_ACEOF
21471-
21472-
else
21473-
case " $LIBOBJS " in
21474-
*" $ac_func.$ac_objext "* ) ;;
21475-
*) LIBOBJS="$LIBOBJS $ac_func.$ac_objext"
21476-
;;
21477-
esac
21478-
21479-
fi
21480-
done
21481-
21482-
21483-
2148421382

2148521383

2148621384

2148721385

2148821386

2148921387

2149021388

21491-
for ac_func in acosh asinh atanh copysign expm1 finite log1p
21389+
for ac_func in acosh asinh atanh copysign expm1 finite hypot log1p
2149221390
do
2149321391
as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
2149421392
{ echo "$as_me:$LINENO: checking for $ac_func" >&5

configure.in

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3120,9 +3120,7 @@ then
31203120
[Define if tanh(-0.) is -0., or if platform doesn't have signed zeros])
31213121
fi
31223122

3123-
AC_REPLACE_FUNCS(hypot)
3124-
3125-
AC_CHECK_FUNCS([acosh asinh atanh copysign expm1 finite log1p])
3123+
AC_CHECK_FUNCS([acosh asinh atanh copysign expm1 finite hypot log1p])
31263124
AC_CHECK_DECLS([isinf, isnan, isfinite], [], [], [[#include <math.h>]])
31273125

31283126
LIBS=$LIBS_SAVE

0 commit comments

Comments
 (0)