disobedience more robust against server restart

[disorder] / configure.ac

diff --git a/configure.ac b/configure.ac
index 08139f6b792442930788dfb91496eada19cd0320..7bf4ebfe676c8222c138081a703350987e195bb2 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -1,7 +1,7 @@
 # Process this file with autoconf to produce a configure script.
 #
 # This file is part of DisOrder.
-# Copyright (C) 2004, 2005, 2006 Richard Kettlewell
+# Copyright (C) 2004, 2005, 2006, 2007 Richard Kettlewell
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -19,17 +19,29 @@
 # 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])
 
+# Find host type
+AC_CANONICAL_HOST
+
 # What we want to build
 want_server=yes
 want_gtk=yes
 want_python=yes
 
+case "$host" in
+*linux* | *Linux* )
+  want_alsa=yes
+  ;;
+* )
+  want_alsa=no
+  ;;
+esac
+
 # Checks for programs.
 AC_PROG_CC
 AC_SET_MAKE
@@ -122,9 +134,12 @@ if test $want_server = yes; then
   AC_CHECK_LIB([ao], [ao_initialize],
               [AC_SUBST(LIBAO,[-lao])],
               [missing_libraries="$missing_libraries libao"])
-  AC_CHECK_LIB([asound], [snd_pcm_open],
-              [AC_SUBST(LIBASOUND,[-lasound])],
-              [missing_libraries="$missing_libraries libasound"])
+  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
 
 if test $want_gtk = yes; then
@@ -184,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>])
 
@@ -327,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>
@@ -339,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"