Fix the alsa writer

[paraslash.git] / configure.ac

diff --git a/configure.ac b/configure.ac
index 721c5c0c16b982af7d4f01257968fb192a9fd6d8..58152dbc228151387dc86ec113bb72fe2b352b17 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -71,7 +71,7 @@ audiod_cmdline_objs="audiod.cmdline grab_client.cmdline compress_filter.cmdline
        http_recv.cmdline dccp_recv.cmdline file_write.cmdline client.cmdline"
 audiod_errlist_objs="audiod signal string daemon stat net
        time grab_client filter_chain wav compress http_recv dccp dccp_recv
-       recv_common fd sched write_common file_writer audiod_command crypt
+       recv_common fd sched write_common file_write audiod_command crypt
        client_common"
 audiod_ldflags=""
 
@@ -82,7 +82,7 @@ server_errlist_objs="server mp3_afh afs command net string signal random_selecto
 server_ldflags=""
 
 write_cmdline_objs="write.cmdline file_write.cmdline"
-write_errlist_objs="write write_common file_writer time fd string sched stdin"
+write_errlist_objs="write write_common file_write time fd string sched stdin"
 write_ldflags=""
 write_writers="file"
 
@@ -169,11 +169,11 @@ if test ${have_core_audio} = yes; then
        f3="-framework AudioUnit"
        f4="-framework CoreServices"
        f="$f1 $f2 $f3 $f4"
-       audiod_errlist_objs="$audiod_errlist_objs osx_writer"
+       audiod_errlist_objs="$audiod_errlist_objs osx_write"
        audiod_cmdline_objs="$audiod_cmdline_objs osx_write.cmdline"
        audiod_ldflags="$audiod_ldflags $f"
 
-       write_errlist_objs="$write_errlist_objs osx_writer"
+       write_errlist_objs="$write_errlist_objs osx_write"
        write_cmdline_objs="$write_cmdline_objs osx_write.cmdline"
        write_ldflags="$write_ldflags $f"
        write_writers="$write_writers osx"
@@ -327,11 +327,11 @@ AC_CHECK_LIB([asound], [snd_pcm_open], [], [
        have_alsa="no"
 ])
 if test "$have_alsa" = "yes"; then
-       audiod_errlist_objs="$audiod_errlist_objs alsa_writer"
+       audiod_errlist_objs="$audiod_errlist_objs alsa_write"
        audiod_cmdline_objs="$audiod_cmdline_objs alsa_write.cmdline"
        audiod_ldflags="$audiod_ldflags -lasound"
 
-       write_errlist_objs="$write_errlist_objs alsa_writer"
+       write_errlist_objs="$write_errlist_objs alsa_write"
        write_cmdline_objs="$write_cmdline_objs alsa_write.cmdline"
        write_ldflags="$write_ldflags -lasound"
        write_writers="$write_writers alsa"
@@ -448,9 +448,9 @@ AC_DEFINE_UNQUOTED(WRITER_ENUM, $enum NUM_SUPPORTED_WRITERS,
        enum of supported writers)
 names="$(for i in $write_writers; do printf \"$i\",' ' ; done)"
 AC_DEFINE_UNQUOTED(WRITER_NAMES, $names, supported writer names)
-inits="$(for i in $write_writers; do printf 'extern void '$i'_writer_init(struct writer *); '; done)"
+inits="$(for i in $write_writers; do printf 'extern void '$i'_write_init(struct writer *); '; done)"
 AC_DEFINE_UNQUOTED(DECLARE_WRITER_INITS, $inits, init functions of the supported writers)
-array="$(for i in $write_writers; do printf '{.init = '$i'_writer_init},'; done)"
+array="$(for i in $write_writers; do printf '{.init = '$i'_write_init},'; done)"
 AC_DEFINE_UNQUOTED(WRITER_ARRAY, $array, array of supported writers)
 
 gui_cmdline_objs="gui.cmdline"