From 552a4a49afa5613c81880f842658d4fecd199b64 Mon Sep 17 00:00:00 2001 From: Baruch Siach Date: Tue, 5 Jun 2018 14:22:21 +0300 Subject: [PATCH] configure.ac: fix detection of clock_gettime library glibc before 2.17 requires link with librt for clock_gettime(). The AC_SEARCH_LIBS check in configure.ac should detect this dependency. Unfortunately commit cb77a25e51 (configure.ac: Remove obsolete AC_ERROR and make formatting consistent) inadvertently renamed to clock_gettime2, thus breaking librt detection. Restore the correct clock_gettime() name. Closes #439 Signed-off-by: Baruch Siach Signed-off-by: Nathan Hjelm --- configure.ac | 2 +- libusb/version_nano.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/configure.ac b/configure.ac index 5b16c68..63590d1 100644 --- a/configure.ac +++ b/configure.ac @@ -107,7 +107,7 @@ case $backend in linux) AC_DEFINE(OS_LINUX, 1, [Linux backend]) AC_SUBST(OS_LINUX) - AC_SEARCH_LIBS([clock_gettime2], [rt], [], [], [-pthread]) + AC_SEARCH_LIBS([clock_gettime], [rt], [], [], [-pthread]) AC_ARG_ENABLE([udev], [AC_HELP_STRING([--enable-udev], [use udev for device enumeration and hotplug support (recommended) [default=yes]])], [], [enable_udev=yes]) diff --git a/libusb/version_nano.h b/libusb/version_nano.h index cdf84be..c72cf94 100644 --- a/libusb/version_nano.h +++ b/libusb/version_nano.h @@ -1 +1 @@ -#define LIBUSB_NANO 11316 +#define LIBUSB_NANO 11317 -- 2.7.4