diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2018-03-12 16:14:37 +0000 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2018-03-12 16:14:37 +0000 |
| commit | 6ceb1b51f05f9e1892d082960ed602dca7b6696e (patch) | |
| tree | 32715c1c06bb716fe7ce7966855ff1f39d52e9ad /configure | |
| parent | b16a54da0696efc5d91b6c3597a37a317abb5de7 (diff) | |
| parent | 051c7d5c1e2f4a392a4b89027b27aa4c50c16fe0 (diff) | |
Merge remote-tracking branch 'remotes/kraxel/tags/audio-20180312-pull-request' into staging
modules: use gmodule-export.
audio: add driver registry, enable module builds.
# gpg: Signature made Mon 12 Mar 2018 10:42:19 GMT
# gpg: using RSA key 4CB6D8EED3E87138
# gpg: Good signature from "Gerd Hoffmann (work) <kraxel@redhat.com>"
# gpg: aka "Gerd Hoffmann <gerd@kraxel.org>"
# gpg: aka "Gerd Hoffmann (private) <kraxel@gmail.com>"
# Primary key fingerprint: A032 8CFF B93A 17A7 9901 FE7D 4CB6 D8EE D3E8 7138
* remotes/kraxel/tags/audio-20180312-pull-request:
audio/sdl: build as module
audio/pulseaudio: build as module
audio/oss: build as module
audio/alsa: build as module
build: enable audio modules
audio: add module loading support
audio: add driver registry
modules: use gmodule-export
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'configure')
| -rwxr-xr-x | configure | 9 |
1 files changed, 7 insertions, 2 deletions
@@ -3354,7 +3354,7 @@ else fi glib_modules=gthread-2.0 if test "$modules" = yes; then - glib_modules="$glib_modules gmodule-2.0" + glib_modules="$glib_modules gmodule-export-2.0" fi # This workaround is required due to a bug in pkg-config file for glib as it @@ -5974,7 +5974,12 @@ fi echo "CONFIG_AUDIO_DRIVERS=$audio_drv_list" >> $config_host_mak for drv in $audio_drv_list; do def=CONFIG_AUDIO_$(echo $drv | LC_ALL=C tr '[a-z]' '[A-Z]') - echo "$def=y" >> $config_host_mak + case "$drv" in + alsa | oss | pa | sdl) + echo "$def=m" >> $config_host_mak ;; + *) + echo "$def=y" >> $config_host_mak ;; + esac done echo "ALSA_LIBS=$alsa_libs" >> $config_host_mak echo "PULSE_LIBS=$pulse_libs" >> $config_host_mak |