From patchwork Wed Aug 30 12:09:04 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?b?Q2zDqW1lbnQgQsWTc2No?= X-Patchwork-Id: 4900 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.2.15.201 with SMTP id 70csp448452jao; Wed, 30 Aug 2017 05:10:25 -0700 (PDT) X-Google-Smtp-Source: ADKCNb4bgQtv+F4dZwtGut8pNOuQNlc9NIKYquoGMhZaJMVPAyt/NlTcn3bb0BDoGwjw5HFvVyFt X-Received: by 10.28.15.6 with SMTP id 6mr1388497wmp.0.1504095025723; Wed, 30 Aug 2017 05:10:25 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1504095025; cv=none; d=google.com; s=arc-20160816; b=Fb0Hg2/4trlS9vB57VEKCaAB1v4a5TJr6EwKpHSH/mbFzJ2pqAbP7uD1cm0WseeI6j UXvkkUr90avImA588lLVT5f9NASrsIGYAdyAfE7SPDEO8IfCMMGSnqFqC3iroUpOI1zY rrUy40xi8eLAZSM/GyAXn637Dg8WH8eZx50LqW75e9uZ9qy7Itqo9lKFPuIoPca4L8gx 9QJdJ6JaanWF1M+fZAPN6jsn5LW9LaFcB2hH/C3V3dXHbVlFiqLwSd3/fANmRFZTKapI drn3aG3/NLE5Nh2X2pcX7N23XqPHfeX30aBcbItoe32qMaZ0p7NxdzMWqoB6sFGQ/pZc Hv7A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:cc:reply-to :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:mime-version:references:in-reply-to :message-id:date:to:from:domainkey-signature:dkim-signature :delivered-to:arc-authentication-results; bh=8jwcVDe1uiqTd10zgMVu4yhiLTEvkzg8BbsDAGgOlLY=; b=CvBpYw5uKo7JhpTXeWj7VI2BfLWDYzLGOewvTa2H6GtSIKpYUseJ/n5lWuemy4h2IA glC52znHj84OID0p4IjgfOz4yjcbe7mJ0Wd1j+P85zZbjhcH2RpMS65CBueT/ZGCaNbc SV2/gr2d5d3Xc2SBljvrbs541982CQuMJFKd69aANAxEs5VlkSwm4veclPSvtK7mbR15 sEDcvu8cjnbM4wP+LN7IonS36DV5KOivK1IILQi9y/6CFhUdfIL5xIypfbP2VCvhE0UT BtuyRsflZry/j+aoq7F8esNfgwDIM/dZQndnTyf4+boaKnshGcbd/bFIddTdmjgu9RKn 7N2A== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@pkh.me header.s=selector1 header.b=bvpB+n1O; 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 Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id v63si3004576wme.202.2017.08.30.05.10.25; Wed, 30 Aug 2017 05:10:25 -0700 (PDT) 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=@pkh.me header.s=selector1 header.b=bvpB+n1O; 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 Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 762F868A318; Wed, 30 Aug 2017 15:09:35 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from golem.pkh.me (LStLambert-657-1-117-164.w92-154.abo.wanadoo.fr [92.154.28.164]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 06E8D68A2C5 for ; Wed, 30 Aug 2017 15:09:27 +0300 (EEST) Received: from golem.pkh.me (localhost.localdomain [127.0.0.1]) by golem.pkh.me (OpenSMTPD) with ESMTP id 280b38fa; Wed, 30 Aug 2017 12:09:18 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha1; c=relaxed; d=pkh.me; h=from:to:cc :subject:date:message-id:in-reply-to:references:mime-version :content-type:content-transfer-encoding; s=selector1; bh=unIH2V/ YqBhIWYZr7EX2aP59v0c=; b=bvpB+n1OZAoH6DPIR7k7SkDbOe+weZ528bUMlaW cerE42dAjuoW9TWiFg6kMN+khZpfoKo9WAC6MZ1ydc8zakDVB6DDex3Z7mCvG/pK dFr7wj7yqa591dVHSn3aIEZozLQqqgY5kF67wMPd63DZJztbLFVLn/qfc5rMyr8Y n+pCOKHH1bAddXf7iuUZDsGuNxSPBKJ/6+tLvA95gr9hbnbVCBDf/edRikV+bRwP pKQet523C0qPHIBBW+0jjqui6p1LUhfRKsKLiUx3J8xZewdvxnt2Es9t23nTdFaf Iy1EhqDVFx3EiKWtAuXkoBh23sBV7E0VS/6OI3+IcSDzPGA== DomainKey-Signature: a=rsa-sha1; c=nofws; d=pkh.me; h=from:to:cc:subject :date:message-id:in-reply-to:references:mime-version :content-type:content-transfer-encoding; q=dns; s=selector1; b=U bPwW4Llm3er1QFjmnoarMWjm7Q0Ww35JHqKuMNcAE+tVEhyw8bI28XGVA3iSW+pv 7vlHoaIPJICF0rZb7C+Fck0MZNChs05FOVrhQdcPexL+brTswvjZvl1WGivWAXm7 th36ZPWKrnjhh6O08nZj66wDRt2JcCXl8MglD8I0Rk6ZmQMFDZc+jnsZv2hZqOrT llGePvumNlRESqJ7QYhyRG/oP1O6DR7VWAIaEMaBPsC33tcjhlW04DA1ahtfU2Tn gg24KO41yuMiui194EttdbA+ZG18W4jXghJbKLr1N0ns/PUH7U0nthPic3Gv0bCR 3NbwhP5vZ16YLZErXEvzg== Received: from localhost (golem.pkh.me [local]) by golem.pkh.me (OpenSMTPD) with ESMTPA id 76d77392; Wed, 30 Aug 2017 12:09:17 +0000 (UTC) From: =?UTF-8?q?Cl=C3=A9ment=20B=C5=93sch?= To: ffmpeg-devel@ffmpeg.org Date: Wed, 30 Aug 2017 14:09:04 +0200 Message-Id: <20170830120915.13050-6-u@pkh.me> X-Mailer: git-send-email 2.14.1 In-Reply-To: <20170830120915.13050-1-u@pkh.me> References: <20170830120915.13050-1-u@pkh.me> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 05/16] build: treat securetransport and schannel like other autodetected libraries 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 Cc: =?UTF-8?q?Cl=C3=A9ment=20B=C5=93sch?= Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" From: Clément Bœsch --- configure | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/configure b/configure index e73773fb74..5d416d97f4 100755 --- a/configure +++ b/configure @@ -3606,6 +3606,7 @@ enable_weak cuda cuvid nvenc vda_framework videotoolbox videotoolbox_encoder enable_weak zlib bzlib lzma enable_weak iconv +enable_weak securetransport schannel disabled logging && logfile=/dev/null @@ -6054,11 +6055,16 @@ if enabled decklink; then esac fi -disabled securetransport || { check_func SecIdentityCreate "-Wl,-framework,CoreFoundation -Wl,-framework,Security" && - check_lib securetransport "Security/SecureTransport.h Security/Security.h" "SSLCreateContext SecItemImport" "-Wl,-framework,CoreFoundation -Wl,-framework,Security"; } +enabled securetransport && + check_func SecIdentityCreate "-Wl,-framework,CoreFoundation -Wl,-framework,Security" && + check_lib securetransport "Security/SecureTransport.h Security/Security.h" "SSLCreateContext SecItemImport" "-Wl,-framework,CoreFoundation -Wl,-framework,Security" || + disable securetransport -disabled schannel || { check_func_headers "windows.h security.h" InitializeSecurityContext -DSECURITY_WIN32 -lsecur32 && - check_cpp_condition winerror.h "defined(SEC_I_CONTEXT_EXPIRED)" && enable schannel && add_extralibs -lsecur32; } +enabled schannel && + check_func_headers "windows.h security.h" InitializeSecurityContext -DSECURITY_WIN32 -lsecur32 && + check_cpp_condition winerror.h "defined(SEC_I_CONTEXT_EXPIRED)" && + add_extralibs -lsecur32 || + disable schannel makeinfo --version > /dev/null 2>&1 && enable makeinfo || disable makeinfo enabled makeinfo \