Use users.db. trackdb* moves to lib/, as it's now used by client.c to

[disorder] / configure.ac

diff --git a/configure.ac b/configure.ac
index af15c83ec8229eb742ea04bc6c641ca9666ba58d..9e353f8c0d4f97565a0b58619a589ed1bd1699da 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -2,6 +2,7 @@
 #
 # This file is part of DisOrder.
 # Copyright (C) 2004, 2005, 2006, 2007 Richard Kettlewell
 #
 # This file is part of DisOrder.
 # Copyright (C) 2004, 2005, 2006, 2007 Richard Kettlewell

+# Portions copyright (C) 2007 Ross Younger

 #
 # 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
 #
 # 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,9 +20,9 @@
 # USA
 #
 
 # USA
 #
 

-AC_INIT(disorder, 1.5.99+, richard+disorder@sfere.greenend.org.uk)
+AC_INIT([disorder], [2.0+], [richard+disorder@sfere.greenend.org.uk])

 AC_CONFIG_AUX_DIR([config.aux])
 AC_CONFIG_AUX_DIR([config.aux])

-AM_INIT_AUTOMAKE(disorder, 1.5.99+)
+AM_INIT_AUTOMAKE(disorder, [2.0+])

 AC_CONFIG_SRCDIR([server/disorderd.c])
 AM_CONFIG_HEADER([config.h])
 
 AC_CONFIG_SRCDIR([server/disorderd.c])
 AM_CONFIG_HEADER([config.h])
 


@@ -29,32 +30,83 @@ AM_CONFIG_HEADER([config.h])
 AC_CANONICAL_HOST
 
 # What we want to build
 AC_CANONICAL_HOST
 
 # What we want to build

-want_server=yes

 want_gtk=yes
 want_python=yes
 
 want_gtk=yes
 want_python=yes
 

+# APIs we want
+want_alsa=yes
+want_oss=yes
+want_coreaudio=yes
+
+# Checks for programs.
+AC_PROG_CC
+AC_SET_MAKE
+if test "x$GCC" = xyes; then
+  gcc_werror=-Werror
+else
+  gcc_werror=""
+fi
+
+AC_ARG_WITH([alsa],
+           [AS_HELP_STRING([--without-alsa],
+                           [do not build with ALSA support])],
+           [want_alsa=$withval])
+AC_ARG_WITH([oss],
+           [AS_HELP_STRING([--without-oss],
+                           [do not build with OSS support])],
+           [want_oss=$withval])
+AC_ARG_WITH([coreaudio],
+           [AS_HELP_STRING([--without-coreaudio],
+                           [do not build with Core Audio support])],
+           [want_coreaudio=$withval])
+
+AC_MSG_CHECKING([for a known target platform])

 case "$host" in
 case "$host" in

+*empeg* )
+  AC_MSG_RESULT([empeg car stereo])
+  AC_DEFINE([EMPEG_HOST],[1],[define if host is an empeg car stereo])
+  # work around broken toolchain
+  AC_CHECK_LIB([gpg-error], [gpg_strerror])
+  AC_CHECK_LIB([pthread], [pthread_create])
+  want_server=no
+ ;;

 *linux* | *Linux* )
 *linux* | *Linux* )

-  want_alsa=yes
+  AC_MSG_RESULT([Linux])
+  want_server=yes

   ;;
 *-apple-darwin* )
   ;;
 *-apple-darwin* )

-  want_alsa=no
-  COREAUDIO="-framework CoreAudio"
+  AC_MSG_RESULT([Mac OS X])
+  want_server=yes
+  if test $want_coreaudio = yes; then
+    COREAUDIO="-framework CoreAudio"
+  fi
+  browser=open

   ;;
 * )
   ;;
 * )

-  want_alsa=no
+  AC_MSG_RESULT([unknown, winging it])
+  want_server=no

   ;;
 esac
 AC_SUBST([COREAUDIO])
 
   ;;
 esac
 AC_SUBST([COREAUDIO])
 

-# Checks for programs.
-AC_PROG_CC
-AC_SET_MAKE
-if test "x$GCC" = xyes; then
-  gcc_werror=-Werror
-else
-  gcc_werror=""
+AC_ARG_WITH([browser],
+            [AS_HELP_STRING([--with-browser=BROWSER],
+                           [use BROWSER to display HTML])],
+            [browser=$withval])
+
+AC_CACHE_CHECK([default HTML viewer],[rjk_cv_browser],[
+  rjk_cv_browser=UNKNOWN
+  for candidate in x-www-browser firefox mozilla konqueror netscape; do
+    if type $candidate >/dev/null 2>&1; then
+      rjk_cv_browser="$candidate"
+      break
+    fi
+  done
+])
+if test -z "$browser"; then
+  browser="$rjk_cv_browser"

 fi
 fi

+AC_DEFINE_UNQUOTED([BROWSER],["$browser"],[HTML viewer])

 
 AC_ARG_WITH([server],
            [AS_HELP_STRING([--without-server],
 
 AC_ARG_WITH([server],
            [AS_HELP_STRING([--without-server],


@@ -74,17 +126,16 @@ subdirs="scripts lib clients doc examples debian"
 if test $want_server = yes; then
   subdirs="${subdirs} server plugins driver templates sounds images"
 fi
 if test $want_server = yes; then
   subdirs="${subdirs} server plugins driver templates sounds images"
 fi

-if test $want_python = yes; then
-  AM_PATH_PYTHON
-  subdirs="${subdirs} python"
-fi

 if test $want_gtk = yes; then
   subdirs="${subdirs} disobedience"
   if test $want_server = no; then
     subdirs="${subdirs} images"
   fi
 fi
 if test $want_gtk = yes; then
   subdirs="${subdirs} disobedience"
   if test $want_server = no; then
     subdirs="${subdirs} images"
   fi
 fi

-subdirs="${subdirs} tests"
+if test $want_python = yes; then
+  AM_PATH_PYTHON([2.4])
+  subdirs="${subdirs} python tests"
+fi

 AC_SUBST([subdirs])
 
 # libtool config
 AC_SUBST([subdirs])
 
 # libtool config


@@ -105,6 +156,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$,,'`"
   ])
   AC_CACHE_CHECK([fink install directory],[rjk_cv_finkprefix],[
     rjk_cv_finkprefix="`echo "$FINK" | sed 's,/bin/fink$,,'`"
   ])

+  finkdir="${rjk_cv_finkprefix}"

   finkbindir="${rjk_cv_finkprefix}/bin"
   CPPFLAGS="${CPPFLAGS} -I${rjk_cv_finkprefix}/include/gc -I${rjk_cv_finkprefix}/include"
   if test $want_server = yes; then
   finkbindir="${rjk_cv_finkprefix}/bin"
   CPPFLAGS="${CPPFLAGS} -I${rjk_cv_finkprefix}/include/gc -I${rjk_cv_finkprefix}/include"
   if test $want_server = yes; then


@@ -114,6 +166,7 @@ if test "x$FINK" != xnone; then
 else
   finkbindir=""
 fi
 else
   finkbindir=""
 fi

+AC_SUBST([finkdir])

 AC_SUBST([finkbindir])
 
 # Checks for libraries.
 AC_SUBST([finkbindir])
 
 # Checks for libraries.


@@ -127,6 +180,10 @@ AC_CHECK_LIB(gcrypt, gcry_md_open,
 AC_CHECK_LIB(pcre, pcre_compile,
             [AC_SUBST(LIBPCRE,[-lpcre])],
             [missing_libraries="$missing_libraries libpcre"])
 AC_CHECK_LIB(pcre, pcre_compile,
             [AC_SUBST(LIBPCRE,[-lpcre])],
             [missing_libraries="$missing_libraries libpcre"])

+if test $want_alsa = yes; then
+  AC_CHECK_LIB([asound], [snd_pcm_open],
+               [AC_SUBST(LIBASOUND,[-lasound])])
+fi

 if test $want_server = yes; then
   RJK_CHECK_LIB(db, db_create, [#include <db.h>],
               [AC_SUBST(LIBDB,[-ldb])],
 if test $want_server = yes; then
   RJK_CHECK_LIB(db, db_create, [#include <db.h>],
               [AC_SUBST(LIBDB,[-ldb])],


@@ -148,12 +205,6 @@ if test $want_server = yes; then
               [AC_SUBST(LIBFLAC,[-lFLAC])],
               [missing_libraries="$missing_libraries libFLAC"])
 fi
               [AC_SUBST(LIBFLAC,[-lFLAC])],
               [missing_libraries="$missing_libraries libFLAC"])
 fi

-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

 
 if test $want_gtk = yes; then
   AM_PATH_GLIB_2_0([],[],[missing_libraries="$missing_libraries libglib"])
 
 if test $want_gtk = yes; then
   AM_PATH_GLIB_2_0([],[],[missing_libraries="$missing_libraries libglib"])


@@ -187,15 +238,24 @@ RJK_REQUIRE_PCRE_UTF8([-lpcre])
 
 # Checks for header files.
 RJK_FIND_GC_H
 
 # Checks for header files.
 RJK_FIND_GC_H

-AC_CHECK_HEADERS([inttypes.h CoreAudio/AudioHardware.h])
+if test $want_oss = yes; then
+  AC_CHECK_HEADERS([sys/soundcard.h])
+fi
+if test $want_alsa = yes; then
+  AC_CHECK_HEADERS([alsa/asoundlib.h])
+fi
+if test $want_coreaudio = yes; then
+  AC_CHECK_HEADERS([CoreAudio/AudioHardware.h])
+fi
+AC_CHECK_HEADERS([inttypes.h])
+# We don't bother checking very standard stuff

 # Compilation will fail if any of these headers are missing, so we
 # check for them here and fail early.
 # Compilation will fail if any of these headers are missing, so we
 # check for them here and fail early.

-# We don't bother checking very standard stuff

 if test $want_server = yes; then
   AC_CHECK_HEADERS([db.h],[:],[
     missing_headers="$missing_headers $ac_header"
   ])
 if test $want_server = yes; then
   AC_CHECK_HEADERS([db.h],[:],[
     missing_headers="$missing_headers $ac_header"
   ])

-  AC_CHECK_HEADERS([sys/soundcard.h]) dnl can cope without
+  AC_CHECK_HEADERS([FLAC/file_decoder.h])

 fi
 AC_CHECK_HEADERS([dlfcn.h gcrypt.h \
                 getopt.h iconv.h langinfo.h \
 fi
 AC_CHECK_HEADERS([dlfcn.h gcrypt.h \
                 getopt.h iconv.h langinfo.h \


@@ -330,6 +390,28 @@ if test $want_server = yes; then
 fi
 
 if test "x$GCC" = xyes; then
 fi
 
 if test "x$GCC" = xyes; then

+  # http://gcc.gnu.org/bugzilla/show_bug.cgi?id=29478
+  AC_CACHE_CHECK([checking for GCC bug 29478],[rjk_cv_pr29478],[
+    old_CC="$CC"
+    if test $GCC = yes; then
+      CC="$CC -Wall -Werror"
+    fi
+    AC_COMPILE_IFELSE([
+      static int x(char *f) {
+       return *f;
+      }
+      int z(const char *g) {
+       return x((char *)g);
+      }],
+      [rjk_cv_pr29478=no],
+      [rjk_cv_pr29478=yes]
+    )
+    CC="$old_CC"
+  ])
+  if test $rjk_cv_pr29478 = yes; then
+    gcc_werror=''
+  fi
+

   # a reasonable default set of warnings
   CC="${CC} -Wall -W -Wpointer-arith -Wbad-function-cast \
        -Wwrite-strings -Wmissing-prototypes \
   # a reasonable default set of warnings
   CC="${CC} -Wall -W -Wpointer-arith -Wbad-function-cast \
        -Wwrite-strings -Wmissing-prototypes \


@@ -339,19 +421,21 @@ if test "x$GCC" = xyes; then
   GTK_CFLAGS="`echo \"$GTK_CFLAGS\"|sed 's/-I/-isystem /g'`"
   GLIB_CFLAGS="`echo \"$GLIB_CFLAGS\"|sed 's/-I/-isystem /g'`"
 
   GTK_CFLAGS="`echo \"$GTK_CFLAGS\"|sed 's/-I/-isystem /g'`"
   GLIB_CFLAGS="`echo \"$GLIB_CFLAGS\"|sed 's/-I/-isystem /g'`"
 

-  # GCC 2.95 doesn't know to ignore warnings from system headers
-  AC_CACHE_CHECK([whether -Werror is usable],
-                  rjk_cv_werror, [
-    save_CFLAGS="${CFLAGS}"
-    CFLAGS="${CFLAGS} ${GTK_CFLAGS} -Werror"
-    AC_TRY_COMPILE([#include <gtk/gtk.h>],
-                   [],
-                   [rjk_cv_werror=yes],
-                   [rjk_cv_werror=no])
-    CFLAGS="${save_CFLAGS}"
-  ])
-  if test $rjk_cv_werror = no; then
-    gcc_werror=''
+  if test "$gcc_werror" != ''; then
+    # GCC 2.95 doesn't know to ignore warnings from system headers
+    AC_CACHE_CHECK([whether -Werror is usable],
+                   rjk_cv_werror, [
+      save_CFLAGS="${CFLAGS}"
+      CFLAGS="${CFLAGS} ${GTK_CFLAGS} -Werror"
+      AC_TRY_COMPILE([#include <gtk/gtk.h>],
+                    [],
+                    [rjk_cv_werror=yes],
+                    [rjk_cv_werror=no])
+      CFLAGS="${save_CFLAGS}"
+    ])
+    if test $rjk_cv_werror = no; then
+      gcc_werror=''
+    fi

   fi
   CC="${CC} $gcc_werror"
 
   fi
   CC="${CC} $gcc_werror"
 


@@ -383,10 +467,10 @@ if test "x$GCC" = xyes; then
   if test $rjk_cv_shadow = yes; then
     CC="${CC} -Wshadow"
   fi
   if test $rjk_cv_shadow = yes; then
     CC="${CC} -Wshadow"
   fi

-                  
-

 fi
 
 fi
 

+RJK_GCOV
+

 AH_BOTTOM([#ifdef __GNUC__
 # define attribute(x) __attribute__(x)
 #else
 AH_BOTTOM([#ifdef __GNUC__
 # define attribute(x) __attribute__(x)
 #else


@@ -410,3 +494,10 @@ AC_CONFIG_FILES([Makefile
                 examples/Makefile
                 tests/Makefile])
 AC_OUTPUT
                 examples/Makefile
                 tests/Makefile])
 AC_OUTPUT

+
+if test $GCC = yes && test "$gcc_werror" = ''; then
+  AC_MSG_WARN([building without -Werror])
+fi
+if test $want_python = no; then
+  AC_MSG_WARN([cannot run the test suit without Python])
+fi