db.c: use PARA_STRERROR()...

[paraslash.git] / configure.ac

diff --git a/configure.ac b/configure.ac
index 224d840aed872e2cd26f75e0d46a7e7ae50f765d..7c1cfc98cbd0c569a10f988469ec80634e39c143 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -72,8 +72,8 @@ audiod_errlist_objs="audiod exec close_on_fork signal string daemon stat net
 audiod_ldflags=""
 
 server_cmdline_objs="server.cmdline"
 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 dccp dccp_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"

 server_ldflags=""
 
 ########################################################################### ssl
 server_ldflags=""
 
 ########################################################################### ssl


@@ -150,10 +150,10 @@ AC_CHECK_LIB([mysqlclient], [mysql_init], [], [
 ])
 if test "$have_mysql" = "yes"; then
        server_ldflags="$server_ldflags -lmysqlclient"
 ])
 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_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"
 fi
 ########################################################################### ogg
 have_ogg="yes"


@@ -214,11 +214,6 @@ extras="$extras $play"
 
 ########################################################################### ortp
 have_ortp="yes"
 
 ########################################################################### 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"
 ])
 AC_CHECK_HEADERS([ortp/ortp.h], [], [
        have_ortp="no"
 ])


@@ -234,9 +229,9 @@ if test "$have_ortp" = "yes"; then
 
        server_errlist_objs="$server_errlist_objs ortp_send"
 
 
        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
        AC_DEFINE(HAVE_ORTP, 1, [define to 1 to turn on ortp support])
 
 else