Merge commit '003124ebf4a05f1347c74104216887ddd2e5aad4'
authorJames Almer <jamrial@gmail.com>
Thu, 12 Oct 2017 20:44:06 +0000 (17:44 -0300)
committerJames Almer <jamrial@gmail.com>
Thu, 12 Oct 2017 20:52:43 +0000 (17:52 -0300)
* commit '003124ebf4a05f1347c74104216887ddd2e5aad4':
  build: Fix logic of clock_gettime() check

Merged-by: James Almer <jamrial@gmail.com>
configure

index a44519e178cac852d1be6293eb9cd834351805aa..ade67a31bbb73aad6d2c4cd5a7184f797d4ae745 100755 (executable)
--- a/configure
+++ b/configure
@@ -3341,7 +3341,7 @@ avformat_deps="avcodec avutil"
 avformat_suggest="libm network"
 avresample_deps="avutil"
 avresample_suggest="libm"
-avutil_suggest="libm libdrm libmfx opencl user32 vaapi videotoolbox wincrypt"
+avutil_suggest="clock_gettime libm libdrm libmfx opencl user32 vaapi videotoolbox wincrypt"
 postproc_deps="avutil gpl"
 postproc_suggest="libm"
 swresample_deps="avutil"
@@ -3351,7 +3351,7 @@ swscale_suggest="libm"
 
 avcodec_extralibs="pthreads_extralibs iconv_extralibs"
 avfilter_extralibs="pthreads_extralibs"
-avutil_extralibs="clock_gettime_extralibs nanosleep_extralibs pthreads_extralibs vaapi_drm_extralibs vaapi_x11_extralibs vdpau_x11_extralibs"
+avutil_extralibs="nanosleep_extralibs pthreads_extralibs vaapi_drm_extralibs vaapi_x11_extralibs vdpau_x11_extralibs"
 
 # programs
 ffmpeg_deps="avcodec avfilter avformat swresample"
@@ -5773,7 +5773,7 @@ check_func  ${malloc_prefix}posix_memalign      && enable posix_memalign
 
 check_func  access
 check_func_headers stdlib.h arc4random
-check_func_headers time.h clock_gettime || check_lib clock_gettime time.h clock_gettime -lrt
+check_lib   clock_gettime time.h clock_gettime || check_lib clock_gettime time.h clock_gettime -lrt
 check_func  fcntl
 check_func  fork
 check_func  gethrtime