ogg: Separate ogg from vorbis code.

[paraslash.git] / configure.ac

diff --git a/configure.ac b/configure.ac
index 80eaf095372b8bcd1663254b380e5203085bf53c..49fb098753f6946c2cd17296144e7e82f56b595b 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -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
@@ -445,7 +445,7 @@ AC_CHECK_LIB([ogg], [ogg_stream_init], [], [ have_ogg="no" ])
 AC_CHECK_LIB([vorbis], [vorbis_info_init], [], [ have_ogg="no" ])
 AC_CHECK_HEADERS([ogg/ogg.h vorbis/codec.h], [], [ have_ogg="no" ])
 if test "$have_ogg" = "yes"; then
-       all_errlist_objs="$all_errlist_objs oggdec_filter ogg_afh"
+       all_errlist_objs="$all_errlist_objs oggdec_filter ogg_afh ogg_afh_common"
        AC_DEFINE(HAVE_OGGVORBIS, 1, define to 1 to turn on ogg vorbis support)
        filters="$filters oggdec"
        if test "$OSTYPE" = "Darwin"; then
@@ -456,13 +456,10 @@ 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"
+       server_errlist_objs="$server_errlist_objs ogg_afh ogg_afh_common"
        filter_errlist_objs="$filter_errlist_objs oggdec_filter"
        audiod_errlist_objs="$audiod_errlist_objs oggdec_filter"
-       afh_errlist_objs="$afh_errlist_objs ogg_afh"
+       afh_errlist_objs="$afh_errlist_objs ogg_afh ogg_afh_common"
 
        audiod_audio_formats="$audiod_audio_formats ogg"
        server_audio_formats="$server_audio_formats ogg"
@@ -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))