From 170ccb94f747a71d9da7541032a5aca8f26e58a0 Mon Sep 17 00:00:00 2001 From: Andre Noll Date: Tue, 19 Jan 2010 00:53:52 +0100 Subject: [PATCH] Build para_audiod unconditionally. The wma decoder will always be build, so the case of no supported audio files can not happen. --- Makefile.in | 2 +- configure.ac | 10 ++-------- 2 files changed, 3 insertions(+), 9 deletions(-) diff --git a/Makefile.in b/Makefile.in index eca693f2..f2a28af2 100644 --- a/Makefile.in +++ b/Makefile.in @@ -61,7 +61,7 @@ CPPFLAGS += -I$(cmdline_dir) CPPFLAGS += @osl_cppflags@ CPPFLAGS += -DGIT_VERSION='"$(GIT_VERSION)"' -BINARIES = para_server para_client para_audioc para_recv \ +BINARIES = para_server para_audiod para_client para_audioc para_recv \ para_filter para_write para_afh @extra_binaries@ man_binaries := $(BINARIES) man_pages := $(patsubst %, man/man1/%.1, $(man_binaries)) diff --git a/configure.ac b/configure.ac index 354018c4..2ff271b3 100644 --- a/configure.ac +++ b/configure.ac @@ -94,7 +94,7 @@ server_command_list afs_command_list audiod_command_list bitstream imdct wma_afh wma_common wmadec_filter buffer_tree " -all_executables="server recv filter audioc write client afh" +all_executables="server recv filter audioc write client afh audiod" recv_cmdline_objs="add_cmdline(recv http_recv dccp_recv udp_recv)" @@ -136,7 +136,7 @@ server_errlist_objs="server afh_common mp3_afh vss command net string signal blob playlist sha1 sched acl send_common udp_send color fec server_command_list afs_command_list wma_afh wma_common" server_ldflags="-losl" -server_audio_formats=" mp3" +server_audio_formats=" mp3 wma" write_cmdline_objs="add_cmdline(write file_write)" write_errlist_objs="write write_common file_write time fd string sched stdin @@ -482,12 +482,6 @@ if test "$have_mad" = "yes"; then else AC_MSG_WARN([no mp3dec support in para_audiod/para_filter]) 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 CPPFLAGS="$OLD_CPPFLAGS" LDFLAGS="$OLD_LDFLAGS" LIBS="$OLD_LIBS" -- 2.39.5