From: Andre Noll <maan@systemlinux.org>
Date: Fri, 4 Apr 2008 12:19:45 +0000 (+0200)
Subject: Merge commit 'remotes/lamarck/master'
X-Git-Tag: v0.3.2~12
X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=commitdiff_plain;h=77217baa3a50ca051ec4341c96e3fa7e46ceec19;hp=-c

Merge commit 'remotes/lamarck/master'
---

77217baa3a50ca051ec4341c96e3fa7e46ceec19
diff --combined configure.ac
index e7ae6b31,5036ce1f..013e7b4a
--- a/configure.ac
+++ b/configure.ac
@@@ -324,7 -324,7 +324,7 @@@ if test "$have_ogg" = "yes"; the
  	server_ldflags="$server_ldflags $oggvorbis_libs -logg -lvorbis -lvorbisfile"
  	filter_ldflags="$filter_ldflags $oggvorbis_libs -lvorbis -lvorbisfile"
  	audiod_ldflags="$audiod_ldflags $oggvorbis_libs -lvorbis -lvorbisfile"
- 	afh_ldflags="$afh_ldflags $oggvorbis_libs -lvorbis -lvorbisfile"
+ 	afh_ldflags="$afh_ldflags $oggvorbis_libs -logg -lvorbis -lvorbisfile"
  
  	filter_cmdline_objs="$filter_cmdline_objs oggdec_filter.cmdline"
  	audiod_cmdline_objs="$audiod_cmdline_objs oggdec_filter.cmdline"
@@@ -714,8 -714,8 +714,8 @@@ AC_MSG_NOTICE(
  paraslash configuration:
  ~~~~~~~~~~~~~~~~~~~~~~~~
  unix socket credentials: $have_ucred
 -audio formats supported by para_server: $server_audio_formats
 -senders supported by para_server/para_send: $senders
 +audio formats supported by para_server/para_afh: $server_audio_formats
 +senders supported by para_server: $senders
  receivers supported by para_audiod/para_recv: $receivers
  filters supported by para_audiod/para_filter: $filters
  writers supported by para_audiod/para_write: $writers