| Message ID | 1490000743-3615-1-git-send-email-kraxel@redhat.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
On 20 March 2017 at 09:05, Gerd Hoffmann <kraxel@redhat.com> wrote: > sdl is probed before audio, so we can simply look at $sdl so see > whenever we have support or not. Throw an error in case sdl audio > is requested without sdl being available. > > Reported-by: Peter Maydell <peter.maydell@linaro.org> > Signed-off-by: Gerd Hoffmann <kraxel@redhat.com> > --- > configure | 10 ++++++++-- > 1 file changed, 8 insertions(+), 2 deletions(-) > > diff --git a/configure b/configure > index 99d8bec..2d088c6 100755 > --- a/configure > +++ b/configure > @@ -2894,6 +2894,12 @@ for drv in $audio_drv_list; do > audio_pt_int="yes" > ;; > > + sdl) > + if test "$sdl" = "no"; then > + error_exit "sdl not found or disabled, can not use sdl audio driver" > + fi > + ;; > + > coreaudio) > libs_softmmu="-framework CoreAudio $libs_softmmu" > ;; > @@ -2907,8 +2913,8 @@ for drv in $audio_drv_list; do > libs_softmmu="$oss_lib $libs_softmmu" > ;; > > - sdl|wav) > - # XXX: Probes for CoreAudio, DirectSound, SDL(?) > + wav) > + # XXX: Probes for CoreAudio, DirectSound > ;; > > *) > -- > 1.8.3.1 Reviewed-by: Peter Maydell <peter.maydell@linaro.org> Tested-by: Peter Maydell <peter.maydell@linaro.org> I'll apply this to master as a buildfix in a bit. thanks -- PMM
On 20 March 2017 at 15:43, Peter Maydell <peter.maydell@linaro.org> wrote: > On 20 March 2017 at 09:05, Gerd Hoffmann <kraxel@redhat.com> wrote: >> sdl is probed before audio, so we can simply look at $sdl so see >> whenever we have support or not. Throw an error in case sdl audio >> is requested without sdl being available. > Reviewed-by: Peter Maydell <peter.maydell@linaro.org> > Tested-by: Peter Maydell <peter.maydell@linaro.org> > > I'll apply this to master as a buildfix in a bit. ...now applied. thanks -- PMM
diff --git a/configure b/configure index 99d8bec..2d088c6 100755 --- a/configure +++ b/configure @@ -2894,6 +2894,12 @@ for drv in $audio_drv_list; do audio_pt_int="yes" ;; + sdl) + if test "$sdl" = "no"; then + error_exit "sdl not found or disabled, can not use sdl audio driver" + fi + ;; + coreaudio) libs_softmmu="-framework CoreAudio $libs_softmmu" ;; @@ -2907,8 +2913,8 @@ for drv in $audio_drv_list; do libs_softmmu="$oss_lib $libs_softmmu" ;; - sdl|wav) - # XXX: Probes for CoreAudio, DirectSound, SDL(?) + wav) + # XXX: Probes for CoreAudio, DirectSound ;; *)
sdl is probed before audio, so we can simply look at $sdl so see whenever we have support or not. Throw an error in case sdl audio is requested without sdl being available. Reported-by: Peter Maydell <peter.maydell@linaro.org> Signed-off-by: Gerd Hoffmann <kraxel@redhat.com> --- configure | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-)