ruby-changes:28606
From: kosaki <ko1@a...>
Date: Sun, 12 May 2013 17:40:47 +0900 (JST)
Subject: [ruby-changes:28606] kosaki:r40658 (trunk): * configure.in: move clock_gettime() check into regular place.
kosaki 2013-05-12 17:40:35 +0900 (Sun, 12 May 2013) New Revision: 40658 http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=rev&revision=40658 Log: * configure.in: move clock_gettime() check into regular place. Modified files: trunk/ChangeLog trunk/configure.in Index: configure.in =================================================================== --- configure.in (revision 40657) +++ configure.in (revision 40658) @@ -994,15 +994,6 @@ AC_CHECK_LIB(dl, dlopen) # Dynamic linki https://github.com/ruby/ruby/blob/trunk/configure.in#L994 AC_CHECK_LIB(dld, shl_load) # Dynamic linking for HP-UX AC_CHECK_LIB(socket, shutdown) # SunOS/Solaris -AC_CHECK_FUNCS(clock_gettime) -if test x"$ac_cv_func_clock_gettime" != xyes; then - # glibc 2.17 moves clock_* functions from librt to the main C library. - # http://sourceware.org/ml/libc-announce/2012/msg00001.html - AC_CHECK_LIB(rt, clock_gettime) - unset ac_cv_func_clock_gettime - AC_CHECK_FUNCS(clock_gettime) -fi - dnl Checks for header files. AC_HEADER_DIRENT dnl AC_HEADER_STDC has been checked in AC_USE_SYSTEM_EXTENSIONS @@ -1737,6 +1728,7 @@ AC_CHECK_FUNCS(_longjmp) https://github.com/ruby/ruby/blob/trunk/configure.in#L1728 AC_CHECK_FUNCS(_setjmp) AC_CHECK_FUNCS(chroot) AC_CHECK_FUNCS(chsize) +AC_CHECK_FUNCS(clock_gettime) AC_CHECK_FUNCS(close) AC_CHECK_FUNCS(cosh) AC_CHECK_FUNCS(daemon) @@ -1835,6 +1827,15 @@ AC_CHECK_FUNCS(utimes) https://github.com/ruby/ruby/blob/trunk/configure.in#L1827 AC_CHECK_FUNCS(wait4) AC_CHECK_FUNCS(waitpid) +# Some platform neet -lrt for clock_gettime, but the other don't. +if test x"$ac_cv_func_clock_gettime" != xyes; then + # glibc 2.17 moves clock_* functions from librt to the main C library. + # http://sourceware.org/ml/libc-announce/2012/msg00001.html + AC_CHECK_LIB(rt, clock_gettime) + unset ac_cv_func_clock_gettime + AC_CHECK_FUNCS(clock_gettime) +fi + AC_CACHE_CHECK(for sigsetjmp as a macro or function, ac_cv_func_sigsetjmp, [AC_TRY_COMPILE([ #include <setjmp.h> Index: ChangeLog =================================================================== --- ChangeLog (revision 40657) +++ ChangeLog (revision 40658) @@ -1,3 +1,7 @@ https://github.com/ruby/ruby/blob/trunk/ChangeLog#L1 +Sun May 12 15:38:09 2013 KOSAKI Motohiro <kosaki.motohiro@g...> + + * configure.in: move clock_gettime() check into regular place. + Wed May 8 13:45:53 2013 KOSAKI Motohiro <kosaki.motohiro@g...> * configure.in: add getenv() declaration check. -- ML: ruby-changes@q... Info: http://www.atdot.net/~ko1/quickml/