Makefile.in: Remove special treatment of ortp_send/ortp_recv

[paraslash.git] / configure.ac

diff --git a/configure.ac b/configure.ac
index bfd659f18dbc8ae534b732269f3a3b982e350b42..5e2d2b9aafb98ed7365acb55c0847015e330a1cb 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -76,9 +76,9 @@ server_errlist_objs="server mp3 afs command net string signal random_selector
        ipc dccp dccp_send fd"
 server_ldflags=""
 
        ipc dccp dccp_send fd"
 server_ldflags=""
 

-play_cmdline_objs="play.cmdline"
-play_errlist_objs="play time fd string"
-play_ldflags=""
+write_cmdline_objs="write.cmdline"
+write_errlist_objs="write write_common file_writer time fd string"
+write_ldflags=""

 write_writers="file"
 
 
 write_writers="file"
 
 


@@ -220,7 +220,7 @@ else
 fi
 ########################################################################### alsa
 have_alsa="yes"
 fi
 ########################################################################### alsa
 have_alsa="yes"

-msg="=> no para_play"
+msg="=> no alsa support for para_write"

 AC_CHECK_HEADERS([alsa/asoundlib.h], [], [
        AC_MSG_WARN([no alsa/asoundlib $msg])
        have_alsa="no"
 AC_CHECK_HEADERS([alsa/asoundlib.h], [], [
        AC_MSG_WARN([no alsa/asoundlib $msg])
        have_alsa="no"


@@ -230,8 +230,8 @@ AC_CHECK_LIB([asound], [snd_pcm_open], [], [
        have_alsa="no"
 ])
 if test "$have_alsa" = "yes"; then
        have_alsa="no"
 ])
 if test "$have_alsa" = "yes"; then

-       extras="$extras para_play"
-       play_ldflags="$play_ldflags -lasound"
+       write_errlist_objs="$write_errlist_objs alsa_writer"
+       write_ldflags="$write_ldflags -lasound"

        write_writers="$write_writers alsa"
 fi
 ########################################################################### ortp
        write_writers="$write_writers alsa"
 fi
 ########################################################################### ortp


@@ -296,7 +296,7 @@ recv_objs="$recv_cmdline_objs $recv_errlist_objs"
 filter_objs="$filter_cmdline_objs $filter_errlist_objs"
 audiod_objs="$audiod_cmdline_objs $audiod_errlist_objs"
 server_objs="$server_cmdline_objs $server_errlist_objs"
 filter_objs="$filter_cmdline_objs $filter_errlist_objs"
 audiod_objs="$audiod_cmdline_objs $audiod_errlist_objs"
 server_objs="$server_cmdline_objs $server_errlist_objs"

-play_objs="$play_cmdline_objs $play_errlist_objs"
+write_objs="$write_cmdline_objs $write_errlist_objs"

 
 AC_SUBST(recv_objs, add_dot_o($recv_objs))
 AC_SUBST(recv_ldflags, $recv_ldflags)
 
 AC_SUBST(recv_objs, add_dot_o($recv_objs))
 AC_SUBST(recv_ldflags, $recv_ldflags)


@@ -318,15 +318,15 @@ AC_SUBST(server_ldflags, $server_ldflags)
 AC_DEFINE_UNQUOTED(INIT_SERVER_ERRLISTS,
        objlist_to_errlist($server_errlist_objs), errors used by para_server)
 
 AC_DEFINE_UNQUOTED(INIT_SERVER_ERRLISTS,
        objlist_to_errlist($server_errlist_objs), errors used by para_server)
 

-AC_SUBST(play_objs, add_dot_o($play_objs))
-AC_SUBST(play_ldflags, $play_ldflags)
-AC_DEFINE_UNQUOTED(INIT_PLAY_ERRLISTS,
-       objlist_to_errlist($play_errlist_objs), errors used by para_play)
+AC_SUBST(write_objs, add_dot_o($write_objs))
+AC_SUBST(write_ldflags, $write_ldflags)
+AC_DEFINE_UNQUOTED(INIT_WRITE_ERRLISTS,
+       objlist_to_errlist($write_errlist_objs), errors used by para_write)

 
 enum="$(for i in $write_writers; do printf "${i}_WRITE, " | tr '[a-z]' '[A-Z]'; done)"
 AC_DEFINE_UNQUOTED(WRITER_ENUM, $enum NUM_SUPPORTED_WRITERS,
        enum of supported writers)
 
 enum="$(for i in $write_writers; do printf "${i}_WRITE, " | tr '[a-z]' '[A-Z]'; done)"
 AC_DEFINE_UNQUOTED(WRITER_ENUM, $enum NUM_SUPPORTED_WRITERS,
        enum of supported writers)

-names="$(for i in $write_writers; do printf '\"'$i'\", ' ; done)"
+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)"
 AC_DEFINE_UNQUOTED(DECLARE_WRITER_INITS, $inits, init functions of the supported writers)
 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)"
 AC_DEFINE_UNQUOTED(DECLARE_WRITER_INITS, $inits, init functions of the supported writers)


@@ -352,5 +352,5 @@ ogg vorbis support: $have_ogg
 mp3dec support (libmad): $have_mad
 ortp support: $have_ortp
 unix socket credentials: $have_ucred
 mp3dec support (libmad): $have_mad
 ortp support: $have_ortp
 unix socket credentials: $have_ucred

-alsa support (para_play): $have_alsa
+supported writers for para_write: $write_writers

 ])
 ])