From f48823181b5c62c5c7c49e9ec6f0b1e9637c04b8 Mon Sep 17 00:00:00 2001 From: Brad Smith Date: Thu, 29 Sep 2022 20:31:20 -0400 Subject: [PATCH] Use the pkg-config file when checking for sndio. --- cmake/sdlchecks.cmake | 8 +++----- configure.ac | 15 ++------------- 2 files changed, 5 insertions(+), 18 deletions(-) diff --git a/cmake/sdlchecks.cmake b/cmake/sdlchecks.cmake index 040029db7..0043ed60e 100644 --- a/cmake/sdlchecks.cmake +++ b/cmake/sdlchecks.cmake @@ -293,16 +293,14 @@ macro(CheckNAS) endmacro() # Requires: -# - n/a +# - PkgCheckModules # Optional: # - SDL_SNDIO_SHARED opt # - HAVE_SDL_LOADSO opt macro(CheckSNDIO) if(SDL_SNDIO) - # TODO: set include paths properly, so the sndio headers are found - check_include_file(sndio.h HAVE_SNDIO_H) - find_library(D_SNDIO_LIB sndio) - if(HAVE_SNDIO_H AND D_SNDIO_LIB) + pkg_check_modules(PKG_SNDIO sndio) + if(PKG_SNDIO_FOUND) set(HAVE_SNDIO TRUE) file(GLOB SNDIO_SOURCES ${SDL2_SOURCE_DIR}/src/audio/sndio/*.c) list(APPEND SOURCE_FILES ${SNDIO_SOURCES}) diff --git a/configure.ac b/configure.ac index 42ae7ab8c..61f01047d 100644 --- a/configure.ac +++ b/configure.ac @@ -1288,20 +1288,9 @@ CheckSNDIO() [AS_HELP_STRING([--enable-sndio], [support the sndio audio API [default=yes]])], , enable_sndio=yes) if test x$enable_audio = xyes -a x$enable_sndio = xyes; then - AC_CHECK_HEADER(sndio.h, have_sndio_hdr=yes) - AC_CHECK_LIB(sndio, sio_open, have_sndio_lib=yes) + PKG_CHECK_MODULES([SNDIO], [sndio], audio_sndio=yes, audio_sndio=no) - AC_MSG_CHECKING(for sndio audio support) - have_sndio=no - - if test x$have_sndio_hdr = xyes -a x$have_sndio_lib = xyes; then - have_sndio=yes - SNDIO_LIBS="-lsndio" - fi - - AC_MSG_RESULT($have_sndio) - - if test x$have_sndio = xyes; then + if test x$audio_sndio = xyes; then AC_ARG_ENABLE(sndio-shared, [AS_HELP_STRING([--enable-sndio-shared], [dynamically load sndio audio support [default=yes]])], , enable_sndio_shared=yes)