X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=configure.ac;h=a974ddb8a7d02f402be5d72f79dc45d05a15f57e;hp=c612a5420af76c858de4a34305f0963b8ea03159;hb=d04dd06c4553ae3e1a6ead0e427f0f03836d0cd0;hpb=2abba90245f87fab096edfc3faf7df61646b713f

diff --git a/configure.ac b/configure.ac
index c612a542..a974ddb8 100644
--- 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 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
 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
@@ -135,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_other_objs="gui gui_common gui_theme"
+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
@@ -315,6 +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 -logg -lvorbis -lvorbisfile"
 
 	filter_cmdline_objs="$filter_cmdline_objs oggdec_filter.cmdline"
 	audiod_cmdline_objs="$audiod_cmdline_objs oggdec_filter.cmdline"
@@ -322,6 +332,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 +368,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 +427,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
@@ -428,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"
@@ -526,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=""
@@ -620,6 +635,8 @@ 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"
+fade_objs="$fade_cmdline_objs $fade_errlist_objs"
 
 AC_SUBST(recv_objs, add_dot_o($recv_objs))
 AC_SUBST(recv_ldflags, $recv_ldflags)
@@ -641,6 +658,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,
@@ -665,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)
@@ -688,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