Merge branch 'master' into next

[paraslash.git] / configure.ac

diff --git a/configure.ac b/configure.ac
index cdbdae468d70aa7af88b695c3ae6c0cd2ee456fa..cb6ecd65265d4cf3d49b3b3a6f701cb637bd4ea3 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -84,7 +84,8 @@ dccp_send fd user_list chunk_queue afs osl aft mood score attribute blob ringbuf
 playlist sha1 rbtree sched audiod grab_client filter_chain wav compress
 http_recv dccp_recv recv_common write_common file_write audiod_command
 client_common recv stdout filter stdin audioc write client fsck exec send_common"
-all_executables="server recv filter audioc write client fsck afh amp_filter"
+
+all_executables="server recv filter audioc write client fsck afh"
 
 recv_cmdline_objs="recv.cmdline http_recv.cmdline dccp_recv.cmdline"
 recv_errlist_objs="http_recv recv_common recv time string net dccp_recv
@@ -336,7 +337,6 @@ if test "$have_ogg" = "yes"; then
 
        audiod_audio_formats="ogg"
        server_audio_formats="$server_audio_formats ogg"
-       filter_filters="$filter_filters oggdec"
        AC_SUBST(oggvorbis_cppflags)
        AC_SUBST(oggvorbis_libs)
 else
@@ -369,7 +369,6 @@ if test "$have_faad" = "yes"; then
        all_errlist_objs="$all_errlist_objs aac_common aacdec aac_afh"
        filter_errlist_objs="$filter_errlist_objs aacdec aac_common"
        afh_errlist_objs="$afh_errlist_objs aac_common aac_afh"
-       filter_filters="$filter_filters aacdec"
        audiod_errlist_objs="$audiod_errlist_objs aacdec aac_common"
        server_errlist_objs="$server_errlist_objs aac_afh aac_common"
        server_ldflags="$server_ldflags $faad_libs -lfaad"