introduce para_select()

[paraslash.git] / configure.ac

diff --git a/configure.ac b/configure.ac
index fd34ed900790d90cd0eee4da239699ebcc00bb9e..f6b8733eb06e9f84f7e4810934b0acd3b89168d0 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -58,7 +58,8 @@ AC_CHECK_LIB([menu], [new_menu], [extras="$extras para_dbadm"],
 
 
 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"
+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"
@@ -68,12 +69,13 @@ filter_ldflags=""
 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 ringbuffer"
+       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_selector
-       time daemon stat crypt http_send db close_on_fork playlist_selector ipc dccp dccp_send"
+       time daemon stat crypt http_send db close_on_fork playlist_selector
+       ipc dccp dccp_send fd"
 server_ldflags=""
 
 ########################################################################### ssl
@@ -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