From 980bf275fae4b50b06f330d854aa326444916a46 Mon Sep 17 00:00:00 2001 From: akr Date: Fri, 10 May 2013 11:24:06 +0000 Subject: * configure.in: Move library checks into "Checks for libraries." part. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@40633 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- configure.in | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) (limited to 'configure.in') diff --git a/configure.in b/configure.in index 91eb7dad91..954e94514f 100644 --- a/configure.in +++ b/configure.in @@ -989,6 +989,20 @@ main() ], [ 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_nerr locally AC_CHECK_DECLS([sys_nerr], [], [], [$ac_includes_default @%:@include ]) -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 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 \ -- cgit v1.2.3