X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~mdw/git/disorder/blobdiff_plain/dea8f8aa43006bce1daf71893b65585d201a43ff..8023f60b5faf0e0f48c71d13c2f1319daff7871b:/configure.ac

diff --git a/configure.ac b/configure.ac
index f328610..6a393e5 100644
--- a/configure.ac
+++ b/configure.ac
@@ -19,9 +19,9 @@
 # USA
 #
 
-AC_INIT(disorder, 1.5.1+, richard+disorder@sfere.greenend.org.uk)
+AC_INIT(disorder, 1.5.99+, richard+disorder@sfere.greenend.org.uk)
 AC_CONFIG_AUX_DIR([config.aux])
-AM_INIT_AUTOMAKE(disorder, 1.5.1+)
+AM_INIT_AUTOMAKE(disorder, 1.5.99+)
 AC_CONFIG_SRCDIR([server/disorderd.c])
 AM_CONFIG_HEADER([config.h])
 
@@ -35,10 +35,10 @@ want_python=yes
 
 case "$host" in
 *linux* | *Linux* )
-  want_speaker=yes
+  want_alsa=yes
   ;;
 * )
-  want_speaker=no
+  want_alsa=no
   ;;
 esac
 
@@ -134,18 +134,11 @@ if test $want_server = yes; then
   AC_CHECK_LIB([ao], [ao_initialize],
 	       [AC_SUBST(LIBAO,[-lao])],
 	       [missing_libraries="$missing_libraries libao"])
-  if test $want_speaker = yes; then
-    case "$host" in
-    *linux* | *Linux* )
-      AC_CHECK_LIB([asound], [snd_pcm_open],
-		   [AC_SUBST(LIBASOUND,[-lasound])],
-		   [missing_libraries="$missing_libraries libasound"])
-      AC_DEFINE([BUILD_SPEAKER],[disorder-speaker],[define to build the speaker subprocess])
-      ;;
-    * )
-      AC_MSG_ERROR([want to build speaker for unknown sound API])
-      ;;
-    esac
+  if test $want_alsa = yes; then
+    AC_CHECK_LIB([asound], [snd_pcm_open],
+		 [AC_SUBST(LIBASOUND,[-lasound])],
+		 [missing_libraries="$missing_libraries libasound"])
+    AC_DEFINE([API_ALSA],[1],[define to use the ALSA API])
   fi
 fi
 
@@ -349,7 +342,7 @@ if test "x$GCC" = xyes; then
   CC="${CC} $gcc_werror"
 
   # for older GCCs that don't know %ju (etc)
-  AC_CACHE_CHECK([checking whether -Wno-format is required],
+  AC_CACHE_CHECK([whether -Wno-format is required],
 		 rjk_cv_noformat,
 		 AC_TRY_COMPILE([#include <stdio.h>
 #include <stdint.h>
@@ -361,7 +354,7 @@ if test "x$GCC" = xyes; then
     CC="${CC} -Wno-format"
   fi
 
-  AC_CACHE_CHECK([checking whether -Wshadow is OK],
+  AC_CACHE_CHECK([whether -Wshadow is OK],
 		 rjk_cv_shadow,
                  oldCC="${CC}"
 		 CC="${CC} -Wshadow"