put the newline in the right place

[disorder] / configure.ac

diff --git a/configure.ac b/configure.ac
index f328610ee3faa37976cb4aff00ba0137d4ae995a..b022b465a3ded3112f212a8040749036723a8b81 100644 (file)
--- 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
 
@@ -64,7 +64,7 @@ AC_ARG_WITH([python],
                            [do not build Python support])],
            [want_python=$withval])
 
-subdirs="scripts lib clients doc examples debian"
+subdirs="scripts lib clients doc examples debian tests"
 
 if test $want_server = yes; then
   subdirs="${subdirs} server plugins driver templates sounds images"
@@ -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
 
@@ -206,6 +199,7 @@ fi
 AC_C_CONST
 AC_TYPE_SIZE_T
 AC_C_INLINE
+AC_C_BIGENDIAN
 AC_CHECK_TYPES([struct sockaddr_in6],,,[AC_INCLUDES_DEFAULT
 #include <netinet/in.h>])
 
@@ -349,7 +343,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 +355,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"
@@ -400,5 +394,6 @@ AC_CONFIG_FILES([Makefile
                 debian/Makefile
                 sounds/Makefile
                 python/Makefile
-                examples/Makefile])
+                examples/Makefile
+                tests/Makefile])
 AC_OUTPUT