[Python-checkins] CVS: python/dist/src config.h.in,2.54,2.55 configure,1.112,1.113 configure.in,1.120,1.121
Guido van Rossum
python-dev@python.org
Thu, 11 May 2000 14:41:35 -0400 (EDT)
Update of /projects/cvsroot/python/dist/src
In directory eric:/projects/python/develop/guido/src
Modified Files:
config.h.in configure configure.in
Log Message:
Add check for rint() in math library.
Index: config.h.in
===================================================================
RCS file: /projects/cvsroot/python/dist/src/config.h.in,v
retrieving revision 2.54
retrieving revision 2.55
diff -C2 -r2.54 -r2.55
*** config.h.in 2000/05/08 13:41:37 2.54
--- config.h.in 2000/05/11 18:41:31 2.55
***************
*** 382,385 ****
--- 382,388 ----
#undef HAVE_READLINK
+ /* Define if you have the rint function. */
+ #undef HAVE_RINT
+
/* Define if you have the select function. */
#undef HAVE_SELECT
Index: configure
===================================================================
RCS file: /projects/cvsroot/python/dist/src/configure,v
retrieving revision 1.112
retrieving revision 1.113
diff -C2 -r1.112 -r1.113
*** configure 2000/05/08 13:41:37 1.112
--- configure 2000/05/11 18:41:31 1.113
***************
*** 1,5 ****
#! /bin/sh
! # From configure.in Revision: 1.120
# Guess values for system-dependent variables and create Makefiles.
--- 1,5 ----
#! /bin/sh
! # From configure.in Revision: 1.121
# Guess values for system-dependent variables and create Makefiles.
***************
*** 5004,5010 ****
LIBS=$LIBS_SAVE
# check for getopt
echo $ac_n "checking for genuine getopt""... $ac_c" 1>&6
! echo "configure:5009: checking for genuine getopt" >&5
if eval "test \"`echo '$''{'ac_cv_func_getopt'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
--- 5004,5070 ----
LIBS=$LIBS_SAVE
+ # check for rint() in math library
+ LIBS_SAVE=$LIBS
+ LIBS="$LIBS $LIBM"
+ for ac_func in rint
+ do
+ echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
+ echo "configure:5013: checking for $ac_func" >&5
+ if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
+ echo $ac_n "(cached) $ac_c" 1>&6
+ else
+ cat > conftest.$ac_ext <<EOF
+ #line 5018 "configure"
+ #include "confdefs.h"
+ /* System header to define __stub macros and hopefully few prototypes,
+ which can conflict with char $ac_func(); below. */
+ #include <assert.h>
+ /* Override any gcc2 internal prototype to avoid an error. */
+ /* We use char because int might match the return type of a gcc2
+ builtin and then its argument prototype would still apply. */
+ char $ac_func();
+
+ int main() {
+
+ /* 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
+ #else
+ $ac_func();
+ #endif
+
+ ; return 0; }
+ EOF
+ if { (eval echo configure:5041: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+ rm -rf conftest*
+ eval "ac_cv_func_$ac_func=yes"
+ else
+ echo "configure: failed program was:" >&5
+ cat conftest.$ac_ext >&5
+ rm -rf conftest*
+ eval "ac_cv_func_$ac_func=no"
+ fi
+ rm -f conftest*
+ fi
+
+ if eval "test \"`echo '$ac_cv_func_'$ac_func`\" = yes"; then
+ echo "$ac_t""yes" 1>&6
+ ac_tr_func=HAVE_`echo $ac_func | tr 'abcdefghijklmnopqrstuvwxyz' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'`
+ cat >> confdefs.h <<EOF
+ #define $ac_tr_func 1
+ EOF
+
+ else
+ echo "$ac_t""no" 1>&6
+ fi
+ done
+
+ LIBS=$LIBS_SAVE
+
# check for getopt
echo $ac_n "checking for genuine getopt""... $ac_c" 1>&6
! echo "configure:5069: checking for genuine getopt" >&5
if eval "test \"`echo '$''{'ac_cv_func_getopt'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
***************
*** 5014,5018 ****
else
cat > conftest.$ac_ext <<EOF
! #line 5017 "configure"
#include "confdefs.h"
#include <stdio.h>
--- 5074,5078 ----
else
cat > conftest.$ac_ext <<EOF
! #line 5077 "configure"
#include "confdefs.h"
#include <stdio.h>
***************
*** 5026,5030 ****
}
EOF
! if { (eval echo configure:5029: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
then
ac_cv_func_getopt=yes
--- 5086,5090 ----
}
EOF
! if { (eval echo configure:5089: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
then
ac_cv_func_getopt=yes
***************
*** 5044,5048 ****
# check whether malloc(0) returns NULL or not
echo $ac_n "checking what malloc(0) returns""... $ac_c" 1>&6
! echo "configure:5047: checking what malloc(0) returns" >&5
if eval "test \"`echo '$''{'ac_cv_malloc_zero'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
--- 5104,5108 ----
# check whether malloc(0) returns NULL or not
echo $ac_n "checking what malloc(0) returns""... $ac_c" 1>&6
! echo "configure:5107: checking what malloc(0) returns" >&5
if eval "test \"`echo '$''{'ac_cv_malloc_zero'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
***************
*** 5052,5056 ****
else
cat > conftest.$ac_ext <<EOF
! #line 5055 "configure"
#include "confdefs.h"
#include <stdio.h>
--- 5112,5116 ----
else
cat > conftest.$ac_ext <<EOF
! #line 5115 "configure"
#include "confdefs.h"
#include <stdio.h>
***************
*** 5071,5075 ****
}
EOF
! if { (eval echo configure:5074: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
then
ac_cv_malloc_zero=nonnull
--- 5131,5135 ----
}
EOF
! if { (eval echo configure:5134: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
then
ac_cv_malloc_zero=nonnull
***************
*** 5097,5111 ****
ac_safe=`echo "wchar.h" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for wchar.h""... $ac_c" 1>&6
! echo "configure:5100: checking for wchar.h" >&5
if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
! #line 5105 "configure"
#include "confdefs.h"
#include <wchar.h>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
! { (eval echo configure:5110: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
if test -z "$ac_err"; then
--- 5157,5171 ----
ac_safe=`echo "wchar.h" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for wchar.h""... $ac_c" 1>&6
! echo "configure:5160: checking for wchar.h" >&5
if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
! #line 5165 "configure"
#include "confdefs.h"
#include <wchar.h>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
! { (eval echo configure:5170: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
if test -z "$ac_err"; then
***************
*** 5137,5146 ****
usable_wchar_t="unkown"
echo $ac_n "checking for usable wchar_t""... $ac_c" 1>&6
! echo "configure:5140: checking for usable wchar_t" >&5
if test "$cross_compiling" = yes; then
{ echo "configure: error: can not run test program while cross compiling" 1>&2; exit 1; }
else
cat > conftest.$ac_ext <<EOF
! #line 5145 "configure"
#include "confdefs.h"
--- 5197,5206 ----
usable_wchar_t="unkown"
echo $ac_n "checking for usable wchar_t""... $ac_c" 1>&6
! echo "configure:5200: checking for usable wchar_t" >&5
if test "$cross_compiling" = yes; then
{ echo "configure: error: can not run test program while cross compiling" 1>&2; exit 1; }
else
cat > conftest.$ac_ext <<EOF
! #line 5205 "configure"
#include "confdefs.h"
***************
*** 5156,5160 ****
EOF
! if { (eval echo configure:5159: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
then
cat >> confdefs.h <<\EOF
--- 5216,5220 ----
EOF
! if { (eval echo configure:5219: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
then
cat >> confdefs.h <<\EOF
***************
*** 5175,5179 ****
# check for endianness
echo $ac_n "checking whether byte ordering is bigendian""... $ac_c" 1>&6
! echo "configure:5178: checking whether byte ordering is bigendian" >&5
if eval "test \"`echo '$''{'ac_cv_c_bigendian'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
--- 5235,5239 ----
# check for endianness
echo $ac_n "checking whether byte ordering is bigendian""... $ac_c" 1>&6
! echo "configure:5238: checking whether byte ordering is bigendian" >&5
if eval "test \"`echo '$''{'ac_cv_c_bigendian'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
***************
*** 5182,5186 ****
# See if sys/param.h defines the BYTE_ORDER macro.
cat > conftest.$ac_ext <<EOF
! #line 5185 "configure"
#include "confdefs.h"
#include <sys/types.h>
--- 5242,5246 ----
# See if sys/param.h defines the BYTE_ORDER macro.
cat > conftest.$ac_ext <<EOF
! #line 5245 "configure"
#include "confdefs.h"
#include <sys/types.h>
***************
*** 5193,5201 ****
; return 0; }
EOF
! if { (eval echo configure:5196: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
# It does; now see whether it defined to BIG_ENDIAN or not.
cat > conftest.$ac_ext <<EOF
! #line 5200 "configure"
#include "confdefs.h"
#include <sys/types.h>
--- 5253,5261 ----
; return 0; }
EOF
! if { (eval echo configure:5256: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
# It does; now see whether it defined to BIG_ENDIAN or not.
cat > conftest.$ac_ext <<EOF
! #line 5260 "configure"
#include "confdefs.h"
#include <sys/types.h>
***************
*** 5208,5212 ****
; return 0; }
EOF
! if { (eval echo configure:5211: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
ac_cv_c_bigendian=yes
--- 5268,5272 ----
; return 0; }
EOF
! if { (eval echo configure:5271: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
ac_cv_c_bigendian=yes
***************
*** 5228,5232 ****
else
cat > conftest.$ac_ext <<EOF
! #line 5231 "configure"
#include "confdefs.h"
main () {
--- 5288,5292 ----
else
cat > conftest.$ac_ext <<EOF
! #line 5291 "configure"
#include "confdefs.h"
main () {
***************
*** 5241,5245 ****
}
EOF
! if { (eval echo configure:5244: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
then
ac_cv_c_bigendian=no
--- 5301,5305 ----
}
EOF
! if { (eval echo configure:5304: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
then
ac_cv_c_bigendian=no
***************
*** 5267,5271 ****
# Check for --with-wctype-functions
echo $ac_n "checking for --with-wctype-functions""... $ac_c" 1>&6
! echo "configure:5270: checking for --with-wctype-functions" >&5
# Check whether --with-wctype-functions or --without-wctype-functions was given.
if test "${with_wctype_functions+set}" = set; then
--- 5327,5331 ----
# Check for --with-wctype-functions
echo $ac_n "checking for --with-wctype-functions""... $ac_c" 1>&6
! echo "configure:5330: checking for --with-wctype-functions" >&5
# Check whether --with-wctype-functions or --without-wctype-functions was given.
if test "${with_wctype_functions+set}" = set; then
Index: configure.in
===================================================================
RCS file: /projects/cvsroot/python/dist/src/configure.in,v
retrieving revision 1.120
retrieving revision 1.121
diff -C2 -r1.120 -r1.121
*** configure.in 2000/05/08 13:41:38 1.120
--- configure.in 2000/05/11 18:41:32 1.121
***************
*** 1,4 ****
dnl Process this file with autoconf 2.0 or later to make a configure script.
! AC_REVISION($Revision: 1.120 $)
AC_PREREQ(2.0)
AC_INIT(Include/object.h)
--- 1,4 ----
dnl Process this file with autoconf 2.0 or later to make a configure script.
! AC_REVISION($Revision: 1.121 $)
AC_PREREQ(2.0)
AC_INIT(Include/object.h)
***************
*** 995,998 ****
--- 995,1004 ----
AC_CHECK_FUNCS(hypot)
AC_REPLACE_FUNCS(hypot)
+ LIBS=$LIBS_SAVE
+
+ # check for rint() in math library
+ LIBS_SAVE=$LIBS
+ LIBS="$LIBS $LIBM"
+ AC_CHECK_FUNCS(rint)
LIBS=$LIBS_SAVE