| Message ID | 20190124112055.547-2-kraxel@redhat.com |
|---|---|
| State | New |
| Headers | show |
| Series | [v3,1/6] audio: use pkg-config | expand |
On 1/24/19 12:20 PM, Gerd Hoffmann wrote: > Use pkg-config to probe for alsa and pulseaudio. > > Signed-off-by: Gerd Hoffmann <kraxel@redhat.com> Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com> > --- > configure | 39 +++++++++++++-------------------------- > 1 file changed, 13 insertions(+), 26 deletions(-) > > diff --git a/configure b/configure > index 8f312ac3e2..5fcd0f4795 100755 > --- a/configure > +++ b/configure > @@ -3342,39 +3342,26 @@ fi > ########################################## > # Sound support libraries probe > > -audio_drv_probe() > -{ > - drv=$1 > - hdr=$2 > - lib=$3 > - exp=$4 > - cfl=$5 > - cat > $TMPC << EOF > -#include <$hdr> > -int main(void) { $exp } > -EOF > - if compile_prog "$cfl" "$lib" ; then > - : > - else > - error_exit "$drv check failed" \ > - "Make sure to have the $drv libs and headers installed." > - fi > -} > - > audio_drv_list=$(echo "$audio_drv_list" | sed -e 's/,/ /g') > for drv in $audio_drv_list; do > case $drv in > alsa) > - audio_drv_probe $drv alsa/asoundlib.h -lasound \ > - "return snd_pcm_close((snd_pcm_t *)0);" > - alsa_libs="-lasound" > + if $pkg_config alsa --exists; then > + alsa_libs=$($pkg_config alsa --libs) > + else > + error_exit "$drv check failed" \ > + "Make sure to have the $drv libs and headers installed." > + fi > ;; > > pa) > - audio_drv_probe $drv pulse/pulseaudio.h "-lpulse" \ > - "pa_context_set_source_output_volume(NULL, 0, NULL, NULL, NULL); return 0;" > - pulse_libs="-lpulse" > - audio_pt_int="yes" > + if $pkg_config libpulse --exists; then > + pulse_libs=$($pkg_config libpulse --libs) > + audio_pt_int="yes" > + else > + error_exit "$drv check failed" \ > + "Make sure to have the $drv libs and headers installed." > + fi > ;; > > sdl) >
diff --git a/configure b/configure index 8f312ac3e2..5fcd0f4795 100755 --- a/configure +++ b/configure @@ -3342,39 +3342,26 @@ fi ########################################## # Sound support libraries probe -audio_drv_probe() -{ - drv=$1 - hdr=$2 - lib=$3 - exp=$4 - cfl=$5 - cat > $TMPC << EOF -#include <$hdr> -int main(void) { $exp } -EOF - if compile_prog "$cfl" "$lib" ; then - : - else - error_exit "$drv check failed" \ - "Make sure to have the $drv libs and headers installed." - fi -} - audio_drv_list=$(echo "$audio_drv_list" | sed -e 's/,/ /g') for drv in $audio_drv_list; do case $drv in alsa) - audio_drv_probe $drv alsa/asoundlib.h -lasound \ - "return snd_pcm_close((snd_pcm_t *)0);" - alsa_libs="-lasound" + if $pkg_config alsa --exists; then + alsa_libs=$($pkg_config alsa --libs) + else + error_exit "$drv check failed" \ + "Make sure to have the $drv libs and headers installed." + fi ;; pa) - audio_drv_probe $drv pulse/pulseaudio.h "-lpulse" \ - "pa_context_set_source_output_volume(NULL, 0, NULL, NULL, NULL); return 0;" - pulse_libs="-lpulse" - audio_pt_int="yes" + if $pkg_config libpulse --exists; then + pulse_libs=$($pkg_config libpulse --libs) + audio_pt_int="yes" + else + error_exit "$drv check failed" \ + "Make sure to have the $drv libs and headers installed." + fi ;; sdl)
Use pkg-config to probe for alsa and pulseaudio. Signed-off-by: Gerd Hoffmann <kraxel@redhat.com> --- configure | 39 +++++++++++++-------------------------- 1 file changed, 13 insertions(+), 26 deletions(-)