para_play: introduce struct private_alsa_data

[paraslash.git] / configure.ac

diff --git a/configure.ac b/configure.ac
index 0c40b4d76bd3cfbf0697a0dbf1c41a2756a4de09..61b1808ae74a48d71584230f186227808c84d1ee 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -51,8 +51,6 @@ AC_CHECK_FUNCS([atexit dup2 gethostbyname inet_ntoa memchr memmove memset \
 AC_CHECK_LIB([ncurses], [initscr], [], 
        [AC_MSG_ERROR([libncurses not found])])
 
-AC_CHECK_LIB([readline], [readline], [], 
-       [AC_MSG_ERROR([libreadline not found])])
 AC_CHECK_LIB([menu], [new_menu], [extras="$extras para_dbadm"],
        [AC_MSG_WARN([libmenu not found,  cannot build para_dbadm])])
 
@@ -78,6 +76,10 @@ server_errlist_objs="server mp3 afs command net string signal random_selector
        ipc dccp dccp_send fd"
 server_ldflags=""
 
+play_cmdline_objs="play.cmdline"
+play_errlist_objs="play time fd string"
+play_ldflags=""
+
 ########################################################################### ssl
 dnl @synopsis CHECK_SSL
 dnl
@@ -215,19 +217,20 @@ else
        AC_MSG_WARN([no mp3dec support in para_audiod/para_filter])
 fi
 ########################################################################### alsa
-play="para_play"
-msg="will not build para_play"
+have_alsa="yes"
+msg="=> no para_play"
 AC_CHECK_HEADERS([alsa/asoundlib.h], [], [
-       AC_MSG_WARN([no alsa/asoundlib, $msg])
-       play=""
+       AC_MSG_WARN([no alsa/asoundlib $msg])
+       have_alsa="no"
 ])
 AC_CHECK_LIB([asound], [snd_pcm_open], [], [
-       AC_MSG_WARN([no libasound, $msg])
-       play=""
+       AC_MSG_WARN([no libasound $msg])
+       have_alsa="no"
 ])
-extras="$extras $play"
-
-
+if test "$have_alsa" = "yes"; then
+       extras="$extras para_play"
+       play_ldflags="$play_ldflags -lasound"
+fi
 ########################################################################### ortp
 have_ortp="yes"
 AC_CHECK_HEADERS([ortp/ortp.h], [], [
@@ -290,6 +293,7 @@ recv_objs="$recv_cmdline_objs $recv_errlist_objs"
 filter_objs="$filter_cmdline_objs $filter_errlist_objs"
 audiod_objs="$audiod_cmdline_objs $audiod_errlist_objs"
 server_objs="$server_cmdline_objs $server_errlist_objs"
+play_objs="$play_cmdline_objs $play_errlist_objs"
 
 AC_SUBST(recv_objs, add_dot_o($recv_objs))
 AC_SUBST(recv_ldflags, $recv_ldflags)
@@ -298,7 +302,7 @@ AC_DEFINE_UNQUOTED(INIT_RECV_ERRLISTS, objlist_to_errlist($recv_errlist_objs),
 
 AC_SUBST(filter_objs, add_dot_o($filter_objs))
 AC_SUBST(filter_ldflags, $filter_ldflags)
-AC_DEFINE_UNQUOTED(INIT_FILTER_ERRLISTS, 
+AC_DEFINE_UNQUOTED(INIT_FILTER_ERRLISTS,
        objlist_to_errlist($filter_errlist_objs), errors used by para_filter)
 
 AC_SUBST(audiod_objs, add_dot_o($audiod_objs))
@@ -308,9 +312,14 @@ AC_DEFINE_UNQUOTED(INIT_AUDIOD_ERRLISTS, objlist_to_errlist($audiod_errlist_objs
 
 AC_SUBST(server_objs, add_dot_o($server_objs))
 AC_SUBST(server_ldflags, $server_ldflags)
-AC_DEFINE_UNQUOTED(INIT_SERVER_ERRLISTS, 
+AC_DEFINE_UNQUOTED(INIT_SERVER_ERRLISTS,
        objlist_to_errlist($server_errlist_objs), errors used by para_server)
 
+AC_SUBST(play_objs, add_dot_o($play_objs))
+AC_SUBST(play_ldflags, $play_ldflags)
+AC_DEFINE_UNQUOTED(INIT_PLAY_ERRLISTS,
+       objlist_to_errlist($play_errlist_objs), errors used by para_play)
+
 gui_cmdline_objs="gui.cmdline"
 gui_errlist_objs="exec close_on_fork signal string stat ringbuffer fd"
 gui_other_objs="gui gui_common gui_theme"
@@ -330,4 +339,5 @@ ogg vorbis support: $have_ogg
 mp3dec support (libmad): $have_mad
 ortp support: $have_ortp
 unix socket credentials: $have_ucred
+alsa support (para_play): $have_alsa
 ])