From patchwork Sat Sep 10 21:25:57 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Timo Rothenpieler X-Patchwork-Id: 540 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.103.140.134 with SMTP id o128csp929730vsd; Sat, 10 Sep 2016 14:26:15 -0700 (PDT) X-Received: by 10.194.85.45 with SMTP id e13mr8441002wjz.5.1473542774955; Sat, 10 Sep 2016 14:26:14 -0700 (PDT) Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id ww3si8739938wjb.172.2016.09.10.14.26.14; Sat, 10 Sep 2016 14:26:14 -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=@rothenpieler.org; 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 95A10689F7A; Sun, 11 Sep 2016 00:26:00 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from btbn.de (btbn.de [5.9.118.179]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 81101689F68 for ; Sun, 11 Sep 2016 00:25:53 +0300 (EEST) Received: from localhost.localdomain (ip4d1666ad.dynamic.kabel-deutschland.de [77.22.102.173]) by btbn.de (Postfix) with ESMTPSA id 5CCB71A381E; Sat, 10 Sep 2016 23:26:04 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=rothenpieler.org; s=mail; t=1473542764; bh=1EPNaM1MeoQXJxF6+CRBcIDYV8D2N/ptcBLDSYpiPd8=; h=From:To:Cc:Subject:Date; b=koabBC/SFHT9RoJzfPl66lkqDjrWRkOMi4OxcdYufq0T7Xwu8wEIJ9okf/Q5MBqir cDPZro9b4ua2by4hqbad1AMy51dlQ7QWbylYwpQlwfOtRR8igjV8Sg3tzqgHlTnZsW 7BxvhZD95AEL9A5UIbOQWA8EvBfFBq6Y4G+WRws8= From: Timo Rothenpieler To: ffmpeg-devel@ffmpeg.org Date: Sat, 10 Sep 2016 23:25:57 +0200 Message-Id: <20160910212557.6215-1-timo@rothenpieler.org> X-Mailer: git-send-email 2.9.3 Subject: [FFmpeg-devel] [PATCH] configure: don't build ffserver unless explicitly enabled 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: Timo Rothenpieler MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" --- configure | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/configure b/configure index b11ca7f..d67d8a2 100755 --- a/configure +++ b/configure @@ -116,7 +116,7 @@ Program options: --disable-ffmpeg disable ffmpeg build --disable-ffplay disable ffplay build --disable-ffprobe disable ffprobe build - --disable-ffserver disable ffserver build + --enable-ffserver enable ffserver build Documentation options: --disable-doc do not build documentation @@ -1615,10 +1615,13 @@ LICENSE_LIST=" PROGRAM_LIST=" ffplay ffprobe - ffserver ffmpeg " +DEPRECATED_PROGRAM_LIST=" + ffserver +" + SUBSYSTEM_LIST=" dct dwt @@ -1644,6 +1647,7 @@ CONFIG_LIST=" $LICENSE_LIST $LIBRARY_LIST $PROGRAM_LIST + $DEPRECATED_PROGRAM_LIST $SUBSYSTEM_LIST fontconfig incompatible_libav_abi @@ -6492,7 +6496,7 @@ test -n "$random_seed" && echo echo "Enabled programs:" -print_enabled '' $PROGRAM_LIST | print_in_columns +print_enabled '' $PROGRAM_LIST $DEPRECATED_PROGRAM_LIST | print_in_columns echo echo "External libraries:" @@ -6682,7 +6686,7 @@ print_program_libs(){ eval echo "LIBS-${1}=${program_libs}" >> config.mak } -map 'print_program_libs $v' $PROGRAM_LIST +map 'print_program_libs $v' $PROGRAM_LIST $DEPRECATED_PROGRAM_LIST cat > $TMPH <