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>

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])

disk-utils/Makemodule.am

@@ -84,7 +84,7 @@ if BUILD_FSCK
 sbin_PROGRAMS += fsck
 dist_man_MANS += disk-utils/fsck.8
 fsck_SOURCES = disk-utils/fsck.c lib/monotonic.c
-fsck_LDADD = $(LDADD) libmount.la libblkid.la libcommon.la $(CLOCKGETTIME_LIBS)
+fsck_LDADD = $(LDADD) libmount.la libblkid.la libcommon.la $(REALTIME_LIBS)
 fsck_CFLAGS = $(AM_CFLAGS) -I$(ul_libmount_incdir) -I$(ul_libblkid_incdir)
 endif
 

libmount/src/Makemodule.am

@@ -40,7 +40,7 @@ libmount_la_LIBADD = \
 	libcommon.la \
 	libblkid.la \
 	$(SELINUX_LIBS) \
-	$(CLOCKGETTIME_LIBS)
+	$(REALTIME_LIBS)
 
 libmount_la_CFLAGS = \
 	$(SOLIB_CFLAGS) \
@@ -79,7 +79,7 @@ check_PROGRAMS += \
 
 libmount_tests_cflags  = -DTEST_PROGRAM $(libmount_la_CFLAGS)
 libmount_tests_ldflags = libblkid.la -static
-libmount_tests_ldadd   = libmount.la $(UUID_LIBS) $(CLOCKGETTIME_LIBS)
+libmount_tests_ldadd   = libmount.la $(UUID_LIBS) $(REALTIME_LIBS)
 
 if HAVE_SELINUX
 libmount_tests_ldadd += $(SELINUX_LIBS)

login-utils/Makemodule.am

@@ -5,7 +5,7 @@ dist_man_MANS += \
 	login-utils/last.1 \
 	login-utils/lastb.1
 last_SOURCES = login-utils/last.c lib/monotonic.c
-last_LDADD = $(LDADD) libcommon.la $(CLOCKGETTIME_LIBS)
+last_LDADD = $(LDADD) libcommon.la $(REALTIME_LIBS)
 
 install-exec-hook-last:
 	cd $(DESTDIR)$(usrbin_execdir) && ln -sf last lastb

sys-utils/Makemodule.am

@@ -73,7 +73,7 @@ if BUILD_DMESG
 bin_PROGRAMS += dmesg
 dist_man_MANS += sys-utils/dmesg.1
 dmesg_SOURCES = sys-utils/dmesg.c lib/monotonic.c
-dmesg_LDADD = $(LDADD) libcommon.la libtcolors.la $(CLOCKGETTIME_LIBS)
+dmesg_LDADD = $(LDADD) libcommon.la libtcolors.la $(REALTIME_LIBS)
 dmesg_CFLAGS = $(AM_CFLAGS)
 endif
 
@@ -93,7 +93,7 @@ if BUILD_BLKDISCARD
 sbin_PROGRAMS += blkdiscard
 dist_man_MANS += sys-utils/blkdiscard.8
 blkdiscard_SOURCES = sys-utils/blkdiscard.c lib/monotonic.c
-blkdiscard_LDADD = $(LDADD) libcommon.la $(CLOCKGETTIME_LIBS)
+blkdiscard_LDADD = $(LDADD) libcommon.la $(REALTIME_LIBS)
 endif
 
 if BUILD_LDATTACH
@@ -169,7 +169,7 @@ endif # BUILD_SETARCH
 if BUILD_EJECT
 usrbin_exec_PROGRAMS += eject
 eject_SOURCES =  sys-utils/eject.c lib/monotonic.c
-eject_LDADD = $(LDADD) libmount.la libcommon.la $(CLOCKGETTIME_LIBS)
+eject_LDADD = $(LDADD) libmount.la libcommon.la $(REALTIME_LIBS)
 eject_CFLAGS = $(AM_CFLAGS) -I$(ul_libmount_incdir)
 dist_man_MANS += sys-utils/eject.1
 endif