diff options
| -rw-r--r-- | configure.ac | 10 | ||||
| -rw-r--r-- | include/boottime.h | 2 | ||||
| -rw-r--r-- | login-utils/Makemodule.am | 2 | ||||
| -rw-r--r-- | sys-utils/Makemodule.am | 4 |
4 files changed, 14 insertions, 4 deletions
diff --git a/configure.ac b/configure.ac index f692d8a56..1336f8d14 100644 --- a/configure.ac +++ b/configure.ac @@ -346,6 +346,16 @@ AC_FUNC_FSEEKO AC_CHECK_FUNCS([openat fstatat unlinkat], [have_openat=yes], [have_openat=no]) AC_CHECK_FUNCS([ioperm iopl], [have_io=yes]) +dnl Old glibc requires -lrt +AC_CHECK_FUNCS(clock_gettime, [], [ + AC_CHECK_LIB(rt, clock_gettime, [ + AC_DEFINE(HAVE_CLOCK_GETTIME, 1) + CLOCKGETTIME_LIBS="-lrt" + ]) +]) +AC_SUBST([CLOCKGETTIME_LIBS]) + + AC_CHECK_MEMBER([struct sockaddr.sa_len], AC_DEFINE_UNQUOTED([HAVE_SA_LEN], [1], [Define if struct sockaddr contains sa_len]), [], [#include <sys/types.h> diff --git a/include/boottime.h b/include/boottime.h index 3518848fe..f1d0d0b27 100644 --- a/include/boottime.h +++ b/include/boottime.h @@ -2,7 +2,7 @@ #define UTIL_LINUX_BOOTTIME_H /* - * Uses clock_gettime() that requires -lrt + * Uses clock_gettime() that requires $CLOCKGETTIME_LIBS */ extern int get_boot_time(struct timeval *boot_time); diff --git a/login-utils/Makemodule.am b/login-utils/Makemodule.am index 6f2e9f067..73fc761d5 100644 --- a/login-utils/Makemodule.am +++ b/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/boottime.c -last_LDADD = $(LDADD) libcommon.la -lrt +last_LDADD = $(LDADD) libcommon.la $(CLOCKGETTIME_LIBS) install-exec-hook-last: cd $(DESTDIR)$(usrbin_execdir) && ln -sf last lastb diff --git a/sys-utils/Makemodule.am b/sys-utils/Makemodule.am index da601e067..f540d3834 100644 --- a/sys-utils/Makemodule.am +++ b/sys-utils/Makemodule.am @@ -72,7 +72,7 @@ if BUILD_DMESG bin_PROGRAMS += dmesg dist_man_MANS += sys-utils/dmesg.1 dmesg_SOURCES = sys-utils/dmesg.c lib/boottime.c -dmesg_LDADD = $(LDADD) libcommon.la -lrt +dmesg_LDADD = $(LDADD) libcommon.la $(CLOCKGETTIME_LIBS) endif if BUILD_CTRLALTDEL @@ -91,7 +91,7 @@ if BUILD_BLKDISCARD sbin_PROGRAMS += blkdiscard dist_man_MANS += sys-utils/blkdiscard.8 blkdiscard_SOURCES = sys-utils/blkdiscard.c -blkdiscard_LDADD = $(LDADD) libcommon.la -lrt +blkdiscard_LDADD = $(LDADD) libcommon.la $(CLOCKGETTIME_LIBS) endif if BUILD_LDATTACH |