]> git.sesse.net Git - ffmpeg/commitdiff
configure: Simplify avisynth check
authorDiego Biurrun <diego@biurrun.de>
Tue, 17 Mar 2015 12:31:41 +0000 (13:31 +0100)
committerDiego Biurrun <diego@biurrun.de>
Wed, 15 Apr 2015 12:52:58 +0000 (14:52 +0200)
configure

index 8821cbc331e6a54d756d8c60e8a7397ed6c50eae..3493ea8bf0b5be3b2870989aa400c950fd6841db 100755 (executable)
--- a/configure
+++ b/configure
@@ -4217,8 +4217,8 @@ for func in $MATH_FUNCS; do
 done
 
 # these are off by default, so fail if requested and not available
-enabled avisynth          && { { check_header "avisynth/avisynth_c.h" && check_lib2 "windows.h" LoadLibrary; } ||
-                               { check_header "avxsynth/avxsynth_c.h" && check_lib2 "dlfcn.h" dlopen -ldl; } ||
+enabled avisynth          && { check_lib2 "avisynth/avisynth_c.h windows.h" LoadLibrary ||
+                               check_lib2 "avxsynth/avxsynth_c.h dlfcn.h" dlopen -ldl   ||
                                die "ERROR: LoadLibrary/dlopen not found, or avisynth header not found"; }
 enabled frei0r            && { check_header frei0r.h || die "ERROR: frei0r.h header not found"; }
 enabled gnutls            && require_pkg_config gnutls gnutls/gnutls.h gnutls_global_init