From patchwork Tue Apr 15 18:39:33 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Andr=C3=A9_Roth?= X-Patchwork-Id: 3995031 Return-Path: X-Original-To: patchwork-linux-media@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 8E0649F336 for ; Tue, 15 Apr 2014 18:41:53 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id B703520274 for ; Tue, 15 Apr 2014 18:41:52 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id CB7782026C for ; Tue, 15 Apr 2014 18:41:48 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755218AbaDOSln (ORCPT ); Tue, 15 Apr 2014 14:41:43 -0400 Received: from mail-ee0-f54.google.com ([74.125.83.54]:56488 "EHLO mail-ee0-f54.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755213AbaDOSla (ORCPT ); Tue, 15 Apr 2014 14:41:30 -0400 Received: by mail-ee0-f54.google.com with SMTP id d49so8162930eek.27 for ; Tue, 15 Apr 2014 11:41:29 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-type:content-transfer-encoding; bh=3PdGUTbd5FnjDHGz/hyu3UChJMnckE7TBt//5gbM0E8=; b=QPNDQdmpbdyjOjRvzqkB8E/MRKXHGb+DhLxgMOLZpZiCjFvNDUjAja8T+E7C+Vorr6 qM5opgT0HuOpqW4kBZF88Gtul+lyWy3Dnvoivfc7Y3oyKB4WD265zpbeO2iciBb3BcXu hU4mkidB+oyyXgnZ8INxwtSI1dH8k86fQyouwmPL6qKalxqOMA0XT6OXyTfg3AE60sXx Cfggaap1YsGRu4fJYraSFYPNkszSWRs2Xkt6Dw+Jn27iZ0731vNVSq7miBSi62zNpljj +7VYCoT3ZjVINbMKaDku5wEasVu59TC61bXgZ6jLXDWDjVsHBGghT9mHSxssB4cxt6pu s+gA== X-Received: by 10.14.215.9 with SMTP id d9mr4719773eep.64.1397587289444; Tue, 15 Apr 2014 11:41:29 -0700 (PDT) Received: from neutrino.exnihilo (29-206.60-188.cust.bluewin.ch. [188.60.206.29]) by mx.google.com with ESMTPSA id q41sm51095511eez.7.2014.04.15.11.41.27 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Tue, 15 Apr 2014 11:41:28 -0700 (PDT) From: =?UTF-8?q?Andr=C3=A9=20Roth?= To: linux-media@vger.kernel.org Cc: =?UTF-8?q?Andr=C3=A9=20Roth?= Subject: [PATCH 4/4] libdvbv5: build dynamic libdvbv5 by default Date: Tue, 15 Apr 2014 20:39:33 +0200 Message-Id: <1397587173-1120-4-git-send-email-neolynx@gmail.com> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1397587173-1120-1-git-send-email-neolynx@gmail.com> References: <1397587173-1120-1-git-send-email-neolynx@gmail.com> MIME-Version: 1.0 Sender: linux-media-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-media@vger.kernel.org X-Spam-Status: No, score=-7.4 required=5.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED, FREEMAIL_FROM, RCVD_IN_DNSWL_HI, RP_MATCHES_RCVD, T_DKIM_INVALID, UNPARSEABLE_RELAY autolearn=ham version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP - renamed ./configure option --enable-libdvbv5 to --disable-libdvbv5 - thus libdvbv5 will be build shared by default - cleanups in configure.ac Signed-off-by: André Roth --- configure.ac | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/configure.ac b/configure.ac index 4080d1e..474c681 100644 --- a/configure.ac +++ b/configure.ac @@ -216,10 +216,10 @@ AC_DEFINE_DIR([IR_KEYTABLE_USER_DIR], [keytableuserdir], [ir-keytable user defin # options AC_ARG_ENABLE(libdvbv5, - AS_HELP_STRING([--enable-libdvbv5], [enable experimental dynamic libdvbv5 compilation]), + AS_HELP_STRING([--disable-libdvbv5], [disable experimental dynamic libdvbv5 compilation]), [case "${enableval}" in yes | no ) ;; - *) AC_MSG_ERROR(bad value ${enableval} for --enable-libdvbv5) ;; + *) AC_MSG_ERROR(bad value ${enableval} for --disable-libdvbv5) ;; esac] ) @@ -227,7 +227,7 @@ AC_ARG_ENABLE(libv4l, AS_HELP_STRING([--disable-libv4l], [disable dynamic libv4l compilation]), [case "${enableval}" in yes | no ) ;; - *) AC_MSG_ERROR(bad value ${enableval} for --enable-libv4l) ;; + *) AC_MSG_ERROR(bad value ${enableval} for --disable-libv4l) ;; esac] ) @@ -235,7 +235,7 @@ AC_ARG_ENABLE(v4l-utils, AS_HELP_STRING([--disable-v4l-utils], [disable v4l-utils compilation]), [case "${enableval}" in yes | no ) ;; - *) AC_MSG_ERROR(bad value ${enableval} for --enable-v4l-utils) ;; + *) AC_MSG_ERROR(bad value ${enableval} for --disable-v4l-utils) ;; esac] ) @@ -247,17 +247,17 @@ AC_ARG_ENABLE(qv4l2, esac] ) -AM_CONDITIONAL([WITH_LIBDVBV5], [test x$enable_libdvbv5 = xyes]) -AM_CONDITIONAL([WITH_LIBV4L], [test x$enable_libv4l != xno]) -AM_CONDITIONAL([WITH_V4LUTILS], [test x$enable_v4l_utils != "xno"]) -AM_CONDITIONAL([WITH_QV4L2], [test ${qt_pkgconfig} = true -a x$enable_qv4l2 != xno]) -AM_CONDITIONAL([WITH_V4L_PLUGINS], [test x$enable_libv4l != xno -a x$enable_shared != xno]) +AM_CONDITIONAL([WITH_LIBDVBV5], [test x$enable_libdvbv5 != xno]) +AM_CONDITIONAL([WITH_LIBV4L], [test x$enable_libv4l != xno]) +AM_CONDITIONAL([WITH_V4LUTILS], [test x$enable_v4l_utils != xno]) +AM_CONDITIONAL([WITH_QV4L2], [test ${qt_pkgconfig} = true -a x$enable_qv4l2 != xno]) +AM_CONDITIONAL([WITH_V4L_PLUGINS], [test x$enable_libv4l != xno -a x$enable_shared != xno]) AM_CONDITIONAL([WITH_V4L_WRAPPERS], [test x$enable_libv4l != xno -a x$enable_shared != xno]) -AM_CONDITIONAL([WITH_QTGL], [test ${qt_pkgconfig_gl} = true]) +AM_CONDITIONAL([WITH_QTGL], [test ${qt_pkgconfig_gl} = true]) # append -static to libtool compile and link command to enforce static libs -AS_IF([test x$enable_libdvbv5 != xyes], [AC_SUBST([ENFORCE_LIBDVBV5_STATIC], ["-static"])]) -AS_IF([test x$enable_libv4l = xno], [AC_SUBST([ENFORCE_LIBV4L_STATIC], ["-static"])]) +AS_IF([test x$enable_libdvbv5 = xno], [AC_SUBST([ENFORCE_LIBDVBV5_STATIC], ["-static"])]) +AS_IF([test x$enable_libv4l = xno], [AC_SUBST([ENFORCE_LIBV4L_STATIC], ["-static"])]) # misc