X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~mdw/git/disorder/blobdiff_plain/c37132f22eb3ee6fa48da5a56f0dd88a9d8ca5ae..de0ef46ee9c9089a5a787fd1cd5f27ca475fc0be:/configure.ac

diff --git a/configure.ac b/configure.ac
index 28665f6..11085e0 100644
--- a/configure.ac
+++ b/configure.ac
@@ -18,7 +18,7 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 
-AC_INIT([disorder], [5.1], [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([foreign])
 AC_CONFIG_SRCDIR([server/disorderd.c])
@@ -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"])