X-Git-Url: http://git.tuebingen.mpg.de/?a=blobdiff_plain;f=configure.ac;h=aef9d1ec9f944c562a97b3cc45351dd7d5b3c27c;hb=8978f426314b107c55a652e0151397fdab2f003e;hp=0ad2106bec7dd19a4f25e2961c8542c0a7322da7;hpb=a05a33be9ed15982aabfa13726317a1fcb13cc19;p=paraslash.git

diff --git a/configure.ac b/configure.ac
index 0ad2106b..aef9d1ec 100644
--- a/configure.ac
+++ b/configure.ac
@@ -71,8 +71,8 @@ AC_CHECK_FUNCS([atexit dup2 memchr memmove memset \
 	strncasecmp strrchr strspn alarm], [],
 	[AC_MSG_ERROR([function not found, cannot live without it])])
 
-all_errlist_objs="server mp3_afh vss command net string signal random_selector time
-daemon stat crypt http_send afs_common close_on_fork playlist_selector ipc dccp
+all_errlist_objs="server mp3_afh afh_common vss command net string signal time
+daemon stat crypt http_send close_on_fork ipc dccp
 dccp_send fd user_list chunk_queue afs osl aft mood score attribute blob ringbuffer
 playlist sha1 rbtree sched audiod grab_client filter_chain wav compress
 http_recv dccp_recv recv_common write_common file_write audiod_command
@@ -87,7 +87,6 @@ recv_ldflags=""
 
 receivers=" http dccp"
 senders=" http dccp"
-selectors=" random playlist"
 
 filter_cmdline_objs="filter.cmdline compress_filter.cmdline"
 filter_errlist_objs="filter_chain wav compress filter string stdin stdout sched fd"
@@ -108,10 +107,9 @@ audiod_errlist_objs="audiod signal string daemon stat net
 audiod_ldflags=""
 audiod_audio_formats=""
 
-server_cmdline_objs="server.cmdline server_command_list random_selector_command_list
-	playlist_selector_command_list afs_command_list"
-server_errlist_objs="server mp3_afh vss command net string signal random_selector
-	time daemon stat crypt http_send afs_common close_on_fork playlist_selector
+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 dccp_send fd user_list chunk_queue afs osl aft mood score attribute
 	blob playlist sha1 rbtree sched"
 server_ldflags=""
@@ -302,44 +300,6 @@ AC_CHECK_LIB([SDL_image], [SDL_Init], [extras="$extras para_sdl_gui"], [
 AC_CHECK_HEADER(SDL/SDL.h, [], 
 	[AC_MSG_WARN([SDL/SDL.h not found])])
 
-########################################################################### mysql
-have_mysql="yes"
-OLD_CPPFLAGS="$CPPFLAGS"
-OLD_LD_FLAGS="$LDFLAGS"
-OLD_LIBS="$LIBS"
-AC_ARG_WITH(mysql_headers, [AC_HELP_STRING(--with-mysql-headers=dir,
-	[look for mysql.h also in dir])])
-if test -n "$with_mysql_headers"; then
-	mysql_cppflags="-I$with_mysql_headers"
-	CPPFLAGS="$CPPFLAGS $mysql_cppflags"
-fi
-AC_ARG_WITH(mysql_libs, [AC_HELP_STRING(--with-mysql-libs=dir,
-	[look for libmysqlclient also in dir])])
-if test -n "$with_mysql_libs"; then
-	mysql_libs="-L$with_mysql_libs"
-	LDFLAGS="$LDFLAGS $mysql_libs"
-fi
-AC_CHECK_HEADER(mysql/mysql.h, [], [
-	have_mysql="no"
-])
-AC_CHECK_LIB([mysqlclient], [mysql_init], [], [
-	have_mysql="no"
-])
-if test "$have_mysql" = "yes"; then
-	selectors="$selectors mysql"
-	server_ldflags="$server_ldflags $mysql_libs -lmysqlclient"
-	server_errlist_objs="$server_errlist_objs mysql_selector"
-	all_errlist_objs="$all_errlist_objs mysql_selector"
-	server_cmdline_objs="$server_cmdline_objs mysql_selector_command_list"
-	AC_SUBST(mysql_cppflags)
-	AC_SUBST(mysql_libs)
-	AC_DEFINE(HAVE_MYSQL, 1, [define to 1 to turn on mysql support])
-else
-	AC_MSG_WARN([cannot build mysql-based audio file selector])
-fi
-CPPFLAGS="$OLD_CPPFLAGS"
-LDFLAGS="$OLD_LDFLAGS"
-LIBS="$OLD_LIBS"
 ########################################################################### ogg
 have_ogg="yes"
 OLD_CPPFLAGS="$CPPFLAGS"
@@ -708,12 +668,11 @@ AC_DEFINE_UNQUOTED(AUDIOD_AUDIO_FORMAT_ARRAY, $names, array of audio formats sup
 
 AC_OUTPUT
 AC_MSG_NOTICE([creating Makefile.deps])
-gcc -MM -MG $mysql_cppflags $faad_cppflags $mad_cppflags $ortp_cppflags $oggvorbis_cppflags *.c > Makefile.deps
+gcc -MM -MG $faad_cppflags $mad_cppflags $ortp_cppflags $oggvorbis_cppflags *.c > Makefile.deps
 AC_MSG_NOTICE([
 paraslash configuration:
 ~~~~~~~~~~~~~~~~~~~~~~~~
 unix socket credentials: $have_ucred
-audio file selectors supported by para_server: $selectors
 audio formats supported by para_server: $server_audio_formats
 senders supported by para_server/para_send: $senders
 receivers supported by para_audiod/para_recv: $receivers