ffmpeg | branch: master | Timo Rothenpieler <t...@rothenpieler.org> | Sat Mar 
26 00:13:39 2016 +0100| [665c05f7cb703fba5965b36346344d0a8372965f] | committer: 
Timo Rothenpieler

configure: Fail if CUDA enabled but not found

Without this patch, configure still passes and enables CUDA, no matter
if it was actually found, breaking the build in case it was not.

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=665c05f7cb703fba5965b36346344d0a8372965f
---

 configure |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/configure b/configure
index 5aa8c1f..e550547 100755
--- a/configure
+++ b/configure
@@ -5513,7 +5513,8 @@ enabled avfoundation_indev && { check_lib2 
CoreGraphics/CoreGraphics.h CGGetActi
 enabled avisynth          && { { check_lib2 "windows.h" LoadLibrary; } ||
                                { check_lib2 "dlfcn.h" dlopen -ldl; } ||
                                die "ERROR: LoadLibrary/dlopen not found for 
avisynth"; }
-enabled cuda              && check_lib cuda.h cuInit -lcuda
+enabled cuda              && { check_lib cuda.h cuInit -lcuda ||
+                               die "ERROR: CUDA not found"; }
 enabled chromaprint       && require chromaprint chromaprint.h 
chromaprint_get_version -lchromaprint
 enabled coreimage_filter  && { check_header_objcc QuartzCore/CoreImage.h || 
disable coreimage_filter; }
 enabled coreimagesrc_filter && { check_header_objcc QuartzCore/CoreImage.h || 
disable coreimagesrc_filter; }

_______________________________________________
ffmpeg-cvslog mailing list
ffmpeg-cvslog@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog

Reply via email to