Build para_audiod unconditionally.

The wma decoder will always be build, so the case of no supported
audio files can not happen.

diff --git a/Makefile.in b/Makefile.in
index eca693f27c8711f35845cfbe62daaee46e3b7dd3..f2a28af2a210e88f3858645a7ea39611f30dc3df 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -61,7 +61,7 @@ CPPFLAGS += -I$(cmdline_dir)
 CPPFLAGS += @osl_cppflags@
 CPPFLAGS += -DGIT_VERSION='"$(GIT_VERSION)"'
 
 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))
        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 354018c4e2846dcaf4cf1121f16df99e09b2be18..2ff271b33fd1026c3a4cfe026e49d63b03652cf8 100644 (file)
--- 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
 "
 
 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)"
 
 
 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"
        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
 
 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
 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"
 CPPFLAGS="$OLD_CPPFLAGS"
 LDFLAGS="$OLD_LDFLAGS"
 LIBS="$OLD_LIBS"