Kill supported_audio_formats().

[paraslash.git] / configure.ac

diff --git a/configure.ac b/configure.ac
index aa831616351c1e14ce278108025edecdc8c7bbe6..be370c715eeb33a1a3b85571942d462a25e2fd82 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -4,7 +4,7 @@
 AC_PREREQ(2.60)
 
 
-AC_INIT(paraslash, [0.4.2], maan@systemlinux.org)
+AC_INIT(paraslash, [git], maan@systemlinux.org)
 AC_CONFIG_HEADER([config.h])
 
 AC_PATH_PROG(UNAMEPATH, uname, no)
@@ -133,7 +133,7 @@ server_errlist_objs="server afh_common mp3_afh vss command net string signal
        blob playlist sha1 sched acl send_common udp_send color fec
        server_command_list afs_command_list wma_afh wma_common"
 server_ldflags="-losl"
-server_audio_formats=" mp3 wma"
+server_audio_formats="mp3 wma"
 
 write_cmdline_objs="add_cmdline(write file_write)"
 write_errlist_objs="write write_common file_write time fd string sched stdin
@@ -456,9 +456,6 @@ if test "$have_ogg" = "yes"; then
        audiod_ldflags="$audiod_ldflags $oggvorbis_libs -lvorbis -lvorbisfile"
        afh_ldflags="$afh_ldflags $oggvorbis_libs -logg -lvorbis -lvorbisfile"
 
-       filter_cmdline_objs="$filter_cmdline_objs add_cmdline(oggdec_filter)"
-       audiod_cmdline_objs="$audiod_cmdline_objs add_cmdline(oggdec_filter)"
-
        server_errlist_objs="$server_errlist_objs ogg_afh"
        filter_errlist_objs="$filter_errlist_objs oggdec_filter"
        audiod_errlist_objs="$audiod_errlist_objs oggdec_filter"
@@ -740,6 +737,9 @@ AC_DEFINE_UNQUOTED(STATUS_ITEM_ARRAY,
        [char * array of all status items]
 )
 
+AC_DEFINE_UNQUOTED(SERVER_AUDIO_FORMATS, "$server_audio_formats",
+       [formats supported by para_server and para_afh])
+
 
 AC_SUBST(executables, add_para($executables))