From patchwork Tue Nov 22 22:15:04 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Cadhalpun X-Patchwork-Id: 1532 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.103.90.1 with SMTP id o1csp2435440vsb; Tue, 22 Nov 2016 14:15:15 -0800 (PST) X-Received: by 10.194.122.101 with SMTP id lr5mr356583wjb.210.1479852915632; Tue, 22 Nov 2016 14:15:15 -0800 (PST) Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id gc7si27868168wjb.277.2016.11.22.14.15.15; Tue, 22 Nov 2016 14:15:15 -0800 (PST) Received-SPF: pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) client-ip=79.124.17.100; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@googlemail.com; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org; dmarc=fail (p=QUARANTINE dis=NONE) header.from=googlemail.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id BFE4568920C; Wed, 23 Nov 2016 00:15:09 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wm0-f68.google.com (mail-wm0-f68.google.com [74.125.82.68]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 9C1C3687ECB for ; Wed, 23 Nov 2016 00:15:03 +0200 (EET) Received: by mail-wm0-f68.google.com with SMTP id m203so7086773wma.3 for ; Tue, 22 Nov 2016 14:15:07 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=googlemail.com; s=20120113; h=from:to:subject:message-id:date:user-agent:mime-version :content-transfer-encoding; bh=zfcCqVKrLTSS5bbaozkwxKLC0zpH/y0eR6F4azJMHOw=; b=qFr/jeZT53zyCQJKwL/P/Xjk+7fGdT3n3Jr4IP28PrlgiRjgj37kdV9w3e23INc+5L sHbqpURnaKWpSD1+6kFQPn+mqff5rWW0OD4wPlHTIURuiwg3RTad5Z47Fx7BNPEAsHaJ 3qcfDeiBuum1slaJGpMzR18Yqrdfb2R2FbdlXm10O+2KGwl3wFDwOv05T05kCdkyP12N Ir7ojS5mk3G8FYr7z3O+qu6g7xEn2HygeBJr9rkLKgsMYcCIm9Yj/woJ1YX29FQfOzGO KF5iRSXYmTvgAIIdWmVr8ogPNu7HY03SAANNwpfYSwvNebTxlSgzFhrFoiZvZpFZje55 o7eg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:subject:message-id:date:user-agent :mime-version:content-transfer-encoding; bh=zfcCqVKrLTSS5bbaozkwxKLC0zpH/y0eR6F4azJMHOw=; b=CohbNRM71kuVpsBslzQsz/3A+LtH7XmOa6kX4aha58+1wekkqrBcBCepgvMVwlQhEV kGG7Acim+BYVW5CQ5/G1Ej+Qo83leDvTr340U+AAGR36WHDdN8uwXnKc418bY7PQWwZf 6TDu7beW0hgpxLz/IUbqJ2xbw2UqbGXsr9+N/md8YDfEoAcnOr8hwl+wBchdDRo6DgDr oFtqCmpppuHickdLIM3hW2dRzLvltCDO2pgaCOsbaETQyZI04FGHN426gTAON5sEakEr kIGTeU8H26FZGnRbG7vR4sTtEQyjh2KgfzC0O1Fn7ir8Mb2cP1RjrGaTb8+ph+tgMfy7 weHg== X-Gm-Message-State: AKaTC028pqj0pYya9iQuBfISAOQw8+IixbBvTEPXRvEEJwf17N1VVWxPibYch3Pp11FoFw== X-Received: by 10.28.60.194 with SMTP id j185mr350696wma.33.1479852906439; Tue, 22 Nov 2016 14:15:06 -0800 (PST) Received: from [192.168.2.21] (p5B072A0D.dip0.t-ipconnect.de. [91.7.42.13]) by smtp.googlemail.com with ESMTPSA id l187sm5123813wml.6.2016.11.22.14.15.05 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 22 Nov 2016 14:15:05 -0800 (PST) From: Andreas Cadhalpun X-Google-Original-From: Andreas Cadhalpun To: FFmpeg development discussions and patches Message-ID: <5c6dfd73-bf3c-3951-54ac-d6817e0b28d9@googlemail.com> Date: Tue, 22 Nov 2016 23:15:04 +0100 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:45.0) Gecko/20100101 Icedove/45.4.0 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH] configure: fail if sdl2 was requested but not found X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: FFmpeg development discussions and patches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: FFmpeg development discussions and patches Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Signed-off-by: Andreas Cadhalpun --- configure | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/configure b/configure index 7d094df..0d85a54 100755 --- a/configure +++ b/configure @@ -5846,7 +5846,9 @@ if enabled gcrypt; then fi disabled sdl && disable sdl2 +enabled sdl2 && sdl_requested=yes if ! disabled sdl2; then + disable sdl2 SDL2_CONFIG="${cross_prefix}sdl2-config" if check_pkg_config sdl2 SDL_events.h SDL_PollEvent; then check_cpp_condition SDL.h "(SDL_MAJOR_VERSION<<16 | SDL_MINOR_VERSION<<8 | SDL_PATCHLEVEL) >= 0x020001" $sdl2_cflags && @@ -5867,6 +5869,8 @@ if ! disabled sdl2; then fi enabled sdl2 && add_cflags $sdl2_cflags && add_extralibs $sdl2_libs +[ "x$sdl_requested" = "xyes" ] && ! enabled sdl2 && die "ERROR: libsdl2 requested but not found"; + disabled securetransport || { check_func SecIdentityCreate "-Wl,-framework,CoreFoundation -Wl,-framework,Security" && check_lib2 "Security/SecureTransport.h Security/Security.h" "SSLCreateContext SecItemImport" "-Wl,-framework,CoreFoundation -Wl,-framework,Security" && enable securetransport; }