From a3b4296369a2456c6ec95820b87bb686d50bf64e Mon Sep 17 00:00:00 2001 From: nobu Date: Mon, 19 Aug 2013 04:03:22 +0000 Subject: configure.in: clock_gettime * configure.in (clock_gettime): should not overwrite cache variable with different condtion. otherwise -lrt is not linked and the link fails, after reconfig. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@42616 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ChangeLog | 6 ++++++ configure.in | 5 +++-- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 17d6932742..b71e8f71e0 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +Mon Aug 19 13:03:08 2013 Nobuyoshi Nakada + + * configure.in (clock_gettime): should not overwrite cache variable + with different condtion. otherwise -lrt is not linked and the link + fails, after reconfig. + Mon Aug 19 12:56:49 2013 Tanaka Akira * process.c (Init_process): Add constants: CLOCK_REALTIME_ALARM and diff --git a/configure.in b/configure.in index 62aaf72f5f..0957385ce1 100644 --- a/configure.in +++ b/configure.in @@ -1860,8 +1860,9 @@ 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) + if test x"$ac_cv_lib_rt_clock_gettime" = xyes; then + AC_DEFINE(HAVE_CLOCK_GETTIME, 1) + fi fi AC_CACHE_CHECK(for unsetenv returns a value, rb_cv_unsetenv_return_value, -- cgit v1.2.3