From 93297a5a87014155540d19e4f619b57d86bcdf6d Mon Sep 17 00:00:00 2001 From: Takashi Iwai Date: Sun, 21 Apr 2019 11:59:30 +0200 Subject: [PATCH 3/3] alsa: Fix inclusion of use-case.h The recent change in ALSA upstream stripped -I$include/alsa path from pkgconfig. We already fixed for this change in some places but still the code for UCM was overlooked, and this resulted in the unresolved symbols in alsa card module. Fix them as well. Signed-off-by: Takashi Iwai --- configure.ac | 2 +- src/modules/alsa/alsa-ucm.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/configure.ac b/configure.ac index 3a71fd8c2..b09c138b4 100644 --- a/configure.ac +++ b/configure.ac @@ -830,7 +830,7 @@ AS_IF([test "x$enable_alsa" = "xyes" && test "x$HAVE_ALSA" = "x0"], AS_IF([test "x$HAVE_ALSA" = "x1"], [ save_CPPFLAGS="$CPPFLAGS"; CPPFLAGS="$CPPFLAGS $ASOUNDLIB_CFLAGS" - AC_CHECK_HEADERS([use-case.h], HAVE_ALSA_UCM=1, HAVE_ALSA_UCM=0) + AC_CHECK_HEADERS([alsa/use-case.h], HAVE_ALSA_UCM=1, HAVE_ALSA_UCM=0) CPPFLAGS="$save_CPPFLAGS" ], HAVE_ALSA_UCM=0) diff --git a/src/modules/alsa/alsa-ucm.h b/src/modules/alsa/alsa-ucm.h index 53abf3f90..c926f3cc3 100644 --- a/src/modules/alsa/alsa-ucm.h +++ b/src/modules/alsa/alsa-ucm.h @@ -23,7 +23,7 @@ ***/ #ifdef HAVE_ALSA_UCM -#include +#include #else typedef void snd_use_case_mgr_t; #endif -- 2.21.0