From: Takashi Iwai Date: Fri, 7 Dec 2012 08:28:06 +0000 (+0100) Subject: mixer: Don't build simple_abst when no libdl is available X-Git-Tag: v1.0.27~22 X-Git-Url: https://git.alsa-project.org/?a=commitdiff_plain;h=1b428e7719fdec1b5e3206b8e55a86c4891d1849;p=alsa-lib.git mixer: Don't build simple_abst when no libdl is available Check BUILD_MODULES conditional not to compile simple_abst.c. Also return -ENXIO to caller statically in that case. Signed-off-by: Takashi Iwai --- diff --git a/src/mixer/Makefile.am b/src/mixer/Makefile.am index bb466ed7..c0749a47 100644 --- a/src/mixer/Makefile.am +++ b/src/mixer/Makefile.am @@ -1,6 +1,10 @@ EXTRA_LTLIBRARIES=libmixer.la -libmixer_la_SOURCES = bag.c mixer.c simple.c simple_none.c simple_abst.c +libmixer_la_SOURCES = bag.c mixer.c simple.c simple_none.c + +if BUILD_MODULES +libmixer_la_SOURCES += simple_abst.c +endif noinst_HEADERS = mixer_local.h mixer_simple.h diff --git a/src/mixer/mixer_simple.h b/src/mixer/mixer_simple.h index e88b0071..116eebd9 100644 --- a/src/mixer/mixer_simple.h +++ b/src/mixer/mixer_simple.h @@ -28,4 +28,14 @@ snd1_mixer_simple_basic_register int snd_mixer_simple_none_register(snd_mixer_t *mixer, struct snd_mixer_selem_regopt *options, snd_mixer_class_t **classp); + +#ifdef HAVE_LIBDL int snd_mixer_simple_basic_register(snd_mixer_t *mixer, struct snd_mixer_selem_regopt *options, snd_mixer_class_t **classp); +#else +static inline int snd_mixer_simple_basic_register(snd_mixer_t *mixer, + struct snd_mixer_selem_regopt *options, + snd_mixer_class_t **classp) +{ + return -ENXIO; +} +#endif