diff options
| author | Karel Zak | 2015-03-06 14:20:19 +0100 |
|---|---|---|
| committer | Karel Zak | 2015-03-06 14:20:19 +0100 |
| commit | 254743e4a6641173abfe342edd94902d9344f58b (patch) | |
| tree | 4c04acd163725343fca2adeb6ee9b97fe4d82f8a /configure.ac | |
| parent | lib/timer: use separate file for timers (diff) | |
| download | kernel-qcow2-util-linux-254743e4a6641173abfe342edd94902d9344f58b.tar.gz kernel-qcow2-util-linux-254743e4a6641173abfe342edd94902d9344f58b.tar.xz kernel-qcow2-util-linux-254743e4a6641173abfe342edd94902d9344f58b.zip | |
build-sys: cleanup realtime lib usage
* check for timer_create()
* define dependence on timer_create() for flock
* rename CLOCKGETTIME_LIBS to REALTIME_LIBS
Signed-off-by: Karel Zak <kzak@redhat.com>
Diffstat (limited to 'configure.ac')
| -rw-r--r-- | configure.ac | 29 |
1 files changed, 15 insertions, 14 deletions
diff --git a/configure.ac b/configure.ac index 9dec9d897..3dcfb7473 100644 --- a/configure.ac +++ b/configure.ac @@ -372,19 +372,19 @@ AC_CHECK_FUNCS([futimens], [have_futimens=yes]) AC_CHECK_FUNCS([inotify_init1], [have_inotify_init1=yes]) dnl lib/mononotic.c may require -lrt -AC_CHECK_FUNCS([clock_gettime], - [AC_CHECK_FUNCS([timer_create], [], [ - AC_CHECK_LIB([rt], [timer_create], [ - AC_DEFINE([HAVE_CLOCK_GETTIME], [1]) - CLOCKGETTIME_LIBS="-lrt" - ]) - ])], - [AC_CHECK_LIB([rt], [clock_gettime], [ - AC_DEFINE([HAVE_CLOCK_GETTIME], [1]) - CLOCKGETTIME_LIBS="-lrt" - ]) -]) -AC_SUBST([CLOCKGETTIME_LIBS]) +AC_CHECK_FUNCS([clock_gettime], [], + [AC_CHECK_LIB([rt], [clock_gettime], [REALTIME_LIBS="-lrt"])] +) +AC_SUBST([REALTIME_LIBS]) + +have_timer="no" +AC_CHECK_FUNCS([timer_createx], + [have_time="yes"], + [AC_CHECK_LIB([rt], [timer_create], [ + have_timer="yes" + REALTIME_LIBS="-lrt" + ])] +) AC_CHECK_MEMBER([struct sockaddr.sa_len], @@ -784,7 +784,7 @@ PKG_CHECK_MODULES(TINFO, [tinfo], [have_tinfo=yes], [ AC_SUBST([TINFO_LIBS]) AC_SUBST([TINFO_CFLAGS]) AM_CONDITIONAL([HAVE_TINFO], [test "x$have_tinfo" = xyes]) -AS_IF([test "x$have_tinfo" = xyes], +AS_IF([test "x$have_tinfo" = xyes], [ AC_DEFINE(HAVE_LIBTINFO, 1, [Define if libtinfo available.]) ]) @@ -1301,6 +1301,7 @@ AM_CONDITIONAL([BUILD_PIVOT_ROOT], [test "x$build_pivot_root" = xyes]) UL_BUILD_INIT([flock], [yes]) +UL_REQUIRES_HAVE([flock], [timer], [timer_create function]) AM_CONDITIONAL([BUILD_FLOCK], [test "x$build_flock" = xyes]) UL_BUILD_INIT([ipcmk], [yes]) |