forked from pool/alsa-utils
c1e4b30d69
- Backport upstream fixes: fix missing unlock for the error path in alsactl, more alsactl init entries, alsaucm build fix 0016-alsactl-add-missing-state_unlock-call.patch 0017-alsactl-init-Change-the-basic-rules-description.patch 0018-alsactl-init-Add-Line-Out-to-list-of-outputs-to-init.patch 0019-configure-allow-contitional-compilation-of-alsaucm.patch OBS-URL: https://build.opensuse.org/request/show/283732 OBS-URL: https://build.opensuse.org/package/show/multimedia:libs/alsa-utils?expand=0&rev=112
62 lines
2.0 KiB
Diff
62 lines
2.0 KiB
Diff
From 554706585c6d020e5cbb10be1ccb66164eed2c2f Mon Sep 17 00:00:00 2001
|
|
From: Matthieu Crapet <Matthieu.Crapet@ingenico.com>
|
|
Date: Wed, 14 Jan 2015 15:44:19 +0100
|
|
Subject: [PATCH] configure: allow contitional compilation of alsaucm
|
|
|
|
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>
|
|
Signed-off-by: Takashi Iwai <tiwai@suse.de>
|
|
---
|
|
Makefile.am | 5 ++++-
|
|
configure.ac | 3 +++
|
|
2 files changed, 7 insertions(+), 1 deletion(-)
|
|
|
|
diff --git a/Makefile.am b/Makefile.am
|
|
index 248eb11cb53a..5bbe588a8d84 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 3c7032b0d346..d953e5ccb73c 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
|
|
--
|
|
2.2.2
|
|
|