~mdw
/
disorder
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
start refactoring speaker
[disorder]
/
configure.ac
diff --git
a/configure.ac
b/configure.ac
index
08139f6
..
0384893
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.
# 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
#
# 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,34
@@
# USA
#
# 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])
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])
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
# What we want to build
want_server=yes
want_gtk=yes
want_python=yes
+case "$host" in
+*linux* | *Linux* )
+ want_alsa=yes
+ ;;
+*-apple-darwin* )
+ want_alsa=no
+ COREAUDIO="-framework CoreAudio"
+ ;;
+* )
+ want_alsa=no
+ ;;
+esac
+AC_SUBST([COREAUDIO])
+
# Checks for programs.
AC_PROG_CC
AC_SET_MAKE
# Checks for programs.
AC_PROG_CC
AC_SET_MAKE
@@
-67,6
+84,7
@@
if test $want_gtk = yes; then
subdirs="${subdirs} images"
fi
fi
subdirs="${subdirs} images"
fi
fi
+subdirs="${subdirs} tests"
AC_SUBST([subdirs])
# libtool config
AC_SUBST([subdirs])
# libtool config
@@
-87,12
+105,16
@@
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$,,'`"
])
- CPPFLAGS="${CPPFLAGS} -I${rjk_cv_finkprefix}/include"
+ finkbindir="${rjk_cv_finkprefix}/bin"
+ 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
LDFLAGS="${LDFLAGS} -L${rjk_cv_finkprefix}/lib"
if test $want_server = yes; then
CPPFLAGS="${CPPFLAGS} -I${rjk_cv_finkprefix}/include/db4"
fi
LDFLAGS="${LDFLAGS} -L${rjk_cv_finkprefix}/lib"
+else
+ finkbindir=""
fi
fi
+AC_SUBST([finkbindir])
# Checks for libraries.
# We save up a list of missing libraries that we can't do without
# Checks for libraries.
# We save up a list of missing libraries that we can't do without
@@
-122,9
+144,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([ao], [ao_initialize],
[AC_SUBST(LIBAO,[-lao])],
[missing_libraries="$missing_libraries libao"])
+fi
+if test $want_alsa = yes; then
AC_CHECK_LIB([asound], [snd_pcm_open],
AC_CHECK_LIB([asound], [snd_pcm_open],
- [AC_SUBST(LIBASOUND,[-lasound])],
+
[AC_SUBST(LIBASOUND,[-lasound])],
[missing_libraries="$missing_libraries libasound"])
[missing_libraries="$missing_libraries libasound"])
+ AC_DEFINE([API_ALSA],[1],[define to use the ALSA API])
fi
if test $want_gtk = yes; then
fi
if test $want_gtk = yes; then
@@
-159,7
+184,7
@@
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])
+AC_CHECK_HEADERS([inttypes.h
CoreAudio/AudioHardware.h
])
# 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
# 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
@@
-184,6
+209,7
@@
fi
AC_C_CONST
AC_TYPE_SIZE_T
AC_C_INLINE
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>])
AC_CHECK_TYPES([struct sockaddr_in6],,,[AC_INCLUDES_DEFAULT
#include <netinet/in.h>])
@@
-327,7
+353,7
@@
if test "x$GCC" = xyes; then
CC="${CC} $gcc_werror"
# for older GCCs that don't know %ju (etc)
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>
rjk_cv_noformat,
AC_TRY_COMPILE([#include <stdio.h>
#include <stdint.h>
@@
-339,7
+365,7
@@
if test "x$GCC" = xyes; then
CC="${CC} -Wno-format"
fi
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"
rjk_cv_shadow,
oldCC="${CC}"
CC="${CC} -Wshadow"
@@
-378,5
+404,6
@@
AC_CONFIG_FILES([Makefile
debian/Makefile
sounds/Makefile
python/Makefile
debian/Makefile
sounds/Makefile
python/Makefile
- examples/Makefile])
+ examples/Makefile
+ tests/Makefile])
AC_OUTPUT
AC_OUTPUT