mirror/guile
mirror/guile
1
Fork 0
mirror of https://git.savannah.gnu.org/git/guile.git synced 2025-04-29 19:30:36 +02:00
Code Activity

Use `clock-time' directly from Gnulib, but with a local patch.

Browse source 
This is equivalent to the previous situation, but more easily
maintainable.

* acinclude.m4 (gl_CLOCK_TIME): Remove.

* configure.ac: Remove explicit use of `gl_CLOCK_TIME'.

* m4/gnulib-cache.m4 (gl_MODULES): Add `clock-time'.

* gnulib-local/m4/clock_time.m4.diff: New file.
* Makefile.am (EXTRA_DIST): Add it.
This commit is contained in:
Ludovic Courtès 2012-07-06 23:56:05 +02:00
parent 005de2e827
commit 235c280489
8 changed files with 38 additions and 49 deletions
Download patch file Download diff file Expand all files Collapse all files

28
gnulib-local/m4/clock_time.m4.diff Normal file
View file

@ -0,0 +1,28 @@
Remove when clock-gettime is fixed for clock_getcpuclockid.
See <http://lists.gnu.org/archive/html/bug-gnulib/2011-06/msg00227.html>
for details.
diff --git a/m4/clock_time.m4 b/m4/clock_time.m4
index 0bec0ef..fb3a17a 100644
--- a/m4/clock_time.m4
+++ b/m4/clock_time.m4
@@ -24,8 +24,15 @@ AC_DEFUN([gl_CLOCK_TIME],
AC_SUBST([LIB_CLOCK_GETTIME])
gl_saved_libs=$LIBS
AC_SEARCH_LIBS([clock_gettime], [rt posix4],
- [test "$ac_cv_search_clock_gettime" = "none required" ||
- LIB_CLOCK_GETTIME=$ac_cv_search_clock_gettime])
- AC_CHECK_FUNCS([clock_gettime clock_settime])
+ [if test "$ac_cv_search_clock_gettime" = "none required"; then
+ AC_SEARCH_LIBS([clock_getcpuclockid], [rt posix4],
+ [test "$ac_cv_search_clock_getcpuclockid" = "none required" \
+ || LIB_CLOCK_GETTIME=$ac_cv_search_clock_getcpuclockid],
+ [test "$ac_cv_search_clock_gettime" = "none required" \
+ || LIB_CLOCK_GETTIME=$ac_cv_search_clock_gettime])
+ else
+ LIB_CLOCK_GETTIME=$ac_cv_search_clock_gettime
+ fi])
+ AC_CHECK_FUNCS([clock_gettime clock_settime clock_getcpuclockid])
LIBS=$gl_saved_libs
])