Commit 22df57297988b4605151bf96fa154a4516a98b5f
2023-02-13T21:50:40
look for clock_gettime() in libc first, then in librt if not found.
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 104 105 106 107 108 109 110 111 112 113 114 115 116 117 118 119 120 121 122 123 124 125 126 127 128 129 130 131 132 133 134 135 136 137 138 139 140 141 142 143 144 145 146 147 148 149
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 6a941a1..7970eac 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1617,14 +1617,14 @@ elseif(UNIX AND NOT APPLE AND NOT RISCOS AND NOT HAIKU)
CheckPTHREAD()
if(SDL_CLOCK_GETTIME)
- check_library_exists(rt clock_gettime "" FOUND_CLOCK_GETTIME_LIBRT)
- if(FOUND_CLOCK_GETTIME_LIBRT)
- list(APPEND EXTRA_LIBS rt)
+ check_library_exists(c clock_gettime "" FOUND_CLOCK_GETTIME_LIBC)
+ if(FOUND_CLOCK_GETTIME_LIBC)
set(HAVE_CLOCK_GETTIME 1)
else()
- check_library_exists(c clock_gettime "" FOUND_CLOCK_GETTIME_LIBC)
- if(FOUND_CLOCK_GETTIME_LIBC)
+ check_library_exists(rt clock_gettime "" FOUND_CLOCK_GETTIME_LIBRT)
+ if(FOUND_CLOCK_GETTIME_LIBRT)
set(HAVE_CLOCK_GETTIME 1)
+ list(APPEND EXTRA_LIBS rt)
endif()
endif()
endif()
diff --git a/configure b/configure
index 926afb6..21878a5 100755
--- a/configure
+++ b/configure
@@ -28404,14 +28404,14 @@ else $as_nop
fi
if test x$enable_clock_gettime = xyes; then
- { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for clock_gettime in -lrt" >&5
-printf %s "checking for clock_gettime in -lrt... " >&6; }
-if test ${ac_cv_lib_rt_clock_gettime+y}
+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for clock_gettime in -lc" >&5
+printf %s "checking for clock_gettime in -lc... " >&6; }
+if test ${ac_cv_lib_c_clock_gettime+y}
then :
printf %s "(cached) " >&6
else $as_nop
ac_check_lib_save_LIBS=$LIBS
-LIBS="-lrt $LIBS"
+LIBS="-lc $LIBS"
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
@@ -28429,17 +28429,17 @@ return clock_gettime ();
_ACEOF
if ac_fn_c_try_link "$LINENO"
then :
- ac_cv_lib_rt_clock_gettime=yes
+ ac_cv_lib_c_clock_gettime=yes
else $as_nop
- ac_cv_lib_rt_clock_gettime=no
+ ac_cv_lib_c_clock_gettime=no
fi
rm -f core conftest.err conftest.$ac_objext conftest.beam \
conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_rt_clock_gettime" >&5
-printf "%s\n" "$ac_cv_lib_rt_clock_gettime" >&6; }
-if test "x$ac_cv_lib_rt_clock_gettime" = xyes
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_c_clock_gettime" >&5
+printf "%s\n" "$ac_cv_lib_c_clock_gettime" >&6; }
+if test "x$ac_cv_lib_c_clock_gettime" = xyes
then :
have_clock_gettime=yes
fi
@@ -28448,16 +28448,15 @@ fi
printf "%s\n" "#define HAVE_CLOCK_GETTIME 1" >>confdefs.h
- EXTRA_LDFLAGS="$EXTRA_LDFLAGS -lrt"
else
- { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for clock_gettime in -lc" >&5
-printf %s "checking for clock_gettime in -lc... " >&6; }
-if test ${ac_cv_lib_c_clock_gettime+y}
+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for clock_gettime in -lrt" >&5
+printf %s "checking for clock_gettime in -lrt... " >&6; }
+if test ${ac_cv_lib_rt_clock_gettime+y}
then :
printf %s "(cached) " >&6
else $as_nop
ac_check_lib_save_LIBS=$LIBS
-LIBS="-lc $LIBS"
+LIBS="-lrt $LIBS"
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
@@ -28475,26 +28474,26 @@ return clock_gettime ();
_ACEOF
if ac_fn_c_try_link "$LINENO"
then :
- ac_cv_lib_c_clock_gettime=yes
+ ac_cv_lib_rt_clock_gettime=yes
else $as_nop
- ac_cv_lib_c_clock_gettime=no
+ ac_cv_lib_rt_clock_gettime=no
fi
rm -f core conftest.err conftest.$ac_objext conftest.beam \
conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_c_clock_gettime" >&5
-printf "%s\n" "$ac_cv_lib_c_clock_gettime" >&6; }
-if test "x$ac_cv_lib_c_clock_gettime" = xyes
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_rt_clock_gettime" >&5
+printf "%s\n" "$ac_cv_lib_rt_clock_gettime" >&6; }
+if test "x$ac_cv_lib_rt_clock_gettime" = xyes
then :
have_clock_gettime=yes
fi
if test x$have_clock_gettime = xyes; then
+ EXTRA_LDFLAGS="$EXTRA_LDFLAGS -lrt"
printf "%s\n" "#define HAVE_CLOCK_GETTIME 1" >>confdefs.h
- EXTRA_LDFLAGS="$EXTRA_LDFLAGS"
fi
fi
fi
diff --git a/configure.ac b/configure.ac
index a4fe1ae..4f41b3a 100644
--- a/configure.ac
+++ b/configure.ac
@@ -3681,15 +3681,14 @@ CheckClockGettime()
[AS_HELP_STRING([--enable-clock_gettime], [use clock_gettime() instead of gettimeofday() on UNIX [default=yes]])],
, enable_clock_gettime=yes)
if test x$enable_clock_gettime = xyes; then
- AC_CHECK_LIB(rt, clock_gettime, have_clock_gettime=yes)
+ AC_CHECK_LIB(c, clock_gettime, have_clock_gettime=yes)
if test x$have_clock_gettime = xyes; then
- AC_DEFINE(HAVE_CLOCK_GETTIME, 1, [ ])
- EXTRA_LDFLAGS="$EXTRA_LDFLAGS -lrt"
+ AC_DEFINE(HAVE_CLOCK_GETTIME, 1, [ ])
else
- AC_CHECK_LIB(c, clock_gettime, have_clock_gettime=yes)
+ AC_CHECK_LIB(rt, clock_gettime, have_clock_gettime=yes)
if test x$have_clock_gettime = xyes; then
- AC_DEFINE(HAVE_CLOCK_GETTIME, 1, [ ])
- EXTRA_LDFLAGS="$EXTRA_LDFLAGS"
+ EXTRA_LDFLAGS="$EXTRA_LDFLAGS -lrt"
+ AC_DEFINE(HAVE_CLOCK_GETTIME, 1, [ ])
fi
fi
fi