From patchwork Wed Jan 14 14:25:33 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Matthieu Crapet X-Patchwork-Id: 5631841 Return-Path: X-Original-To: patchwork-alsa-devel@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork2.web.kernel.org (Postfix) with ESMTP id C29FAC058D for ; Wed, 14 Jan 2015 14:25:41 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 0AEDB202B4 for ; Wed, 14 Jan 2015 14:25:41 +0000 (UTC) Received: from alsa0.perex.cz (alsa0.perex.cz [77.48.224.243]) by mail.kernel.org (Postfix) with ESMTP id 6820C2027D for ; Wed, 14 Jan 2015 14:25:39 +0000 (UTC) Received: by alsa0.perex.cz (Postfix, from userid 1000) id 86C542651CE; Wed, 14 Jan 2015 15:25:38 +0100 (CET) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 Received: from alsa0.perex.cz (localhost [IPv6:::1]) by alsa0.perex.cz (Postfix) with ESMTP id A9373260623; Wed, 14 Jan 2015 15:25:30 +0100 (CET) X-Original-To: alsa-devel@alsa-project.org Delivered-To: alsa-devel@alsa-project.org Received: by alsa0.perex.cz (Postfix, from userid 1000) id 425AC2606A0; Wed, 14 Jan 2015 15:25:28 +0100 (CET) Received: from smtp1.ingenico.com (smtp1.ingenico.com [217.108.148.240]) by alsa0.perex.cz (Postfix) with ESMTP id 794DB260660 for ; Wed, 14 Jan 2015 15:25:23 +0100 (CET) X-IronPort-AV: E=Sophos;i="5.07,756,1413237600"; d="scan'208";a="66224360" Received: from cosnadexc21.usr.ingenico.loc ([10.31.4.221]) by antispam1.usr.ingenico.loc with ESMTP; 14 Jan 2015 15:25:23 +0100 Received: from COSNADEXC12.usr.ingenico.loc (10.31.4.212) by COSNADEXC21.usr.ingenico.loc (10.31.4.221) with Microsoft SMTP Server (TLS) id 14.3.210.2; Wed, 14 Jan 2015 15:25:22 +0100 Received: from u56.usr.ingenico.loc (10.23.7.56) by COSNADEXC12.usr.ingenico.loc (10.31.4.212) with Microsoft SMTP Server id 14.3.210.2; Wed, 14 Jan 2015 15:25:22 +0100 From: Matthieu Crapet To: Date: Wed, 14 Jan 2015 15:25:33 +0100 Message-ID: <1421245533-7624-1-git-send-email-Matthieu.Crapet@ingenico.com> X-Mailer: git-send-email 1.9.2 MIME-Version: 1.0 Cc: Matthieu Crapet Subject: [alsa-devel] [PATCH - alsa-utils 1/1] configure: allow contitional compilation of alsaucm X-BeenThere: alsa-devel@alsa-project.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: "Alsa-devel mailing list for ALSA developers - http://www.alsa-project.org" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: alsa-devel-bounces@alsa-project.org Sender: alsa-devel-bounces@alsa-project.org X-Virus-Scanned: ClamAV using ClamSMTP If alsa-lib have been compiled with --disable-ucm, alsaucm can't be built. Detection is dynamic, no configure command line option is available for now. Signed-off-by: Matthieu Crapet diff --git a/Makefile.am b/Makefile.am index 248eb11..5bbe588 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,6 +1,6 @@ AM_CPPFLAGS=-I$(top_srcdir)/include -SUBDIRS = include alsactl alsaucm utils m4 po alsa-info +SUBDIRS = include alsactl utils m4 po alsa-info if ALSAMIXER SUBDIRS += alsamixer endif @@ -22,6 +22,9 @@ endif if HAVE_SEQ SUBDIRS += seq endif +if HAVE_UCM +SUBDIRS += alsaucm +endif EXTRA_DIST= TODO gitcompile AUTOMAKE_OPTIONS=foreign diff --git a/configure.ac b/configure.ac index 3c7032b..d953e5c 100644 --- a/configure.ac +++ b/configure.ac @@ -48,6 +48,8 @@ AC_CHECK_HEADERS([alsa/rawmidi.h], [have_rawmidi="yes"], [have_rawmidi="no"], [#include ]) AC_CHECK_HEADERS([alsa/seq.h], [have_seq="yes"], [have_seq="no"], [#include ]) +AC_CHECK_HEADERS([alsa/use-case.h], [have_ucm="yes"], [have_ucm="no"], + [#include ]) AC_CHECK_HEADERS([samplerate.h], [have_samplerate="yes"], [have_samplerate="no"], [#include ]) @@ -55,6 +57,7 @@ AM_CONDITIONAL(HAVE_PCM, test "$have_pcm" = "yes") AM_CONDITIONAL(HAVE_MIXER, test "$have_mixer" = "yes") AM_CONDITIONAL(HAVE_RAWMIDI, test "$have_rawmidi" = "yes") AM_CONDITIONAL(HAVE_SEQ, test "$have_seq" = "yes") +AM_CONDITIONAL(HAVE_UCM, test "$have_ucm" = "yes") AM_CONDITIONAL(HAVE_SAMPLERATE, test "$have_samplerate" = "yes") dnl Check for librt