Remove now-redundant libao dependency.

diff --git a/README b/README
index 71176aaf52e5acd9d1a730933541af1472167782..eba453a4c24c8ac8594b8097f08d32b456017987 100644 (file)
--- a/README
+++ b/README
@@ -31,7 +31,6 @@ Build dependencies:
   libpcre          7.6         need UTF-8 support
   libmad           0.15.1b
   libgcrypt        1.4.1
   libpcre          7.6         need UTF-8 support
   libmad           0.15.1b
   libgcrypt        1.4.1

-  libao            0.8.8       1.0.0 is broken

   libasound        1.0.16
   libFLAC          1.2.1
   libsamplerate    0.1.4       currently optional
   libasound        1.0.16
   libFLAC          1.2.1
   libsamplerate    0.1.4       currently optional

diff --git a/README.developers b/README.developers
index 692dd12be2bd7d42021b47a0c1829e3f2f8a3c49..0f9809b63ae0636baa57591f3afeb00db12dca34 100644 (file)
--- a/README.developers
+++ b/README.developers
@@ -11,13 +11,13 @@ Dependencies:
 
      apt-get install gcc libc6-dev automake autoconf libtool libgtk2.0-dev \
                     libgc-dev libgcrypt-dev libpcre3-dev libvorbis-dev \
 
      apt-get install gcc libc6-dev automake autoconf libtool libgtk2.0-dev \
                     libgc-dev libgcrypt-dev libpcre3-dev libvorbis-dev \

-                    libao-dev libmad0-dev libasound2-dev libdb4.5-dev \
+                    libmad0-dev libasound2-dev libdb4.5-dev \

                     libflac-dev vorbis-tools wget libsamplerate0-dev
 
      libdb4.6 does not work (and configure will refuse to use it).
 
    * On FreeBSD you'll need at least these packages:
                     libflac-dev vorbis-tools wget libsamplerate0-dev
 
      libdb4.6 does not work (and configure will refuse to use it).
 
    * On FreeBSD you'll need at least these packages:

-       autotools bash flac mad boehm-gc db43 gmake gsed libao libgcrypt wget
+       autotools bash flac mad boehm-gc db43 gmake gsed libgcrypt wget

        vorbis-tools
 
    * On OS X with Fink:
        vorbis-tools
 
    * On OS X with Fink:

diff --git a/configure.ac b/configure.ac
index 7346ec2b935668714d34ddeca9b6edfa57549f5d..37ef7cc4223904a4bacde21b4485a770626cdd1b 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -462,9 +462,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(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"])
   AC_CHECK_LIB([FLAC], [FLAC__stream_decoder_new],
               [AC_SUBST(LIBFLAC,[-lFLAC])],
               [missing_libraries="$missing_libraries libFLAC"])

diff --git a/debian/control b/debian/control
index 9c2ef37b392741303ca322ede0b4b4ba03f795c9..d472a0e0fe633731c9f4e9afe0285ba5f3e9a9b6 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -3,7 +3,7 @@ Maintainer: Richard Kettlewell <rjk@greenend.org.uk>
 Section: sound
 Priority: optional
 Standards-Version: 3.8.1.0
 Section: sound
 Priority: optional
 Standards-Version: 3.8.1.0

-Build-Depends: libgc6-dev | libgc-dev, libgcrypt-dev, libdb4.3-dev | libdb4.5-dev | libdb4.7-dev | libdb4.8-dev | libdb5.1-dev, libpcre3-dev, libvorbis-dev, libmad0-dev, libasound2-dev, libao-dev, python, libflac-dev, libgtk2.0-dev (>= 2.12.12)
+Build-Depends: libgc6-dev | libgc-dev, libgcrypt-dev, libdb4.3-dev | libdb4.5-dev | libdb4.7-dev | libdb4.8-dev | libdb5.1-dev, libpcre3-dev, libvorbis-dev, libmad0-dev, libasound2-dev, python, libflac-dev, libgtk2.0-dev (>= 2.12.12)

 Vcs-Git: https://code.google.com/p/disorder/
 Homepage: http://www.greenend.org.uk/rjk/disorder/
 
 Vcs-Git: https://code.google.com/p/disorder/
 Homepage: http://www.greenend.org.uk/rjk/disorder/
 

diff --git a/server/Makefile.am b/server/Makefile.am
index c6febdca6370c73125caebf1ca7cd754656c6f24..8233cffabb3e198395f36297a736e940bbfb7123 100644 (file)
--- a/server/Makefile.am
+++ b/server/Makefile.am
@@ -28,7 +28,7 @@ disorderd_SOURCES=disorderd.c api.c api-server.c daemonize.c play.c   \
        schedule.c dbparams.c background.c mount.c \
        exports.c ../lib/memgc.c disorder-server.h
 disorderd_LDADD=$(LIBOBJS) ../lib/libdisorder.a \
        schedule.c dbparams.c background.c mount.c \
        exports.c ../lib/memgc.c disorder-server.h
 disorderd_LDADD=$(LIBOBJS) ../lib/libdisorder.a \

-       $(LIBPCRE) $(LIBDB) $(LIBAO) $(LIBGC) $(LIBGCRYPT) $(LIBICONV) \
+       $(LIBPCRE) $(LIBDB) $(LIBGC) $(LIBGCRYPT) $(LIBICONV) \

        $(LIBASOUND) $(COREAUDIO) $(LIBPTHREAD) $(LIBDL)
 disorderd_LDFLAGS=-export-dynamic
 disorderd_DEPENDENCIES=../lib/libdisorder.a
        $(LIBASOUND) $(COREAUDIO) $(LIBPTHREAD) $(LIBDL)
 disorderd_LDFLAGS=-export-dynamic
 disorderd_DEPENDENCIES=../lib/libdisorder.a

diff --git a/server/play.c b/server/play.c
index 96e4a507f557446093dfafd712f78155537dfc82..71782de365a17bc8faee3863b180423ef9f159d9 100644 (file)
--- a/server/play.c
+++ b/server/play.c
@@ -22,7 +22,6 @@
  */
 
 #include "disorder-server.h"
  */
 
 #include "disorder-server.h"

-#include <ao/ao.h>

 
 #define SPEAKER "disorder-speaker"
 
 
 #define SPEAKER "disorder-speaker"