e1lama/stk
1
0
Fork 0
mirror of https://github.com/thestk/stk synced 2026-02-07 09:46:16 +00:00
Code Issues Packages Projects Releases Wiki Activity

Don't check all libraries, use AS_IF.

Browse Source 
Configure was checking for ALSA even if --without-alsa provided.

Fix AC_ARG_WITH usage to be like the manual suggests:
https://autotools.io/autoconf/arguments.html
This commit is contained in:
Stephen Sinclair
2017-08-22 17:04:10 -03:00
parent 3e103671d9
commit 05230b11d5
1 changed files with 30 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

52
configure.ac
View File

@@ -128,83 +128,91 @@ if test $realtime = yes; then
AC_MSG_CHECKING(for audio API) AC_MSG_CHECKING(for audio API)
case $host in case $host in
*-*-linux*) *-*-linux*)
AC_ARG_WITH(jack, [ --with-jack = choose JACK server support (mac and linux only)], [ AC_ARG_WITH(jack, [ --with-jack = choose JACK server support (mac and linux only)])
AS_IF([test "x$with_jack" == "xyes"], [
api="$api -D__UNIX_JACK__" api="$api -D__UNIX_JACK__"
AC_MSG_RESULT(using JACK) AC_MSG_RESULT(using JACK)
AC_CHECK_LIB(jack, jack_client_open, , AC_MSG_ERROR(JACK support requires the jack library!))], ) AC_CHECK_LIB(jack, jack_client_open, , AC_MSG_ERROR(JACK support requires the jack library!))])
# Look for ALSA flag # Look for ALSA flag
AC_ARG_WITH(alsa, [ --with-alsa = choose native ALSA API support (linux only)], [ AC_ARG_WITH(alsa, [ --with-alsa = choose native ALSA API support (linux only)])
AS_IF([test "x$with_alsa" == "xyes"], [
api="$api -D__LINUX_ALSA__" api="$api -D__LINUX_ALSA__"
AC_MSG_RESULT(using ALSA) AC_MSG_RESULT(using ALSA)
AC_CHECK_LIB(asound, snd_pcm_open, , AC_MSG_ERROR(ALSA support requires the asound library!))], ) AC_CHECK_LIB(asound, snd_pcm_open, , AC_MSG_ERROR(ALSA support requires the asound library!))])
# Look for OSS flag # Look for OSS flag
AC_ARG_WITH(oss, [ --with-oss = choose OSS API support (linux only)], [ AC_ARG_WITH(oss, [ --with-oss = choose OSS API support (linux only)])
AS_IF([test "x$with_oss" == "xyes"], [
api="$api -D__LINUX_OSS__ -D__LINUX_ALSA__" api="$api -D__LINUX_OSS__ -D__LINUX_ALSA__"
AC_MSG_RESULT(using OSS) AC_MSG_RESULT(using OSS)
AC_CHECK_LIB(asound, snd_pcm_open, , AC_MSG_ERROR(OSS support requires ALSA for RtMidi!))], ) AC_CHECK_LIB(asound, snd_pcm_open, , AC_MSG_ERROR(OSS support requires ALSA for RtMidi!))])
# If no audio api flags specified, use ALSA # If no audio api flags specified, use ALSA
if [test "$api" == "";] then AS_IF([test "$api" == ""], [
AC_MSG_RESULT(using ALSA) AC_MSG_RESULT(using ALSA)
AC_SUBST( api, [-D__LINUX_ALSA__] ) AC_SUBST( api, [-D__LINUX_ALSA__] )
AC_CHECK_LIB(asound, snd_pcm_open, , AC_MSG_ERROR(ALSA support requires the asound library!)) AC_CHECK_LIB(asound, snd_pcm_open, , AC_MSG_ERROR(ALSA support requires the asound library!))
fi ])
AC_CHECK_LIB(pthread, pthread_create, , AC_MSG_ERROR(RtAudio requires the pthread library!)) AC_CHECK_LIB(pthread, pthread_create, , AC_MSG_ERROR(RtAudio requires the pthread library!))
;; ;;
*-apple*) *-apple*)
AC_ARG_WITH(jack, [ --with-jack = choose JACK server support (unix only)], [ AC_ARG_WITH(jack, [ --with-jack = choose JACK server support (unix only)])
AS_IF([test "x$with_jack" == "xyes"], [
api="$api -D__UNIX_JACK__" api="$api -D__UNIX_JACK__"
AC_MSG_RESULT(using JACK) AC_MSG_RESULT(using JACK)
AC_CHECK_LIB(jack, jack_client_new, , AC_MSG_ERROR(JACK support requires the jack library!))], ) AC_CHECK_LIB(jack, jack_client_new, , AC_MSG_ERROR(JACK support requires the jack library!))])
# Look for Core flag # Look for Core flag
AC_ARG_WITH(core, [ --with-core = choose CoreAudio API support (mac only)], [ AC_ARG_WITH(core, [ --with-core = choose CoreAudio API support (mac only)])
AS_IF([test "x$with_core" == "xyes"], [
api="$api -D__MACOSX_CORE__" api="$api -D__MACOSX_CORE__"
AC_MSG_RESULT(using CoreAudio) AC_MSG_RESULT(using CoreAudio)
AC_CHECK_HEADER(CoreAudio/CoreAudio.h, [], [AC_MSG_ERROR(CoreAudio header files not found!)] ) AC_CHECK_HEADER(CoreAudio/CoreAudio.h, [], [AC_MSG_ERROR(CoreAudio header files not found!)] )
LIBS="$LIBS -framework CoreAudio -framework CoreFoundation -framework CoreMIDI" ], ) LIBS="$LIBS -framework CoreAudio -framework CoreFoundation -framework CoreMIDI" ])
# If no audio api flags specified, use CoreAudio # If no audio api flags specified, use CoreAudio
if [test "$api" == ""; ] then AS_IF([test "$api" == ""], [
AC_SUBST( api, [-D__MACOSX_CORE__] ) AC_SUBST( api, [-D__MACOSX_CORE__] )
AC_MSG_RESULT(using CoreAudio) AC_MSG_RESULT(using CoreAudio)
AC_CHECK_HEADER(CoreAudio/CoreAudio.h, AC_CHECK_HEADER(CoreAudio/CoreAudio.h,
[], [],
[AC_MSG_ERROR(CoreAudio header files not found!)] ) [AC_MSG_ERROR(CoreAudio header files not found!)] )
AC_SUBST( LIBS, ["-framework CoreAudio -framework CoreFoundation -framework CoreMIDI"] ) AC_SUBST( LIBS, ["-framework CoreAudio -framework CoreFoundation -framework CoreMIDI"] )
fi ])
AC_CHECK_LIB(pthread, pthread_create, , AC_MSG_ERROR(RtAudio requires the pthread library!)) AC_CHECK_LIB(pthread, pthread_create, , AC_MSG_ERROR(RtAudio requires the pthread library!))
;; ;;
*-mingw32*) *-mingw32*)
AC_ARG_WITH(asio, [ --with-asio = choose ASIO API support (windoze only)], [ AC_ARG_WITH(asio, [ --with-asio = choose ASIO API support (windoze only)])
AS_IF([test "x$with_asio" == "xyes"], [
api="$api -D__WINDOWS_ASIO__" api="$api -D__WINDOWS_ASIO__"
AC_MSG_RESULT(using ASIO) AC_MSG_RESULT(using ASIO)
AC_SUBST( objects, ["asio.o asiodrivers.o asiolist.o iasiothiscallresolver.o"] ) ], ) AC_SUBST( objects, ["asio.o asiodrivers.o asiolist.o iasiothiscallresolver.o"] ) ])
# Look for DirectSound flag # Look for DirectSound flag
AC_ARG_WITH(ds, [ --with-ds = choose DirectSound API support (windoze only)], [ AC_ARG_WITH(ds, [ --with-ds = choose DirectSound API support (windoze only)])
AS_IF([test "x$with_ds" == "xyes"], [
api="$api -D__WINDOWS_DS__" api="$api -D__WINDOWS_DS__"
AC_MSG_RESULT(using DirectSound) AC_MSG_RESULT(using DirectSound)
LIBS="-ldsound $LIBS" ], ) LIBS="-ldsound $LIBS" ])
# Look for WASAPI flag # Look for WASAPI flag
AC_ARG_WITH(wasapi, [ --with-wasapi = choose Windows Audio Session API support (windoze only)], [ AC_ARG_WITH(wasapi, [ --with-wasapi = choose Windows Audio Session API support (windoze only)])
AS_IF([test "x$with_wasapi" == "xyes"], [
api="$api -D__WINDOWS_WASAPI__" api="$api -D__WINDOWS_WASAPI__"
AC_MSG_RESULT(using WASAPI) AC_MSG_RESULT(using WASAPI)
LIBS="-luuid -lksuser $LIBS" ], ) LIBS="-luuid -lksuser $LIBS" ])
# If no audio api flags specified, use DirectSound # If no audio api flags specified, use DirectSound
if [test "$api" == "";] then AS_IF([test "$api" == ""], [
AC_SUBST( api, [-D__WINDOWS_DS__] ) AC_SUBST( api, [-D__WINDOWS_DS__] )
AC_MSG_RESULT(using DirectSound) AC_MSG_RESULT(using DirectSound)
LIBS="-ldsound -lwinmm $LIBS" LIBS="-ldsound -lwinmm $LIBS"
fi ])
api="$api -D__WINDOWS_MM__" api="$api -D__WINDOWS_MM__"
LIBS="-lole32 -lwinmm -lwsock32 $LIBS" LIBS="-lole32 -lwinmm -lwsock32 $LIBS"