[FFmpeg-cvslog] configure: Simplify avisynth check

Diego Biurrun git at videolan.org
Fri Apr 17 20:34:48 CEST 2015


ffmpeg | branch: master | Diego Biurrun <diego at biurrun.de> | Tue Mar 17 13:31:41 2015 +0100| [1336bb06c9fbf9a14765e9f78616f2aad4f3a45a] | committer: Diego Biurrun

configure: Simplify avisynth check

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

 configure |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/configure b/configure
index 8821cbc..3493ea8 100755
--- 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



More information about the ffmpeg-cvslog mailing list