# Process this file with autoconf to produce a configure script.
#
# This file is part of DisOrder.
-# Copyright (C) 2004-2010 Richard Kettlewell
+# Copyright (C) 2004-2013 Richard Kettlewell
# Portions copyright (C) 2007 Ross Younger
#
# This program is free software: you can redistribute it and/or modify
# along with this program. If not, see <http://www.gnu.org/licenses/>.
#
-AC_INIT([disorder], [5.0], [richard+disorder@sfere.greenend.org.uk])
+AC_INIT([disorder], [5.1.1], [richard+disorder@sfere.greenend.org.uk])
AC_CONFIG_AUX_DIR([config.aux])
-AM_INIT_AUTOMAKE(disorder, [5.0])
+AM_INIT_AUTOMAKE([foreign])
AC_CONFIG_SRCDIR([server/disorderd.c])
AM_CONFIG_HEADER([config.h])
+AC_CONFIG_MACRO_DIR([m4])
# Find host type
AC_CANONICAL_HOST
want_alsa=yes
want_oss=yes
want_coreaudio=yes
+want_pulseaudio=yes
# By default we don't want gtk-osx. But if you ask for --with-gtk-osx...
#
# - you will still need Fink (or something) for other libraries
# - if you wanted an application bundle you are out of luck
# - the menu bar is still in the main window (not at the top of the screen)
+# - drag and drop doesn't work
#
# So it's still rather rough and ready. But it does work...
#
[AS_HELP_STRING([--without-alsa],
[do not build with ALSA support])],
[want_alsa=$withval])
+AC_ARG_WITH([pulseaudio],
+ [AS_HELP_STRING([--without-pulseaudio],
+ [do not build with PulseAudio support])],
+ [want_pulseaudio=$withval])
AC_ARG_WITH([oss],
[AS_HELP_STRING([--without-oss],
[do not build with OSS support])],
;;
*linux* | *Linux* )
AC_MSG_RESULT([Linux])
+ AC_DEFINE_UNQUOTED([PATH_PROC_MOUNTS],["/proc/mounts"],[path to kernel mount list])
;;
*-apple-darwin* )
AC_MSG_RESULT([Mac OS X])
# Look for a suitable version of libdb among the versions found in FreeBSD 7.0
AC_CACHE_CHECK([looking for a libdb install],[rjk_cv_libdb],[
rjk_cv_libdb="none"
- for db in db43 db44 db45 db46; do
+ for db in db43 db44 db45 db47; do
if test -e /usr/local/lib/$db; then
rjk_cv_libdb=$db
break
AC_CHECK_LIB([asound], [snd_pcm_open],
[AC_SUBST(LIBASOUND,[-lasound])])
fi
+if test $want_pulseaudio = yes; then
+ PKG_CHECK_MODULES([PULSEAUDIO],[libpulse],
+ [AC_DEFINE([HAVE_PULSEAUDIO],[1],[define to 1 for PulseAudio support])],
+ [missing_libraries="$missing_libraries libpulse"])
+ PKG_CHECK_MODULES([PULSEAUDIO_SIMPLE],[libpulse-simple],,
+ [missing_libraries="$missing_libraries libpulse-simple"])
+fi
AC_CHECK_LIB([samplerate],[src_new],
[AC_SUBST([LIBSAMPLERATE],[-lsamplerate])])
if test $want_server = yes; then
AC_CHECK_LIB(mad, mad_stream_init,
[AC_SUBST(LIBMAD,[-lmad])],
[missing_libraries="$missing_libraries libmad"])
- AC_CHECK_LIB([ao], [ao_initialize],
- [AC_SUBST(LIBAO,[-lao])],
- [missing_libraries="$missing_libraries libao"])
AC_CHECK_LIB([FLAC], [FLAC__stream_decoder_new],
[AC_SUBST(LIBFLAC,[-lFLAC])],
[missing_libraries="$missing_libraries libFLAC"])
if test $want_coreaudio = yes; then
AC_CHECK_HEADERS([CoreAudio/AudioHardware.h])
fi
-AC_CHECK_HEADERS([inttypes.h])
+AC_CHECK_HEADERS([inttypes.h sys/time.h sys/socket.h netinet/in.h \
+ arpa/inet.h sys/un.h netdb.h pcre.h pwd.h langinfo.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.
old_CFLAGS="${CFLAGS}"
CFLAGS="${CFLAGS} $gcc_werror"
-AC_CHECK_TYPES([long long,uint32_t,uint8_t,intmax_t,uintmax_t])
+AC_CHECK_TYPES([long long,uint32_t,uint16_t,uint8_t,intmax_t,uintmax_t])
# Some GCC invocations warn for converting function pointers to void *.
# This is fair enough, as it's technically forbidden, but we use dlsym()
fi
# Functions we can take or leave
-AC_CHECK_FUNCS([fls getfsstat])
+AC_CHECK_FUNCS([fls getfsstat closesocket])
if test $want_server = yes; then
# <db.h> had better be version 3 or later
AC_CACHE_CHECK([db.h version],[rjk_cv_db_version],[
- AC_PREPROC_IFELSE([
+ AC_PREPROC_IFELSE([AC_LANG_PROGRAM([
#include <db.h>
#ifndef DB_VERSION_MAJOR
# error cannot determine db version
#if DB_VERSION_MAJOR == 4 && DB_VERSION_MINOR <= 2
# error inadequate db version
#endif
- ],
+ ],[])],
[rjk_cv_db_version=ok],
[rjk_cv_db_version=inadequate])
if test $rjk_cv_db_version = ok; then
- AC_PREPROC_IFELSE([
+ AC_PREPROC_IFELSE([AC_LANG_PROGRAM([
#include <db.h>
#if DB_VERSION_MAJOR == 4 && DB_VERSION_MINOR == 6
# error http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=510270
#endif
- ],
+ ],[])],
[rjk_cv_db_version=ok],
[rjk_cv_db_version=toxic])
fi
if test $GCC = yes; then
CC="$CC -Wall -Werror"
fi
- AC_COMPILE_IFELSE([
+ AC_COMPILE_IFELSE([AC_LANG_PROGRAM([
static int x(char *f) {
return *f;
}
int z(const char *g) {
return x((char *)g);
- }],
+ }],[])],
[rjk_cv_pr29478=no],
[rjk_cv_pr29478=yes]
)
if test $GCC = yes; then
CC="$CC -Wreturn-type -Werror"
fi
- AC_COMPILE_IFELSE([
+ AC_COMPILE_IFELSE([AC_LANG_PROGRAM([],[
static void *threadfn(void) {
for(;;)
;
- }],
+ }],[])],
[rjk_cv_gcc44_stupidity=no],
[rjk_cv_gcc44_stupidity=yes])
CC="$old_CC"
fi
# a reasonable default set of warnings
- CC="${CC} -Wall -W -Wpointer-arith -Wbad-function-cast \
+ CC="${CC} -Wall -W -Wpointer-arith \
-Wwrite-strings -Wmissing-prototypes \
-Wmissing-declarations -Wnested-externs"
~mdw / disorder / blobdiff