From ed3af74ffd91d827bcd824a6d6706c29358336c4 Mon Sep 17 00:00:00 2001 From: "Avi Halachmi (:avih)" Date: Fri, 20 May 2022 23:14:08 +0300 Subject: ffmpeg-config: ssl/tls detection: don't ignore ffmpeg_options This is a regression from 3de25ed , where previously ffmpeg_options content was added to $OPTION before the checks, but since 3de25ed it stays as "$@", but the ssl/tls still only checked $OPTIONS. Now it checks both $OPTIONS and "$@", which takes ffmpeg_options into account as well. --- scripts/ffmpeg-config | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'scripts') diff --git a/scripts/ffmpeg-config b/scripts/ffmpeg-config index d268e0f..4fd3a5b 100755 --- a/scripts/ffmpeg-config +++ b/scripts/ffmpeg-config @@ -17,9 +17,9 @@ if "$BUILD"/scripts/test-libmpv ; then fi # Do FFmpeg's job. -if ! ( echo "$OPTIONS" | grep -q -e --enable-openssl ) && - ! ( echo "$OPTIONS" | grep -q -e --enable-gnutls ) && - ! ( echo "$OPTIONS" | grep -q -e --enable-mbedtls ) ; +if ! ( echo "$OPTIONS" "$@" | grep -q -e --enable-openssl ) && + ! ( echo "$OPTIONS" "$@" | grep -q -e --enable-gnutls ) && + ! ( echo "$OPTIONS" "$@" | grep -q -e --enable-mbedtls ) ; then if pkg-config gnutls ; then OPTIONS="$OPTIONS --enable-gnutls" -- cgit v1.2.3