X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=configure.ac;h=e9977e3f740e01b1bf9b99bae27b66f7ba6c1387;hp=fac1ab57bd76cc2d889cec142e4ae945ae5be03f;hb=e0e5a7c1a04c6a2ee4a475e823657e06e6df2f99;hpb=091015d4e9639dec16e87dc5cca9a17176a10031

diff --git a/configure.ac b/configure.ac
index fac1ab57..e9977e3f 100644
--- a/configure.ac
+++ b/configure.ac
@@ -56,24 +56,26 @@ AC_CHECK_LIB([readline], [readline], [],
 AC_CHECK_LIB([menu], [new_menu], [extras="$extras para_dbadm"],
 	[AC_MSG_WARN([libmenu not found,  cannot build para_dbadm])])
 
-########################################################################### 
-recv_cmdline_objs="recv.cmdline http_recv.cmdline"
-recv_errlist_objs="http_recv recv_common recv time string net"
+
+recv_cmdline_objs="recv.cmdline http_recv.cmdline dccp_recv.cmdline"
+recv_errlist_objs="http_recv recv_common recv time string net dccp_recv
+	dccp fd"
 recv_ldflags=""
 
 filter_cmdline_objs="filter.cmdline compress_filter.cmdline"
 filter_errlist_objs="filter_chain wav compress filter string"
 filter_ldflags=""
 
-audiod_cmdline_objs="audiod.cmdline grab_client.cmdline compress_filter.cmdline 
-	http_recv.cmdline"
-audiod_errlist_objs="audiod exec close_on_fork signal string daemon stat net 
-	time grab_client filter_chain wav compress http_recv recv_common ringbuffer"
+audiod_cmdline_objs="audiod.cmdline grab_client.cmdline compress_filter.cmdline
+	http_recv.cmdline dccp_recv.cmdline"
+audiod_errlist_objs="audiod exec close_on_fork signal string daemon stat net
+	time grab_client filter_chain wav compress http_recv dccp dccp_recv recv_common fd"
 audiod_ldflags=""
 
 server_cmdline_objs="server.cmdline"
-server_errlist_objs="server mp3 afs command net string signal random_dbtool time daemon stat
-	crypt http_send db close_on_fork plm_dbtool ipc"
+server_errlist_objs="server mp3 afs command net string signal random_selector
+	time daemon stat crypt http_send db close_on_fork playlist_selector
+	ipc dccp dccp_send fd"
 server_ldflags=""
 
 ########################################################################### ssl
@@ -150,10 +152,10 @@ AC_CHECK_LIB([mysqlclient], [mysql_init], [], [
 ])
 if test "$have_mysql" = "yes"; then
 	server_ldflags="$server_ldflags -lmysqlclient"
-	server_errlist_objs="$server_errlist_objs mysql"
+	server_errlist_objs="$server_errlist_objs mysql_selector"
 	AC_DEFINE(HAVE_MYSQL, 1, [define to 1 to turn on mysql support])
 else
-	AC_MSG_WARN([no libmysqlclient, cannot build mysql-based dbtool])
+	AC_MSG_WARN([cannot build mysql-based audio file selector])
 fi
 ########################################################################### ogg
 have_ogg="yes"
@@ -214,11 +216,6 @@ extras="$extras $play"
 
 ########################################################################### ortp
 have_ortp="yes"
-pkg_modules="glib-2.0 >= 2.0.4"
-PKG_CHECK_MODULES(GLIB, [$pkg_modules], [], [
-	have_ortp="no"
-])
-CPPFLAGS="$CPPFLAGS $GLIB_CFLAGS"
 AC_CHECK_HEADERS([ortp/ortp.h], [], [
 	have_ortp="no"
 ])
@@ -234,9 +231,9 @@ if test "$have_ortp" = "yes"; then
 
 	server_errlist_objs="$server_errlist_objs ortp_send"
 
-	recv_ldflags="$recv_ldflags $GLIB_LIBS -lortp"
-	server_ldflags="$server_ldflags $GLIB_LIBS -lortp"
-	audiod_ldflags="$audiod_ldflags $GLIB_LIBS -lortp"
+	recv_ldflags="$recv_ldflags -lortp"
+	server_ldflags="$server_ldflags -lortp"
+	audiod_ldflags="$audiod_ldflags -lortp"
 	AC_DEFINE(HAVE_ORTP, 1, [define to 1 to turn on ortp support])
 
 else
@@ -299,6 +296,15 @@ AC_SUBST(server_objs, add_dot_o($server_objs))
 AC_SUBST(server_ldflags, $server_ldflags)
 AC_DEFINE_UNQUOTED(INIT_SERVER_ERRLISTS, 
 	objlist_to_errlist($server_errlist_objs), errors used by para_server)
+
+gui_cmdline_objs="gui.cmdline"
+gui_errlist_objs="exec close_on_fork signal string stat ringbuffer fd"
+gui_other_objs="gui gui_common gui_theme"
+gui_objs="$gui_cmdline_objs $gui_errlist_objs $gui_other_objs"
+AC_DEFINE_UNQUOTED(INIT_GUI_ERRLISTS,
+	objlist_to_errlist($gui_errlist_objs), errors used by para_gui)
+AC_SUBST(gui_objs, add_dot_o($gui_objs))
+
 AC_OUTPUT
 AC_MSG_NOTICE([creating Makefile.deps])
 gcc -MM -MG *.c > Makefile.deps