simplify setup_default_wng()

[paraslash.git] / configure.ac

diff --git a/configure.ac b/configure.ac
index e980b080b1a08c7e3bce92dedb61f6aaa79e8639..cb7ad163536eaaf8c7edfdaa4618248702e612f3 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -72,7 +72,8 @@ audioc_cmdline_objs="audioc.cmdline"
 audioc_errlist_objs="audioc string net fd"
 
 audiod_cmdline_objs="audiod.cmdline grab_client.cmdline compress_filter.cmdline
-       http_recv.cmdline dccp_recv.cmdline file_write.cmdline client.cmdline"
+       http_recv.cmdline dccp_recv.cmdline file_write.cmdline client.cmdline
+       audiod_command_list"
 audiod_errlist_objs="audiod signal string daemon stat net
        time grab_client filter_chain wav compress http_recv dccp dccp_recv
        recv_common fd sched write_common file_write audiod_command crypt
@@ -80,7 +81,8 @@ audiod_errlist_objs="audiod signal string daemon stat net
 audiod_ldflags=""
 audiod_audio_formats=""
 
-server_cmdline_objs="server.cmdline"
+server_cmdline_objs="server.cmdline server_command_list random_selector_command_list
+       playlist_selector_command_list"
 server_errlist_objs="server mp3_afh vss command net string signal random_selector
        time daemon stat crypt http_send db close_on_fork playlist_selector
        ipc dccp dccp_send fd user_list"
@@ -91,6 +93,7 @@ write_cmdline_objs="write.cmdline file_write.cmdline"
 write_errlist_objs="write write_common file_write time fd string sched stdin"
 write_ldflags=""
 writers=" file"
+default_writer="FILE_WRITE"
 
 client_cmdline_objs="client.cmdline"
 client_errlist_objs="client net string crypt fd sched stdin stdout client_common"
@@ -182,6 +185,7 @@ if test ${have_core_audio} = yes; then
        write_cmdline_objs="$write_cmdline_objs osx_write.cmdline"
        write_ldflags="$write_ldflags $f"
        writers="$writers osx"
+       default_writer="OSX_WRITE"
        AC_DEFINE(HAVE_CORE_AUDIO, 1, define to 1 on Mac Os X)
 fi
 ########################################################################### gtk2
@@ -240,6 +244,7 @@ if test "$have_mysql" = "yes"; then
        selectors="$selectors mysql"
        server_ldflags="$server_ldflags $mysql_libs -lmysqlclient"
        server_errlist_objs="$server_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])
@@ -402,6 +407,7 @@ if test "$have_alsa" = "yes"; then
        write_cmdline_objs="$write_cmdline_objs alsa_write.cmdline"
        write_ldflags="$write_ldflags -lasound"
        writers="$writers alsa"
+       default_writer="ALSA_WRITE"
 fi
 CPPFLAGS="$OLD_CPPFLAGS"
 LDFLAGS="$OLD_LDFLAGS"
@@ -529,6 +535,7 @@ AC_DEFINE_UNQUOTED(INIT_AUDIOC_ERRLISTS,
 enum="$(for i in $writers; do printf "${i}_WRITE, " | tr '[a-z]' '[A-Z]'; done)"
 AC_DEFINE_UNQUOTED(WRITER_ENUM, $enum NUM_SUPPORTED_WRITERS,
        enum of supported writers)
+AC_DEFINE_UNQUOTED(DEFAULT_WRITER, $default_writer, use this writer if none was specified)
 names="$(for i in $writers; do printf \"$i\",' ' ; done)"
 AC_DEFINE_UNQUOTED(WRITER_NAMES, $names, supported writer names)
 inits="$(for i in $writers; do printf 'extern void '$i'_write_init(struct writer *); '; done)"