introduce para_select()

[paraslash.git] / configure.ac

diff --git a/configure.ac b/configure.ac
index 0e93aa2190c4938f2d6ba9f9e50243e4b439942d..f6b8733eb06e9f84f7e4810934b0acd3b89168d0 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -4,7 +4,7 @@
 AC_PREREQ(2.53)
 
 
-AC_INIT(paraslash, [cvs], maan@systemlinux.org)
+AC_INIT(paraslash, [git], maan@systemlinux.org)
 AC_CONFIG_HEADER([config.h])
 
 ########################################################################### generic
@@ -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