mirror of
https://github.com/vim/vim.git
synced 2025-09-24 03:44:06 -04:00
patch 7.4.1463
Problem: Configure doesn't find isinf() and isnan() on some systems. Solution: Use a configure check that includes math.h.
This commit is contained in:
66
src/auto/configure
vendored
66
src/auto/configure
vendored
@@ -11858,7 +11858,7 @@ for ac_func in bcmp fchdir fchown fsync getcwd getpseudotty \
|
|||||||
setpgid setsid sigaltstack sigstack sigset sigsetjmp sigaction \
|
setpgid setsid sigaltstack sigstack sigset sigsetjmp sigaction \
|
||||||
sigvec strcasecmp strerror strftime stricmp strncasecmp \
|
sigvec strcasecmp strerror strftime stricmp strncasecmp \
|
||||||
strnicmp strpbrk strtol tgetent towlower towupper iswupper \
|
strnicmp strpbrk strtol tgetent towlower towupper iswupper \
|
||||||
usleep utime utimes isnan isinf
|
usleep utime utimes
|
||||||
do :
|
do :
|
||||||
as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
|
as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
|
||||||
ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var"
|
ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var"
|
||||||
@@ -12379,6 +12379,70 @@ if ac_fn_c_try_link "$LINENO"; then :
|
|||||||
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
|
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
|
||||||
$as_echo "yes" >&6; }; $as_echo "#define HAVE_FLOAT_FUNCS 1" >>confdefs.h
|
$as_echo "yes" >&6; }; $as_echo "#define HAVE_FLOAT_FUNCS 1" >>confdefs.h
|
||||||
|
|
||||||
|
else
|
||||||
|
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
|
||||||
|
$as_echo "no" >&6; }
|
||||||
|
fi
|
||||||
|
rm -f core conftest.err conftest.$ac_objext \
|
||||||
|
conftest$ac_exeext conftest.$ac_ext
|
||||||
|
|
||||||
|
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for isinf()" >&5
|
||||||
|
$as_echo_n "checking for isinf()... " >&6; }
|
||||||
|
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
|
||||||
|
/* end confdefs.h. */
|
||||||
|
|
||||||
|
#ifdef HAVE_MATH_H
|
||||||
|
# include <math.h>
|
||||||
|
#endif
|
||||||
|
#if STDC_HEADERS
|
||||||
|
# include <stdlib.h>
|
||||||
|
# include <stddef.h>
|
||||||
|
#endif
|
||||||
|
|
||||||
|
int
|
||||||
|
main ()
|
||||||
|
{
|
||||||
|
int r = isinf(1.11);
|
||||||
|
;
|
||||||
|
return 0;
|
||||||
|
}
|
||||||
|
_ACEOF
|
||||||
|
if ac_fn_c_try_link "$LINENO"; then :
|
||||||
|
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
|
||||||
|
$as_echo "yes" >&6; }; $as_echo "#define HAVE_ISINF 1" >>confdefs.h
|
||||||
|
|
||||||
|
else
|
||||||
|
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
|
||||||
|
$as_echo "no" >&6; }
|
||||||
|
fi
|
||||||
|
rm -f core conftest.err conftest.$ac_objext \
|
||||||
|
conftest$ac_exeext conftest.$ac_ext
|
||||||
|
|
||||||
|
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for isnan()" >&5
|
||||||
|
$as_echo_n "checking for isnan()... " >&6; }
|
||||||
|
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
|
||||||
|
/* end confdefs.h. */
|
||||||
|
|
||||||
|
#ifdef HAVE_MATH_H
|
||||||
|
# include <math.h>
|
||||||
|
#endif
|
||||||
|
#if STDC_HEADERS
|
||||||
|
# include <stdlib.h>
|
||||||
|
# include <stddef.h>
|
||||||
|
#endif
|
||||||
|
|
||||||
|
int
|
||||||
|
main ()
|
||||||
|
{
|
||||||
|
int r = isnan(1.11);
|
||||||
|
;
|
||||||
|
return 0;
|
||||||
|
}
|
||||||
|
_ACEOF
|
||||||
|
if ac_fn_c_try_link "$LINENO"; then :
|
||||||
|
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
|
||||||
|
$as_echo "yes" >&6; }; $as_echo "#define HAVE_ISNAN 1" >>confdefs.h
|
||||||
|
|
||||||
else
|
else
|
||||||
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
|
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
|
||||||
$as_echo "no" >&6; }
|
$as_echo "no" >&6; }
|
||||||
|
@@ -3565,7 +3565,7 @@ AC_CHECK_FUNCS(bcmp fchdir fchown fsync getcwd getpseudotty \
|
|||||||
setpgid setsid sigaltstack sigstack sigset sigsetjmp sigaction \
|
setpgid setsid sigaltstack sigstack sigset sigsetjmp sigaction \
|
||||||
sigvec strcasecmp strerror strftime stricmp strncasecmp \
|
sigvec strcasecmp strerror strftime stricmp strncasecmp \
|
||||||
strnicmp strpbrk strtol tgetent towlower towupper iswupper \
|
strnicmp strpbrk strtol tgetent towlower towupper iswupper \
|
||||||
usleep utime utimes isnan isinf)
|
usleep utime utimes)
|
||||||
AC_FUNC_FSEEKO
|
AC_FUNC_FSEEKO
|
||||||
|
|
||||||
dnl define _LARGE_FILES, _FILE_OFFSET_BITS and _LARGEFILE_SOURCE when
|
dnl define _LARGE_FILES, _FILE_OFFSET_BITS and _LARGEFILE_SOURCE when
|
||||||
@@ -3668,6 +3668,33 @@ AC_TRY_LINK([
|
|||||||
AC_MSG_RESULT(yes); AC_DEFINE(HAVE_FLOAT_FUNCS),
|
AC_MSG_RESULT(yes); AC_DEFINE(HAVE_FLOAT_FUNCS),
|
||||||
AC_MSG_RESULT(no))
|
AC_MSG_RESULT(no))
|
||||||
|
|
||||||
|
dnl isinf() and isnan() need to include header files and may need -lm.
|
||||||
|
AC_MSG_CHECKING([for isinf()])
|
||||||
|
AC_TRY_LINK([
|
||||||
|
#ifdef HAVE_MATH_H
|
||||||
|
# include <math.h>
|
||||||
|
#endif
|
||||||
|
#if STDC_HEADERS
|
||||||
|
# include <stdlib.h>
|
||||||
|
# include <stddef.h>
|
||||||
|
#endif
|
||||||
|
], [int r = isinf(1.11); ],
|
||||||
|
AC_MSG_RESULT(yes); AC_DEFINE(HAVE_ISINF),
|
||||||
|
AC_MSG_RESULT(no))
|
||||||
|
|
||||||
|
AC_MSG_CHECKING([for isnan()])
|
||||||
|
AC_TRY_LINK([
|
||||||
|
#ifdef HAVE_MATH_H
|
||||||
|
# include <math.h>
|
||||||
|
#endif
|
||||||
|
#if STDC_HEADERS
|
||||||
|
# include <stdlib.h>
|
||||||
|
# include <stddef.h>
|
||||||
|
#endif
|
||||||
|
], [int r = isnan(1.11); ],
|
||||||
|
AC_MSG_RESULT(yes); AC_DEFINE(HAVE_ISNAN),
|
||||||
|
AC_MSG_RESULT(no))
|
||||||
|
|
||||||
dnl Link with -lposix1e for ACL stuff; if not found, try -lacl for SGI
|
dnl Link with -lposix1e for ACL stuff; if not found, try -lacl for SGI
|
||||||
dnl when -lacl works, also try to use -lattr (required for Debian).
|
dnl when -lacl works, also try to use -lattr (required for Debian).
|
||||||
dnl On Solaris, use the acl_get/set functions in libsec, if present.
|
dnl On Solaris, use the acl_get/set functions in libsec, if present.
|
||||||
|
@@ -743,6 +743,8 @@ static char *(features[]) =
|
|||||||
|
|
||||||
static int included_patches[] =
|
static int included_patches[] =
|
||||||
{ /* Add new patch number below this line */
|
{ /* Add new patch number below this line */
|
||||||
|
/**/
|
||||||
|
1463,
|
||||||
/**/
|
/**/
|
||||||
1462,
|
1462,
|
||||||
/**/
|
/**/
|
||||||
|
Reference in New Issue
Block a user