configure: Don't define HAVE_CLOCK_GETTIME on macOS.

Using clock_gettime() on macOS is problematical; see commit 27c71e09 for an explanation. Possible configure tests for this end up being quite ugly, so avoiding it altogether seems simplest. Signed-off-by: Huw Davies <huw@codeweavers.com> Signed-off-by: Alexandre Julliard <julliard@winehq.org>

configure: Don't define HAVE_CLOCK_GETTIME on macOS.
5ddcfa01 · Huw Davies · Alexandre Julliard · 42ba38c1 · 5ddcfa01 · 5ddcfa01
Commit 5ddcfa01 authored May 14, 2019 by Huw Davies Committed by Alexandre Julliard May 14, 2019
Hide whitespace changes
Inline Side-by-side

Showing with 15 additions and 7 deletions

configure configure +7 -3

configure.ac configure.ac +8 -4

No files found.
--- a/configure
+++ b/configure
@@ -17688,8 +17688,10 @@ fi
 done
-ac_save_LIBS=$LIBS
+case $host_os in
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing clock_gettime" >&5
+    darwin*|macosx*) ;;
+    *) ac_save_LIBS=$LIBS
+        { $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing clock_gettime" >&5
 $as_echo_n "checking for library containing clock_gettime... " >&6; }
 if ${ac_cv_search_clock_gettime+:} false; then :
  $as_echo_n "(cached) " >&6
@@ -17749,7 +17751,9 @@ $as_echo "#define HAVE_CLOCK_GETTIME 1" >>confdefs.h
 fi
-LIBS=$ac_save_LIBS
+    LIBS=$ac_save_LIBS
+    ;;
+esac
 if test "x$with_ldap" != "xno"
 then

--- a/configure.ac
+++ b/configure.ac
@@ -2169,11 +2169,15 @@ AC_CHECK_FUNCS(\
 )
 dnl Check for clock_gettime which may be in -lrt
-ac_save_LIBS=$LIBS
+case $host_os in
-AC_SEARCH_LIBS(clock_gettime, rt,
+    darwin*|macosx*) ;;
-               [AC_DEFINE(HAVE_CLOCK_GETTIME, 1, [Define to 1 if you have the `clock_gettime' function.])
+    *) ac_save_LIBS=$LIBS
+        AC_SEARCH_LIBS(clock_gettime, rt,
+            [AC_DEFINE(HAVE_CLOCK_GETTIME, 1, [Define to 1 if you have the `clock_gettime' function.])
                test "$ac_res" = "none required" || AC_SUBST(RT_LIBS,"$ac_res")])
-LIBS=$ac_save_LIBS
+    LIBS=$ac_save_LIBS
+    ;;
+esac
 dnl **** Check for OpenLDAP ***
 if test "x$with_ldap" != "xno"