All of lore.kernel.org
 help / color / mirror / Atom feed
From: Matthieu Crapet <Matthieu.Crapet@ingenico.com>
To: alsa-devel@alsa-project.org
Subject: [PATCH - alsa-utils 1/1] configure: allow contitional compilation of alsaucm
Date: Wed, 14 Jan 2015 15:44:19 +0100	[thread overview]
Message-ID: <1421246659-8112-1-git-send-email-Matthieu.Crapet@ingenico.com> (raw)
In-Reply-To: <1421245533-7624-1-git-send-email-Matthieu.Crapet@ingenico.com>

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 <Matthieu.Crapet@ingenico.com>

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 <alsa/asoundlib.h>])
 AC_CHECK_HEADERS([alsa/seq.h], [have_seq="yes"], [have_seq="no"],
   [#include <alsa/asoundlib.h>])
+AC_CHECK_HEADERS([alsa/use-case.h], [have_ucm="yes"], [have_ucm="no"],
+  [#include <alsa/asoundlib.h>])
 AC_CHECK_HEADERS([samplerate.h], [have_samplerate="yes"], [have_samplerate="no"],
   [#include <samplerate.h>])
 
@@ -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
-- 
1.8.5.4

  reply	other threads:[~2015-01-14 14:44 UTC|newest]

Thread overview: 3+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2015-01-14 14:25 [PATCH - alsa-utils 1/1] configure: allow contitional compilation of alsaucm Matthieu Crapet
2015-01-14 14:44 ` Matthieu Crapet [this message]
2015-01-14 15:11   ` Takashi Iwai

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1421246659-8112-1-git-send-email-Matthieu.Crapet@ingenico.com \
    --to=matthieu.crapet@ingenico.com \
    --cc=alsa-devel@alsa-project.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.