diff options
-rw-r--r-- | ChangeLog | 6 | ||||
-rw-r--r-- | configure.in | 5 |
2 files changed, 9 insertions, 2 deletions
@@ -1,3 +1,9 @@ +Mon Aug 19 13:03:08 2013 Nobuyoshi Nakada <nobu@ruby-lang.org> + + * 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 <akr@fsij.org> * 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, |