X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=configure.ac;h=f0754926397ec97afe04ee3afc45ec14d745cfeb;hp=bfd659f18dbc8ae534b732269f3a3b982e350b42;hb=959d66719258a7b3d5028e5e6770972768621a4f;hpb=773bdfd137b4d4bb350903a1cb6b25ef304b3e0a

diff --git a/configure.ac b/configure.ac
index bfd659f1..f0754926 100644
--- 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=""
 
-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"
 
 
@@ -220,7 +220,7 @@ else
 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"
@@ -230,18 +230,25 @@ AC_CHECK_LIB([asound], [snd_pcm_open], [], [
 	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
 have_ortp="yes"
-AC_CHECK_HEADERS([ortp/ortp.h], [], [
-	have_ortp="no"
-])
-AC_CHECK_LIB([ortp], [ortp_init], [], [
-	have_ortp="no"
-])
+AC_ARG_ENABLE(ortp, AC_HELP_STRING([--disable-ortp], [Disable ortp support]),
+	if test x$enableval = xno; then
+		have_ortp=no
+	fi
+)
+if test "$have_ortp" = "yes"; then
+	AC_CHECK_HEADERS([ortp/ortp.h], [], [
+		have_ortp="no"
+	])
+	AC_CHECK_LIB([ortp], [ortp_init], [], [
+		have_ortp="no"
+	])
+fi
 if test "$have_ortp" = "yes"; then
 	recv_cmdline_objs="$recv_cmdline_objs ortp_recv.cmdline"
 	recv_errlist_objs="$recv_errlist_objs ortp_recv"
@@ -257,7 +264,7 @@ if test "$have_ortp" = "yes"; then
 	AC_DEFINE(HAVE_ORTP, 1, [define to 1 to turn on ortp support])
 
 else
-	AC_MSG_WARN([deactivating ortp support])
+	AC_MSG_NOTICE([deactivating ortp support])
 fi
 AC_SUBST(GLIB_CFLAGS)
 AC_SUBST(GLIB_LIBS)
@@ -296,7 +303,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"
-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)
@@ -318,15 +325,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_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)
-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)
@@ -352,5 +359,5 @@ ogg vorbis support: $have_ogg
 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
 ])