Various configure changes for MinGW (gps).

[rtaudio.git] / configure.ac

diff --git a/configure.ac b/configure.ac
index e0fac8b2b82eff2fb9946a9a74888da4ec3162fe..5949a5e0884a901d32f1f76863e737be0af59264 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -15,11 +15,6 @@ if [[ $AR = "no" ]] ; then
     AC_MSG_ERROR("Could not find ar - needed to create a library");
 fi
 
-# Checks for libraries.
-AC_CHECK_LIB(pthread, pthread_create, , AC_MSG_ERROR(RtAudio requires the pthread library!))
-
-
-
 # Checks for header files.
 AC_HEADER_STDC
 AC_CHECK_HEADERS(sys/ioctl.h unistd.h)
@@ -51,6 +46,7 @@ case $host in
     AC_MSG_RESULT(using OSS)
     AC_SUBST( audio_apis, [-D__LINUX_OSS__] )
     cflags=$cflags" -lossaudio"
+    AC_CHECK_LIB(pthread, pthread_create, , AC_MSG_ERROR(RtAudio requires the pthread library!))
   ;;
 
   *-*-linux*)
@@ -64,7 +60,7 @@ case $host in
     audio_apis="-D__UNIX_JACK__"
   fi
 
-  # Look for Alsa flag
+  # Look for ALSA flag
   AC_ARG_WITH(alsa, [  --with-alsa = choose native ALSA API support (linux only)], [AC_SUBST( sound_api, [-D__LINUX_ALSA__] ) AC_MSG_RESULT(using ALSA)], )
   if [test $sound_api = -D__LINUX_ALSA__;] then
     AC_CHECK_LIB(asound, snd_pcm_open, , AC_MSG_ERROR(ALSA support requires the asound library!))
@@ -77,12 +73,14 @@ case $host in
     audio_apis="-D__LINUX_OSS__ $audio_apis"
   fi
 
-  # If no audio api flags specified, use OSS
+  # If no audio api flags specified, use ALSA
   if [test $sound_api = _NO_API_;] then
-    AC_SUBST( sound_api, [-D__LINUX_OSS__] )
-    AC_MSG_RESULT(using OSS)
-    AC_SUBST( audio_apis, [-D__LINUX_OSS__] )
+    AC_MSG_RESULT(using ALSA)
+    AC_SUBST( audio_apis, [-D__LINUX_ALSA__] )
+    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!))
   ;;
 
   *-apple*)
@@ -110,13 +108,16 @@ case $host in
       [AC_MSG_ERROR(CoreAudio header files not found!)] )
     AC_SUBST( frameworks, ["-framework CoreAudio -framework CoreFoundation"] )
   fi
+
+  AC_CHECK_LIB(pthread, pthread_create, , AC_MSG_ERROR(RtAudio requires the pthread library!))
   ;;
 
   *-mingw32*)
   AC_SUBST( sound_api, [_NO_API_] )
   AC_ARG_WITH(asio, [  --with-asio = choose ASIO API support (windoze only)], [AC_SUBST( sound_api, [-D__WINDOWS_ASIO__] ) AC_MSG_RESULT(using ASIO)], )
-  if [test $sound_api = -D__UNIX_ASIO__;] then
+  if [test $sound_api = -D__WINDOWS_ASIO__;] then
     audio_apis="-D__WINDOWS_ASIO__"
+    AC_SUBST( objects, ["asio.o asiodrivers.o asiolist.o iasiothiscallresolver.o"] )
   fi
 
   # Look for DirectSound flag
@@ -133,6 +134,8 @@ case $host in
     audio_apis="-D__WINDOWS_DS__"
     LIBS="-ldsound -lwinmm $LIBS"
   fi
+
+  LIBS="-lole32 $LIBS"
   ;;
 
   *)