1berry/ruby
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

* configure.in: use AC_CHECK_FUNC instead of AC_CHECK_FUNCS

Browse Source 
if available.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@44922 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
glass 2014-02-12 15:24:33 +00:00
parent 759e2c7921
commit 353fcc27d1
2 changed files with 116 additions and 111 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ChangeLog
View File

@ -1,3 +1,8 @@
Thu Feb 13 00:20:58 2014 Masaki Matsushita <glass.saga@gmail.com>
* configure.in: use AC_CHECK_FUNC instead of AC_CHECK_FUNCS
if available.
Thu Feb 13 00:15:10 2014 Masaki Matsushita <glass.saga@gmail.com> Thu Feb 13 00:15:10 2014 Masaki Matsushita <glass.saga@gmail.com>
* configure.in: fix to undefine HAVE_MEMEM collectlly if it is broken. * configure.in: fix to undefine HAVE_MEMEM collectlly if it is broken.

222
configure.in
View File

@ -1012,7 +1012,7 @@ main()
LIBS="$LIBS" # m lib is include in root under BeOS/Haiku LIBS="$LIBS" # m lib is include in root under BeOS/Haiku
], ],
[cygwin*], [ ac_cv_header_langinfo_h=yes [cygwin*], [ ac_cv_header_langinfo_h=yes
AC_CHECK_FUNCS(cygwin_conv_path) AC_CHECK_FUNC(cygwin_conv_path)
AC_LIBOBJ([langinfo]) AC_LIBOBJ([langinfo])
], ],
[mingw*], [ LIBS="-lshell32 -lws2_32 -liphlpapi -limagehlp -lshlwapi $LIBS" [mingw*], [ LIBS="-lshell32 -lws2_32 -liphlpapi -limagehlp -lshlwapi $LIBS"
@ -1055,7 +1055,7 @@ main()
if test x"$ac_cv_type_NET_LUID" = xyes; then if test x"$ac_cv_type_NET_LUID" = xyes; then
AC_DEFINE(HAVE_TYPE_NET_LUID, 1) AC_DEFINE(HAVE_TYPE_NET_LUID, 1)
fi fi
AC_CHECK_FUNCS(_gmtime64_s) AC_CHECK_FUNC(_gmtime64_s)
AC_LIBOBJ([langinfo]) AC_LIBOBJ([langinfo])
], ],
[os2-emx*], [ LIBS="-lm $LIBS" [os2-emx*], [ LIBS="-lm $LIBS"
@ -1865,109 +1865,109 @@ else
AC_LIBOBJ([signbit]) AC_LIBOBJ([signbit])
fi fi
AC_CHECK_FUNCS(__syscall) AC_CHECK_FUNC(__syscall)
AC_CHECK_FUNCS(_longjmp) # used for AC_ARG_WITH(setjmp-type) AC_CHECK_FUNC(_longjmp) # used for AC_ARG_WITH(setjmp-type)
AC_CHECK_FUNCS(_setjmp) # used for AC_ARG_WITH(setjmp-type) AC_CHECK_FUNC(_setjmp) # used for AC_ARG_WITH(setjmp-type)
AC_CHECK_FUNCS(_setjmpex) # used for AC_ARG_WITH(setjmp-type) AC_CHECK_FUNC(_setjmpex) # used for AC_ARG_WITH(setjmp-type)
AC_CHECK_FUNCS(chroot) AC_CHECK_FUNC(chroot)
AC_CHECK_FUNCS(chsize) AC_CHECK_FUNC(chsize)
AC_CHECK_FUNCS(clock_gettime) AC_CHECK_FUNC(clock_gettime)
AC_CHECK_FUNCS(cosh) AC_CHECK_FUNC(cosh)
AC_CHECK_FUNCS(daemon) AC_CHECK_FUNC(daemon)
AC_CHECK_FUNCS(dl_iterate_phdr) AC_CHECK_FUNC(dl_iterate_phdr)
AC_CHECK_FUNCS(dlopen) AC_CHECK_FUNC(dlopen)
AC_CHECK_FUNCS(dup) AC_CHECK_FUNC(dup)
AC_CHECK_FUNCS(dup3) AC_CHECK_FUNC(dup3)
AC_CHECK_FUNCS(eaccess) AC_CHECK_FUNC(eaccess)
AC_CHECK_FUNCS(endgrent) AC_CHECK_FUNC(endgrent)
AC_CHECK_FUNCS(fchmod) AC_CHECK_FUNC(fchmod)
AC_CHECK_FUNCS(fchown) AC_CHECK_FUNC(fchown)
AC_CHECK_FUNCS(fcntl) AC_CHECK_FUNC(fcntl)
AC_CHECK_FUNCS(fdatasync) AC_CHECK_FUNC(fdatasync)
AC_CHECK_FUNCS(fmod) AC_CHECK_FUNC(fmod)
AC_CHECK_FUNCS(fork) AC_CHECK_FUNC(fork)
AC_CHECK_FUNCS(fsync) AC_CHECK_FUNC(fsync)
AC_CHECK_FUNCS(ftruncate) AC_CHECK_FUNC(ftruncate)
AC_CHECK_FUNCS(ftruncate64) # used for Win32 platform AC_CHECK_FUNC(ftruncate64) # used for Win32 platform
AC_CHECK_FUNCS(getcwd) AC_CHECK_FUNC(getcwd)
AC_CHECK_FUNCS(getgrnam_r) AC_CHECK_FUNC(getgrnam_r)
AC_CHECK_FUNCS(getgroups) AC_CHECK_FUNC(getgroups)
AC_CHECK_FUNCS(getpgid) AC_CHECK_FUNC(getpgid)
AC_CHECK_FUNCS(getpgrp) AC_CHECK_FUNC(getpgrp)
AC_CHECK_FUNCS(getpriority) AC_CHECK_FUNC(getpriority)
AC_CHECK_FUNCS(getpwnam_r) AC_CHECK_FUNC(getpwnam_r)
AC_CHECK_FUNCS(getrlimit) AC_CHECK_FUNC(getrlimit)
AC_CHECK_FUNCS(getsid) AC_CHECK_FUNC(getsid)
AC_CHECK_FUNCS(gettimeofday) # for making ac_cv_func_gettimeofday AC_CHECK_FUNC(gettimeofday) # for making ac_cv_func_gettimeofday
AC_CHECK_FUNCS(gmtime_r) AC_CHECK_FUNC(gmtime_r)
AC_CHECK_FUNCS(initgroups) AC_CHECK_FUNC(initgroups)
AC_CHECK_FUNCS(ioctl) AC_CHECK_FUNC(ioctl)
AC_CHECK_FUNCS(isfinite) AC_CHECK_FUNC(isfinite)
AC_CHECK_FUNCS(issetugid) AC_CHECK_FUNC(issetugid)
AC_CHECK_FUNCS(killpg) AC_CHECK_FUNC(killpg)
AC_CHECK_FUNCS(lchmod) AC_CHECK_FUNC(lchmod)
AC_CHECK_FUNCS(lchown) AC_CHECK_FUNC(lchown)
AC_CHECK_FUNCS(link) AC_CHECK_FUNC(link)
AC_CHECK_FUNCS(llabs) AC_CHECK_FUNC(llabs)
AC_CHECK_FUNCS(lockf) AC_CHECK_FUNC(lockf)
AC_CHECK_FUNCS(log2) AC_CHECK_FUNC(log2)
AC_CHECK_FUNCS(lstat) AC_CHECK_FUNC(lstat)
AC_CHECK_FUNCS(malloc_usable_size) AC_CHECK_FUNC(malloc_usable_size)
AC_CHECK_FUNCS(malloc_size) AC_CHECK_FUNC(malloc_size)
AC_CHECK_FUNCS(mblen) AC_CHECK_FUNC(mblen)
AC_CHECK_FUNCS(memalign) AC_CHECK_FUNC(memalign)
AC_CHECK_FUNCS(writev) AC_CHECK_FUNC(writev)
AC_CHECK_FUNCS(memrchr) AC_CHECK_FUNC(memrchr)
AC_CHECK_FUNCS(memmem) AC_CHECK_FUNC(memmem)
AC_CHECK_FUNCS(mktime) AC_CHECK_FUNC(mktime)
AC_CHECK_FUNCS(pipe2) AC_CHECK_FUNC(pipe2)
AC_CHECK_FUNCS(poll) AC_CHECK_FUNC(poll)
AC_CHECK_FUNCS(posix_fadvise) AC_CHECK_FUNC(posix_fadvise)
AC_CHECK_FUNCS(posix_memalign) AC_CHECK_FUNC(posix_memalign)
AC_CHECK_FUNCS(ppoll) AC_CHECK_FUNC(ppoll)
AC_CHECK_FUNCS(pread) AC_CHECK_FUNC(pread)
AC_CHECK_FUNCS(qsort_r) AC_CHECK_FUNC(qsort_r)
AC_CHECK_FUNCS(readlink) AC_CHECK_FUNC(readlink)
AC_CHECK_FUNCS(round) AC_CHECK_FUNC(round)
AC_CHECK_FUNCS(seekdir) AC_CHECK_FUNC(seekdir)
AC_CHECK_FUNCS(select_large_fdset) AC_CHECK_FUNC(select_large_fdset)
AC_CHECK_FUNCS(sendfile) AC_CHECK_FUNC(sendfile)
AC_CHECK_FUNCS(setegid) AC_CHECK_FUNC(setegid)
AC_CHECK_FUNCS(setenv) AC_CHECK_FUNC(setenv)
AC_CHECK_FUNCS(seteuid) AC_CHECK_FUNC(seteuid)
AC_CHECK_FUNCS(setgid) AC_CHECK_FUNC(setgid)
AC_CHECK_FUNCS(setgroups) AC_CHECK_FUNC(setgroups)
AC_CHECK_FUNCS(setpgid) AC_CHECK_FUNC(setpgid)
AC_CHECK_FUNCS(setpgrp) AC_CHECK_FUNC(setpgrp)
AC_CHECK_FUNCS(setregid) AC_CHECK_FUNC(setregid)
AC_CHECK_FUNCS(setresgid) AC_CHECK_FUNC(setresgid)
AC_CHECK_FUNCS(setresuid) AC_CHECK_FUNC(setresuid)
AC_CHECK_FUNCS(setreuid) AC_CHECK_FUNC(setreuid)
AC_CHECK_FUNCS(setrgid) AC_CHECK_FUNC(setrgid)
AC_CHECK_FUNCS(setrlimit) AC_CHECK_FUNC(setrlimit)
AC_CHECK_FUNCS(setruid) AC_CHECK_FUNC(setruid)
AC_CHECK_FUNCS(setsid) AC_CHECK_FUNC(setsid)
AC_CHECK_FUNCS(setuid) AC_CHECK_FUNC(setuid)
AC_CHECK_FUNCS(shutdown) AC_CHECK_FUNC(shutdown)
AC_CHECK_FUNCS(sigaction) AC_CHECK_FUNC(sigaction)
AC_CHECK_FUNCS(sigaltstack) AC_CHECK_FUNC(sigaltstack)
AC_CHECK_FUNCS(sigprocmask) AC_CHECK_FUNC(sigprocmask)
AC_CHECK_FUNCS(sinh) AC_CHECK_FUNC(sinh)
AC_CHECK_FUNCS(spawnv) AC_CHECK_FUNC(spawnv)
AC_CHECK_FUNCS(symlink) AC_CHECK_FUNC(symlink)
AC_CHECK_FUNCS(syscall) AC_CHECK_FUNC(syscall)
AC_CHECK_FUNCS(sysconf) AC_CHECK_FUNC(sysconf)
AC_CHECK_FUNCS(tanh) AC_CHECK_FUNC(tanh)
AC_CHECK_FUNCS(telldir) AC_CHECK_FUNC(telldir)
AC_CHECK_FUNCS(timegm) AC_CHECK_FUNC(timegm)
AC_CHECK_FUNCS(times) AC_CHECK_FUNC(times)
AC_CHECK_FUNCS(truncate) AC_CHECK_FUNC(truncate)
AC_CHECK_FUNCS(truncate64) # used for Win32 AC_CHECK_FUNC(truncate64) # used for Win32
AC_CHECK_FUNCS(unsetenv) AC_CHECK_FUNC(unsetenv)
AC_CHECK_FUNCS(utimensat) AC_CHECK_FUNC(utimensat)
AC_CHECK_FUNCS(utimes) AC_CHECK_FUNC(utimes)
AC_CHECK_FUNCS(wait4) AC_CHECK_FUNC(wait4)
AC_CHECK_FUNCS(waitpid) AC_CHECK_FUNC(waitpid)
AC_DEFUN([RUBY_CHECK_BUILTIN_FUNC], [dnl AC_DEFUN([RUBY_CHECK_BUILTIN_FUNC], [dnl
AC_CACHE_CHECK([for $1], AS_TR_SH(rb_cv_builtin_$1), AC_CACHE_CHECK([for $1], AS_TR_SH(rb_cv_builtin_$1),
@ -2022,7 +2022,7 @@ if test x"$ac_cv_func_clock_gettime" != xyes; then
AC_DEFINE(HAVE_CLOCK_GETTIME, 1) AC_DEFINE(HAVE_CLOCK_GETTIME, 1)
fi fi
fi fi
AC_CHECK_FUNCS(clock_getres) # clock_getres should be tested after clock_gettime test including librt test. AC_CHECK_FUNC(clock_getres) # clock_getres should be tested after clock_gettime test including librt test.
AC_CACHE_CHECK(for unsetenv returns a value, rb_cv_unsetenv_return_value, AC_CACHE_CHECK(for unsetenv returns a value, rb_cv_unsetenv_return_value,
[AC_TRY_COMPILE([ [AC_TRY_COMPILE([
@ -2151,7 +2151,7 @@ if test "${AS_TR_SH(rb_cv_var_$1)}" != no; then
fi]) fi])
RUBY_CHECK_VARTYPE(timezone, [@%:@include <time.h>], [long int]) RUBY_CHECK_VARTYPE(timezone, [@%:@include <time.h>], [long int])
RUBY_CHECK_VARTYPE(altzone, [@%:@include <time.h>], [long int]) RUBY_CHECK_VARTYPE(altzone, [@%:@include <time.h>], [long int])
AC_CHECK_FUNCS(timezone) AC_CHECK_FUNC(timezone)
if test "$ac_cv_func_timezone" = yes; then if test "$ac_cv_func_timezone" = yes; then
AC_CACHE_CHECK([whether timezone requires zero arguments], rb_cv_func_timezone_void, AC_CACHE_CHECK([whether timezone requires zero arguments], rb_cv_func_timezone_void,
[AC_TRY_COMPILE([@%:@include <time.h>], [AC_TRY_COMPILE([@%:@include <time.h>],
@ -2249,7 +2249,7 @@ fi
if test "$ac_cv_func_sigprocmask" = yes && test "$ac_cv_func_sigaction" = yes; then if test "$ac_cv_func_sigprocmask" = yes && test "$ac_cv_func_sigaction" = yes; then
AC_DEFINE(POSIX_SIGNAL) AC_DEFINE(POSIX_SIGNAL)
else else
AC_CHECK_FUNCS(sigsetmask) AC_CHECK_FUNC(sigsetmask)
AC_CACHE_CHECK(for BSD signal semantics, rb_cv_bsd_signal, AC_CACHE_CHECK(for BSD signal semantics, rb_cv_bsd_signal,
[AC_TRY_RUN([ [AC_TRY_RUN([
#include <stdio.h> #include <stdio.h>
@ -2487,7 +2487,7 @@ if test x"$enable_pthread" = xyes; then
if test "${host_os}" = "nacl"; then if test "${host_os}" = "nacl"; then
ac_cv_func_pthread_attr_init=no ac_cv_func_pthread_attr_init=no
else else
AC_CHECK_FUNCS(pthread_attr_init) AC_CHECK_FUNC(pthread_attr_init)
fi fi
fi fi
if test x"$ac_cv_header_ucontext_h" = xyes; then if test x"$ac_cv_header_ucontext_h" = xyes; then
@ -2846,7 +2846,7 @@ AS_CASE(["$target_cpu-$target_os"],
AC_CHECK_LIB([execinfo], [backtrace]) AC_CHECK_LIB([execinfo], [backtrace])
AC_CHECK_LIB([unwind], [unw_backtrace]) AC_CHECK_LIB([unwind], [unw_backtrace])
fi]) fi])
AC_CHECK_FUNCS(backtrace) AC_CHECK_FUNC(backtrace)
if test "x$ac_cv_func_backtrace" = xyes; then if test "x$ac_cv_func_backtrace" = xyes; then
AC_CACHE_CHECK(for broken backtrace, rb_cv_broken_backtrace, AC_CACHE_CHECK(for broken backtrace, rb_cv_broken_backtrace,
@ -2956,7 +2956,7 @@ else
DLEXT=so]) DLEXT=so])
fi fi
if test "$rb_cv_dlopen:$load_relative" = yes:yes; then if test "$rb_cv_dlopen:$load_relative" = yes:yes; then
AC_CHECK_FUNCS(dladdr) AC_CHECK_FUNC(dladdr)
if test "$ac_cv_func_dladdr" = yes; then if test "$ac_cv_func_dladdr" = yes; then
LOAD_RELATIVE=1 LOAD_RELATIVE=1
fi fi