X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~mdw/git/disorder/blobdiff_plain/9a5f7abafbf07e97b1eae9d13041fe133554c195..1798e51d3e57936e9bf44d102bd68e4b7f759a0e:/configure.ac?ds=sidebyside

diff --git a/configure.ac b/configure.ac
index 72a0a96..c152c92 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
 
@@ -79,6 +79,7 @@ if test $want_gtk = yes; then
     subdirs="${subdirs} images"
   fi
 fi
+subdirs="${subdirs} tests"
 AC_SUBST([subdirs])
 
 # libtool config
@@ -99,7 +100,7 @@ if test "x$FINK" != xnone; then
   AC_CACHE_CHECK([fink install directory],[rjk_cv_finkprefix],[
     rjk_cv_finkprefix="`echo "$FINK" | sed 's,/bin/fink$,,'`"
   ])
-  CPPFLAGS="${CPPFLAGS} -I${rjk_cv_finkprefix}/include"
+  CPPFLAGS="${CPPFLAGS} -I${rjk_cv_finkprefix}/include/gc -I${rjk_cv_finkprefix}/include"
   if test $want_server = yes; then
     CPPFLAGS="${CPPFLAGS} -I${rjk_cv_finkprefix}/include/db4"
   fi
@@ -134,18 +135,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],[1],[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 +200,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>])
 
@@ -400,5 +395,6 @@ AC_CONFIG_FILES([Makefile
 		 debian/Makefile
 		 sounds/Makefile
 		 python/Makefile
-		 examples/Makefile])
+		 examples/Makefile
+		 tests/Makefile])
 AC_OUTPUT