Conditionally build asio sources

afaict, the current code wouldn't work at all (defining an unused 'objects'
Makefile-variable).

diff --git a/Makefile.am b/Makefile.am
index d4fa5388361718af0886ece6673a008067f99564..94c8c4957afbbfa4959eadf3a942d3993a2a9a19 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -9,6 +9,14 @@ lib_LTLIBRARIES = %D%/librtaudio.la
   %D%/RtAudio.cpp \
   %D%/rtaudio_c.cpp
 
+if ASIO
+%C%_librtaudio_la_SOURCES += \
+       asio.cpp \
+       asiodrivers.cpp \
+       asiolist.cpp \
+       iasiothiscallresolver.cpp
+endif
+
 rtaudio_incdir = $(includedir)/rtaudio
 rtaudio_inc_HEADERS = \
   %D%/RtAudio.h \

diff --git a/configure.ac b/configure.ac
index b8ba18d9b776a25409153dec7814b81b06ad387a..0bdec71fdf5c3725108508608fb654564cb7d7fa 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -32,6 +32,8 @@ AC_SUBST(req)
 
 api=""
 req=""
+use_asio=""
+
 
 # configure flags
 AC_ARG_ENABLE(debug, [AS_HELP_STRING([--enable-debug],[enable various debug output])])
@@ -235,7 +237,7 @@ AS_CASE([$host],
   AS_IF([test "x$with_asio" = "xyes" ], [
     AC_MSG_RESULT(using ASIO)
     api="$api -D__WINDOWS_ASIO__"
-    AC_SUBST( objects, ["asio.o asiodrivers.o asiolist.o iasiothiscallresolver.o"] )
+    use_asio=yes
   ])
   # Look for DirectSound flag
   AS_IF([test "x$with_ds" = "xyes" ], [
@@ -262,6 +264,8 @@ AS_CASE([$host],
   ]
 )
 
+AM_CONDITIONAL( ASIO, [test "x${use_asio}" = "xyes" ])
+
 CPPFLAGS="$CPPFLAGS $api"
 
 AC_OUTPUT