X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=configure.ac;h=afb993af265065e7082adcf9ebbececa99f11b57;hp=664280ac9a4835e8e5fe1209584fb25217e2554a;hb=de9a70360fcd3b5285d280ad1f229f679d453603;hpb=5ba8f6dff01904907d1dcfaa1555c8ceb5a72c90

diff --git a/configure.ac b/configure.ac
index 664280ac..afb993af 100644
--- a/configure.ac
+++ b/configure.ac
@@ -83,17 +83,18 @@ daemon stat crypt http_send close_on_fork ipc acl afh fade amp_filter
 dccp_send fd user_list chunk_queue afs osl aft mood score attribute blob ringbuffer
 playlist sha1 rbtree sched audiod grab_client filter_common wav_filter compress_filter
 http_recv dccp_recv recv_common write_common file_write audiod_command
-client_common recv stdout filter stdin audioc write client fsck exec send_common ggo"
+client_common recv stdout filter stdin audioc write client fsck exec send_common ggo
+udp_recv udp_send color"
 
 all_executables="server recv filter audioc write client fsck afh"
 
-recv_cmdline_objs="recv.cmdline http_recv.cmdline dccp_recv.cmdline"
+recv_cmdline_objs="recv.cmdline http_recv.cmdline dccp_recv.cmdline udp_recv.cmdline"
 recv_errlist_objs="http_recv recv_common recv time string net dccp_recv
-	fd sched stdout ggo"
+	fd sched stdout ggo udp_recv"
 recv_ldflags=""
 
-receivers=" http dccp"
-senders=" http dccp"
+receivers=" http dccp udp"
+senders=" http dccp udp"
 
 filter_cmdline_objs="filter.cmdline compress_filter.cmdline amp_filter.cmdline"
 filter_errlist_objs="filter_common wav_filter compress_filter filter string stdin stdout sched fd amp_filter ggo"
@@ -106,11 +107,11 @@ audioc_ldflags=""
 
 audiod_cmdline_objs="audiod.cmdline grab_client.cmdline compress_filter.cmdline
 	http_recv.cmdline dccp_recv.cmdline file_write.cmdline client.cmdline
-	audiod_command_list amp_filter.cmdline"
+	audiod_command_list amp_filter.cmdline udp_recv.cmdline"
 audiod_errlist_objs="audiod signal string daemon stat net
 	time grab_client filter_common wav_filter compress_filter amp_filter http_recv dccp_recv
 	recv_common fd sched write_common file_write audiod_command crypt
-	client_common ggo"
+	client_common ggo udp_recv color"
 audiod_ldflags=""
 audiod_audio_formats=""
 
@@ -122,7 +123,7 @@ server_cmdline_objs="server.cmdline server_command_list afs_command_list"
 server_errlist_objs="server afh_common mp3_afh vss command net string signal
 	time daemon stat crypt http_send close_on_fork
 	ipc dccp_send fd user_list chunk_queue afs osl aft mood score attribute
-	blob playlist sha1 rbtree sched acl send_common"
+	blob playlist sha1 rbtree sched acl send_common udp_send color"
 server_ldflags=""
 server_audio_formats=" mp3"
 
@@ -500,52 +501,6 @@ fi
 CPPFLAGS="$OLD_CPPFLAGS"
 LDFLAGS="$OLD_LDFLAGS"
 LIBS="$OLD_LIBS"
-########################################################################### ortp
-have_ortp="yes"
-OLD_CPPFLAGS="$CPPFLAGS"
-OLD_LD_FLAGS="$LDFLAGS"
-OLD_LIBS="$LIBS"
-AC_ARG_WITH(ortp_headers, [AC_HELP_STRING(--with-ortp-headers=dir,
-	[look for ortp/ortp.h also in dir])])
-if test -n "$with_ortp_headers"; then
-	ortp_cppflags="-I$with_ortp_headers"
-	CPPFLAGS="$CPPFLAGS $ortp_cppflags"
-fi
-AC_ARG_WITH(ortp_libs, [AC_HELP_STRING(--with-ortp-libs=dir,
-	[look for libortp also in dir])])
-if test -n "$with_ortp_libs"; then
-	ortp_libs="-L$with_ortp_libs"
-	LDFLAGS="$LDFLAGS $ortp_libs"
-fi
-AC_CHECK_HEADERS([ortp/ortp.h], [], [have_ortp="no"])
-AC_CHECK_LIB([ortp], [ortp_init], [], [have_ortp="no"])
-if test "$have_ortp" = "yes"; then
-	all_errlist_objs="$all_errlist_objs ortp_recv ortp_send"
-
-	recv_cmdline_objs="$recv_cmdline_objs ortp_recv.cmdline"
-	recv_errlist_objs="$recv_errlist_objs ortp_recv"
-
-	audiod_cmdline_objs="$audiod_cmdline_objs ortp_recv.cmdline"
-	audiod_errlist_objs="$audiod_errlist_objs ortp_recv"
-
-	server_errlist_objs="$server_errlist_objs ortp_send"
-
-	recv_ldflags="$recv_ldflags $ortp_libs -lortp"
-	server_ldflags="$server_ldflags $ortp_libs -lortp"
-	audiod_ldflags="$audiod_ldflags $ortp_libs -lortp"
-
-	receivers="$receivers ortp"
-	senders="$senders ortp"
-	AC_DEFINE(HAVE_ORTP, 1, [define to 1 to turn on ortp support])
-	AC_SUBST(ortp_cppflags)
-	AC_SUBST(ortp_libs)
-else
-	AC_MSG_NOTICE([deactivating ortp sender/receiver])
-fi
-CPPFLAGS="$OLD_CPPFLAGS"
-LDFLAGS="$OLD_LDFLAGS"
-LIBS="$OLD_LIBS"
-
 
 AC_SUBST(extra_binaries, [$extras])
 AC_SUBST(extra_filter_objs, [$extra_filter_objs])
@@ -735,7 +690,7 @@ AC_DEFINE_UNQUOTED(AUDIOD_AUDIO_FORMAT_ARRAY, $names, array of audio formats sup
 
 AC_OUTPUT
 AC_MSG_NOTICE([creating Makefile.deps])
-gcc -MM -MG $faad_cppflags $mad_cppflags $ortp_cppflags $oggvorbis_cppflags *.c > Makefile.deps
+gcc -MM -MG $faad_cppflags $mad_cppflags $oggvorbis_cppflags *.c > Makefile.deps
 AC_MSG_NOTICE([
 paraslash configuration:
 ~~~~~~~~~~~~~~~~~~~~~~~~