X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~mdw/git/disorder/blobdiff_plain/9e89d26a8e1378f17a19da072c5f7308ddaf24f1..dabc426afb4896850cf01bd8916ef1155b2d7652:/configure.ac
diff --git a/configure.ac b/configure.ac
index ee96f21..dd46045 100644
--- 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-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
@@ -18,9 +18,9 @@
# along with this program. If not, see .
#
-AC_INIT([disorder], [5.0.DEV], [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.DEV])
+AM_INIT_AUTOMAKE([foreign])
AC_CONFIG_SRCDIR([server/disorderd.c])
AM_CONFIG_HEADER([config.h])
AC_CONFIG_MACRO_DIR([m4])
@@ -39,6 +39,7 @@ want_cgi=yes
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...
#
@@ -47,6 +48,7 @@ want_coreaudio=yes
# - 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...
#
@@ -78,6 +80,10 @@ AC_ARG_WITH([alsa],
[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])],
@@ -445,6 +451,13 @@ if test $want_alsa = yes; then
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
@@ -461,9 +474,6 @@ 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"])
@@ -516,7 +526,8 @@ fi
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.
@@ -564,7 +575,7 @@ fi
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()
@@ -652,7 +663,7 @@ if test ! -z "$missing_functions"; then
fi
# Functions we can take or leave
-AC_CHECK_FUNCS([fls getfsstat])
+AC_CHECK_FUNCS([fls getfsstat closesocket])
if test $want_server = yes; then
# had better be version 3 or later
@@ -729,13 +740,13 @@ if test "x$GCC" = xyes; then
if test $GCC = yes; then
CC="$CC -Wall -Werror"
fi
- AC_COMPILE_IFELSE([AC_LANG_PROGRAM([],[
+ 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]
)