paraslash 0.4.11

[paraslash.git] / configure.ac

diff --git a/configure.ac b/configure.ac
index 094c4062e1837ab19c47209ba1b9777af4c3b46a..54912054fbb96b13257a7b7f1c3dbb28135834f0 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -4,7 +4,7 @@
 AC_PREREQ(2.60)
 
 
-AC_INIT(paraslash, [git], maan@systemlinux.org)
+AC_INIT(paraslash, [0.4.11], maan@systemlinux.org)
 AC_CONFIG_HEADER([config.h])
 
 AC_PATH_PROG(UNAMEPATH, uname, no)
@@ -98,9 +98,9 @@ all_errlist_objs="mp3_afh afh_common net string signal time daemon
        dccp_recv recv_common write_common file_write audiod_command
        client_common recv stdout filter stdin audioc write client
        exec send_common ggo udp_recv color fec fecdec_filter
-       prebuffer_filter audiod_command_list bitstream imdct
+       prebuffer_filter bitstream imdct
        wma_afh wma_common wmadec_filter buffer_tree crypt_common
-       gui gui_theme"
+       gui gui_theme sideband"
 
 executables="recv filter audioc write client afh audiod"
 
@@ -122,10 +122,10 @@ audioc_errlist_objs="audioc string net fd"
 audioc_ldflags=""
 
 audiod_cmdline_objs="add_cmdline(audiod compress_filter http_recv dccp_recv file_write client amp_filter udp_recv prebuffer_filter)"
-audiod_errlist_objs="audiod signal string daemon stat net crypt_common
+audiod_errlist_objs="audiod signal string daemon stat net crypt_common sideband
        time grab_client filter_common wav_filter compress_filter amp_filter http_recv dccp_recv
        recv_common fd sched write_common file_write audiod_command fecdec_filter
-       client_common ggo udp_recv color fec prebuffer_filter audiod_command_list
+       client_common ggo udp_recv color fec prebuffer_filter
        bitstream imdct wma_common wmadec_filter buffer_tree"
 audiod_ldflags="-lm"
 audiod_audio_formats="wma"
@@ -142,7 +142,7 @@ writers=" file"
 default_writer="FILE_WRITE"
 
 client_cmdline_objs="add_cmdline(client)"
-client_errlist_objs="client net string fd sched stdin stdout time
+client_errlist_objs="client net string fd sched stdin stdout time sideband
        client_common buffer_tree crypt_common"
 client_ldflags=""
 
@@ -269,13 +269,11 @@ else
                string signal time daemon http_send close_on_fork mm
                crypt_common ipc dccp_send fd user_list chunk_queue
                afs aft mood score attribute blob playlist sched acl
-               send_common udp_send color fec server_command_list
-               afs_command_list wma_afh wma_common"
-
+               send_common udp_send color fec wma_afh wma_common sideband"
        all_errlist_objs="$all_errlist_objs server vss command
                http_send close_on_fork mm ipc dccp_send user_list
                chunk_queue afs aft mood score attribute blob playlist
-               acl udp_send server_command_list afs_command_list"
+               acl udp_send"
 
        server_ldflags=""
        server_audio_formats="mp3 wma"
@@ -578,6 +576,7 @@ if test "$have_ogg" = "yes"; then
        AC_CHECK_LIB([speex], [speex_decoder_init], [], [ have_speex="no" ])
        AC_CHECK_HEADERS([speex/speex.h], [], [ have_speex="no" ])
 else
+       AC_MSG_WARN([vorbis/speex depend on libogg, which was not detected])
        have_vorbis="no"
        have_speex="no"
 fi
@@ -596,8 +595,6 @@ if test "$have_vorbis" = "yes" || test "$have_speex" = "yes"; then
        all_errlist_objs="$all_errlist_objs ogg_afh_common"
        afh_errlist_objs="$afh_errlist_objs ogg_afh_common"
        server_errlist_objs="$server_errlist_objs ogg_afh_common"
-else
-       AC_MSG_WARN([vorbis/speex require ogg])
 fi
 if test "$have_vorbis" = "yes"; then
        all_errlist_objs="$all_errlist_objs oggdec_filter ogg_afh"
@@ -753,8 +750,8 @@ AC_MSG_RESULT($have_libid3tag)
 
 if test ${have_libid3tag} = yes; then
        AC_DEFINE(HAVE_LIBID3TAG, 1, define to 1 you have libid3tag)
-       server_ldflags="$server_ldflags $id3tag_libs -lid3tag"
-       afh_ldflags="$afh_ldflags $id3tag_libs -lid3tag"
+       server_ldflags="$server_ldflags $id3tag_libs -lid3tag -lz"
+       afh_ldflags="$afh_ldflags $id3tag_libs -lid3tag -lz"
        AC_SUBST(id3tag_cppflags)
 else
        AC_MSG_WARN([no support for id3v2 tags])
@@ -825,7 +822,7 @@ AC_CHECK_HEADER(sys/soundcard.h, [
        AC_CHECK_LIB(ossaudio, _oss_ioctl, [
                        audiod_ldflags="$audiod_ldflags -lossaudio"
                        write_ldflags="$write_ldflags -lossaudio"
-                       fade_ldflags="$write_ldflags -lossaudio"
+                       fade_ldflags="$fade_ldflags -lossaudio"
                ]
        )
        ],