ruby-changes:28581
From: akr <ko1@a...>
Date: Fri, 10 May 2013 20:24:17 +0900 (JST)
Subject: [ruby-changes:28581] akr:r40633 (trunk): * configure.in: Move library checks into "Checks for libraries." part.
akr 2013-05-10 20:24:06 +0900 (Fri, 10 May 2013) New Revision: 40633 http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=rev&revision=40633 Log: * configure.in: Move library checks into "Checks for libraries." part. Modified files: trunk/ChangeLog trunk/configure.in Index: configure.in =================================================================== --- configure.in (revision 40632) +++ configure.in (revision 40633) @@ -989,6 +989,20 @@ main() https://github.com/ruby/ruby/blob/trunk/configure.in#L989 ], [ LIBS="-lm $LIBS"]) +AC_CHECK_LIB(crypt, crypt) # glibc (GNU/Linux, GNU/Hurd, GNU/kFreeBSD) +AC_CHECK_LIB(dl, dlopen) # Dynamic linking for SunOS/Solaris and SYSV +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 @@ -1456,11 +1470,6 @@ dnl Check whether we need to define sys_ https://github.com/ruby/ruby/blob/trunk/configure.in#L1470 AC_CHECK_DECLS([sys_nerr], [], [], [$ac_includes_default @%:@include <errno.h>]) -AC_CHECK_LIB(crypt, crypt) # glibc (GNU/Linux, GNU/Hurd, GNU/kFreeBSD) -AC_CHECK_LIB(dl, dlopen) # Dynamic linking for SunOS/Solaris and SYSV -AC_CHECK_LIB(dld, shl_load) # Dynamic linking for HP-UX -AC_CHECK_LIB(socket, shutdown) # SunOS/Solaris - AS_CASE(["$target_cpu"], [alpha*|sh4|sh4el|sh4eb], [AS_CASE(["$target_os"::"$GCC"], [*::yes], # gcc @@ -1721,15 +1730,6 @@ else https://github.com/ruby/ruby/blob/trunk/configure.in#L1730 AC_LIBOBJ([signbit]) fi -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 - AC_CHECK_FUNCS( \ fmod \ killpg \ Index: ChangeLog =================================================================== --- ChangeLog (revision 40632) +++ ChangeLog (revision 40633) @@ -1,3 +1,7 @@ https://github.com/ruby/ruby/blob/trunk/ChangeLog#L1 +Fri May 10 20:22:40 2013 Tanaka Akira <akr@f...> + + * configure.in: Move library checks into "Checks for libraries." part. + Fri May 10 19:32:01 2013 Tanaka Akira <akr@f...> * configure.in: Reformat arguments of AC_CHECK_HEADERS and -- ML: ruby-changes@q... Info: http://www.atdot.net/~ko1/quickml/