fsck.c: Fix typo.

[paraslash.git] / configure.ac

diff --git a/configure.ac b/configure.ac
index c612a5420af76c858de4a34305f0963b8ea03159..c435e371c3ec511637a24494bf39b2b0a79dbafa 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -79,12 +79,12 @@ AC_CHECK_FUNCS([atexit dup2 memchr memmove memset \
        [AC_MSG_ERROR([function not found, cannot live without it])])
 
 all_errlist_objs="server mp3_afh afh_common vss command net string signal time
-daemon stat crypt http_send close_on_fork ipc acl
+daemon stat crypt http_send close_on_fork ipc acl afh
 dccp_send fd user_list chunk_queue afs osl aft mood score attribute blob ringbuffer
 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 audiod recv filter audioc write client fsck"
+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
@@ -113,6 +113,10 @@ audiod_errlist_objs="audiod signal string daemon stat net
 audiod_ldflags=""
 audiod_audio_formats=""
 
+afh_cmdline_objs="afh.cmdline"
+afh_errlist_objs="afh string fd mp3_afh afh_common time"
+afh_ldflags=""
+
 server_cmdline_objs="server.cmdline server_command_list afs_command_list"
 server_errlist_objs="server afh_common mp3_afh vss command net string signal
        time daemon stat crypt http_send close_on_fork
@@ -136,7 +140,7 @@ fsck_errlist_objs="osl rbtree fsck string sha1 fd"
 
 gui_cmdline_objs="gui.cmdline"
 gui_errlist_objs="exec close_on_fork signal string stat ringbuffer fd"
-gui_other_objs="gui gui_common gui_theme"
+gui_other_objs="gui gui_theme"
 gui_objs="$gui_cmdline_objs $gui_errlist_objs $gui_other_objs"
 
 ########################################################################### ssl
@@ -315,6 +319,7 @@ if test "$have_ogg" = "yes"; then
        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"
 
        filter_cmdline_objs="$filter_cmdline_objs oggdec_filter.cmdline"
        audiod_cmdline_objs="$audiod_cmdline_objs oggdec_filter.cmdline"
@@ -322,6 +327,7 @@ if test "$have_ogg" = "yes"; then
        server_errlist_objs="$server_errlist_objs ogg_afh"
        filter_errlist_objs="$filter_errlist_objs oggdec"
        audiod_errlist_objs="$audiod_errlist_objs oggdec"
+       afh_errlist_objs="$afh_errlist_objs ogg_afh"
 
        audiod_audio_formats="ogg"
        server_audio_formats="$server_audio_formats ogg"
@@ -357,12 +363,14 @@ if test "$have_faad" = "yes"; then
        AC_DEFINE(HAVE_FAAD, 1, define to 1 if you want to build the aacdec filter)
        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"
        filter_ldflags="$filter_ldflags $faad_libs -lfaad"
        audiod_ldflags="$audiod_ldflags $faad_libs -lfaad"
+       afh_ldflags="$afh_ldflags $faad_libs -lfaad"
        audiod_audio_formats="$audiod_audio_formats aac"
        server_audio_formats="$server_audio_formats aac"
        filters="$filters aacdec"
@@ -414,6 +422,7 @@ else
 fi
 if test -n "$audiod_audio_formats"; then
        extras="$extras para_audiod"
+       all_executables="$all_executables audiod"
 else
        AC_MSG_WARN([can not build para_audiod (no supported audio formats)])
 fi
@@ -620,6 +629,7 @@ write_objs="$write_cmdline_objs $write_errlist_objs"
 client_objs="$client_cmdline_objs $client_errlist_objs"
 fsck_objs="$fsck_cmdline_objs $fsck_errlist_objs"
 audioc_objs="$audioc_cmdline_objs $audioc_errlist_objs"
+afh_objs="$afh_cmdline_objs $afh_errlist_objs"
 
 AC_SUBST(recv_objs, add_dot_o($recv_objs))
 AC_SUBST(recv_ldflags, $recv_ldflags)
@@ -641,6 +651,11 @@ AC_SUBST(server_ldflags, $server_ldflags)
 AC_DEFINE_UNQUOTED(INIT_SERVER_ERRLISTS,
        objlist_to_errlist($server_errlist_objs), errors used by para_server)
 
+AC_SUBST(afh_objs, add_dot_o($afh_objs))
+AC_SUBST(afh_ldflags, $afh_ldflags)
+AC_DEFINE_UNQUOTED(INIT_AFH_ERRLISTS,
+       objlist_to_errlist($afh_errlist_objs), errors used by para_afh)
+
 AC_SUBST(write_objs, add_dot_o($write_objs))
 AC_SUBST(write_ldflags, $write_ldflags)
 AC_DEFINE_UNQUOTED(INIT_WRITE_ERRLISTS,