Merge commit 'meins/master'

[paraslash.git] / configure.ac

diff --git a/configure.ac b/configure.ac
index c435e371c3ec511637a24494bf39b2b0a79dbafa..a974ddb8a7d02f402be5d72f79dc45d05a15f57e 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -79,7 +79,7 @@ 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 afh
+daemon stat crypt http_send close_on_fork ipc acl afh fade
 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
@@ -139,10 +139,15 @@ fsck_cmdline_objs="fsck.cmdline"
 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_errlist_objs="exec signal string stat ringbuffer fd"
 gui_other_objs="gui gui_theme"
 gui_objs="$gui_cmdline_objs $gui_errlist_objs $gui_other_objs"
 
+fade_cmdline_objs="fade.cmdline"
+fade_errlist_objs="fade exec string fd"
+
+
+
 ########################################################################### ssl
 dnl @synopsis CHECK_SSL
 dnl
@@ -319,7 +324,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"
+       afh_ldflags="$afh_ldflags $oggvorbis_libs -logg -lvorbis -lvorbisfile"
 
        filter_cmdline_objs="$filter_cmdline_objs oggdec_filter.cmdline"
        audiod_cmdline_objs="$audiod_cmdline_objs oggdec_filter.cmdline"
@@ -437,17 +442,19 @@ OLD_LIBS="$LIBS"
 if test "$OSTYPE" != "Linux"; then
        have_alsa="no"
 fi
-msg="=> can not build para_fade, and no alsa support for para_audiod/para_write"
+msg="=> will not build para_fade"
 if test "$have_alsa" = "yes"; then
-       AC_CHECK_HEADER(linux/soundcard.h,
-               [extras="$extras para_fade"],
+       AC_CHECK_HEADER(linux/soundcard.h, [
+               extras="$extras para_fade"
+               all_executables="$all_executables fade"
+               ],
                [
                        have_alsa="no"
                        AC_MSG_WARN([no linux/soundcard.h $msg])
                ]
        )
 fi
-
+msg="=> no alsa support for para_audiod/para_write"
 if test "$have_alsa" = "yes"; then
        AC_CHECK_HEADERS([alsa/asoundlib.h], [], [
                have_alsa="no"
@@ -535,7 +542,6 @@ AC_DEFUN([add_dot_o],[$(for i in $@; do printf "$i.o "; done)])
 AC_DEFUN([objlist_to_errlist],[$(for i in $@; do printf "DEFINE_ERRLIST($(echo $i| tr 'a-z' 'A-Z'));"; done) [const char **para_errlist[[]]] = {$(for i in $@; do printf "PARA_ERRLIST($(echo $i | tr 'a-z' 'A-Z')), "; done) }])
 
 ############################################################# error2.h
-
 AC_DEFUN([define_safe_error_enums],
 [
        exe=""
@@ -630,6 +636,7 @@ 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"
+fade_objs="$fade_cmdline_objs $fade_errlist_objs"
 
 AC_SUBST(recv_objs, add_dot_o($recv_objs))
 AC_SUBST(recv_ldflags, $recv_ldflags)
@@ -680,6 +687,10 @@ AC_SUBST(gui_objs, add_dot_o($gui_objs))
 AC_DEFINE_UNQUOTED(INIT_GUI_ERRLISTS,
        objlist_to_errlist($gui_errlist_objs), errors used by para_gui)
 
+AC_SUBST(fade_objs, add_dot_o($fade_objs))
+AC_DEFINE_UNQUOTED(INIT_FADE_ERRLISTS,
+       objlist_to_errlist($fade_errlist_objs), errors used by para_fade)
+
 enum="$(for i in $writers; do printf "${i}_WRITE, " | tr '[a-z]' '[A-Z]'; done)"
 AC_DEFINE_UNQUOTED(WRITER_ENUM, $enum NUM_SUPPORTED_WRITERS,
        enum of supported writers)
@@ -703,8 +714,8 @@ AC_MSG_NOTICE([
 paraslash configuration:
 ~~~~~~~~~~~~~~~~~~~~~~~~
 unix socket credentials: $have_ucred
-audio formats supported by para_server: $server_audio_formats
-senders supported by para_server/para_send: $senders
+audio formats supported by para_server/para_afh: $server_audio_formats
+senders supported by para_server: $senders
 receivers supported by para_audiod/para_recv: $receivers
 filters supported by para_audiod/para_filter: $filters
 writers supported by para_audiod/para_write: $writers