Use sideband also for challenge response.
[paraslash.git] / configure.ac
index a2e5fed..c616b0a 100644 (file)
@@ -92,23 +92,22 @@ AC_SUBST(cmdline_dir)
 AC_DEFUN([add_cmdline],[$(for i in $@; do printf "${i}.cmdline "; done)])
 
 
-all_errlist_objs="server mp3_afh afh_common vss command net string signal time
-daemon stat http_send close_on_fork ipc acl afh fade amp_filter
-dccp_send fd user_list chunk_queue afs aft mood score attribute blob ringbuffer
-playlist sched audiod grab_client filter_common wav_filter compress_filter
-http_recv dccp_recv recv_common write_common file_write audiod_command
-client_common recv stdout filter stdin audioc write client exec send_common ggo
-udp_recv udp_send color fec fecdec_filter prebuffer_filter mm
-server_command_list afs_command_list audiod_command_list bitstream imdct wma_afh
-wma_common wmadec_filter buffer_tree crypt_common
-"
+all_errlist_objs="mp3_afh afh_common net string signal time daemon
+       stat afh fade amp_filter fd ringbuffer sched audiod
+       grab_client filter_common wav_filter compress_filter http_recv
+       dccp_recv recv_common write_common file_write audiod_command
+       client_common recv stdout filter stdin audioc write client
+       exec send_common ggo udp_recv color fec fecdec_filter
+       prebuffer_filter audiod_command_list bitstream imdct
+       wma_afh wma_common wmadec_filter buffer_tree crypt_common
+       gui gui_theme sideband"
 
 executables="recv filter audioc write client afh audiod"
 
 recv_cmdline_objs="add_cmdline(recv http_recv dccp_recv udp_recv)"
 
 recv_errlist_objs="http_recv recv_common recv time string net dccp_recv
-       fd sched stdout ggo udp_recv fec buffer_tree"
+       fd sched stdout ggo udp_recv buffer_tree"
 recv_ldflags=""
 
 filter_cmdline_objs="add_cmdline(filter compress_filter amp_filter prebuffer_filter)"
@@ -123,7 +122,7 @@ audioc_errlist_objs="audioc string net fd"
 audioc_ldflags=""
 
 audiod_cmdline_objs="add_cmdline(audiod compress_filter http_recv dccp_recv file_write client amp_filter udp_recv prebuffer_filter)"
-audiod_errlist_objs="audiod signal string daemon stat net crypt_common
+audiod_errlist_objs="audiod signal string daemon stat net crypt_common sideband
        time grab_client filter_common wav_filter compress_filter amp_filter http_recv dccp_recv
        recv_common fd sched write_common file_write audiod_command fecdec_filter
        client_common ggo udp_recv color fec prebuffer_filter audiod_command_list
@@ -135,15 +134,6 @@ afh_cmdline_objs="add_cmdline(afh)"
 afh_errlist_objs="afh string fd mp3_afh afh_common time wma_afh wma_common"
 afh_ldflags=""
 
-server_cmdline_objs="add_cmdline(server)"
-server_errlist_objs="server afh_common mp3_afh vss command net string signal
-       time daemon http_send close_on_fork mm crypt_common
-       ipc dccp_send fd user_list chunk_queue afs aft mood score attribute
-       blob playlist sched acl send_common udp_send color fec
-       server_command_list afs_command_list wma_afh wma_common"
-server_ldflags=""
-server_audio_formats="mp3 wma"
-
 write_cmdline_objs="add_cmdline(write file_write)"
 write_errlist_objs="write write_common file_write time fd string sched stdin
        buffer_tree ggo"
@@ -152,14 +142,13 @@ writers=" file"
 default_writer="FILE_WRITE"
 
 client_cmdline_objs="add_cmdline(client)"
-client_errlist_objs="client net string fd sched stdin stdout time
+client_errlist_objs="client net string fd sched stdin stdout time sideband
        client_common buffer_tree crypt_common"
 client_ldflags=""
 
 gui_cmdline_objs="add_cmdline(gui)"
-gui_errlist_objs="exec signal string stat ringbuffer fd"
-gui_other_objs="gui gui_theme"
-gui_objs="$gui_cmdline_objs $gui_errlist_objs $gui_other_objs"
+gui_errlist_objs="exec signal string stat ringbuffer fd gui gui_theme"
+gui_objs="$gui_cmdline_objs $gui_errlist_objs"
 
 fade_cmdline_objs="add_cmdline(fade)"
 fade_errlist_objs="fade exec string fd"
@@ -275,6 +264,21 @@ or execute
 else
        extras="$extras server"
        executables="$executables server"
+       server_cmdline_objs="add_cmdline(server)"
+       server_errlist_objs="server afh_common mp3_afh vss command net
+               string signal time daemon http_send close_on_fork mm
+               crypt_common ipc dccp_send fd user_list chunk_queue
+               afs aft mood score attribute blob playlist sched acl
+               send_common udp_send color fec server_command_list
+               afs_command_list wma_afh wma_common sideband"
+
+       all_errlist_objs="$all_errlist_objs server vss command
+               http_send close_on_fork mm ipc dccp_send user_list
+               chunk_queue afs aft mood score attribute blob playlist
+               acl udp_send server_command_list afs_command_list"
+
+       server_ldflags=""
+       server_audio_formats="mp3 wma"
        AC_SUBST(osl_cppflags)
        server_ldflags="$server_ldflags $osl_libs -losl"
 fi
@@ -501,6 +505,12 @@ if test ${have_core_audio} = yes; then
        f="$f1 $f2 $f3 $f4"
 
        all_errlist_objs="$all_errlist_objs osx_write"
+       # ipc is linked into para_server server and into the osx writer. If osl
+       # was not found, para_server will not be built and ipc has not yet been
+       # added to the list of all objects, so we must add it here.
+       if test "$have_osl" = "no"; then
+               all_errlist_objs="$all_errlist_objs ipc"
+       fi
        audiod_errlist_objs="$audiod_errlist_objs osx_write ipc"
        audiod_cmdline_objs="$audiod_cmdline_objs osx_write.cmdline"
        audiod_ldflags="$audiod_ldflags $f"
@@ -568,6 +578,7 @@ if test "$have_ogg" = "yes"; then
        AC_CHECK_LIB([speex], [speex_decoder_init], [], [ have_speex="no" ])
        AC_CHECK_HEADERS([speex/speex.h], [], [ have_speex="no" ])
 else
+       AC_MSG_WARN([vorbis/speex depend on libogg, which was not detected])
        have_vorbis="no"
        have_speex="no"
 fi
@@ -586,8 +597,6 @@ if test "$have_vorbis" = "yes" || test "$have_speex" = "yes"; then
        all_errlist_objs="$all_errlist_objs ogg_afh_common"
        afh_errlist_objs="$afh_errlist_objs ogg_afh_common"
        server_errlist_objs="$server_errlist_objs ogg_afh_common"
-else
-       AC_MSG_WARN([vorbis/speex require ogg])
 fi
 if test "$have_vorbis" = "yes"; then
        all_errlist_objs="$all_errlist_objs oggdec_filter ogg_afh"
@@ -715,20 +724,43 @@ CPPFLAGS="$OLD_CPPFLAGS"
 LDFLAGS="$OLD_LDFLAGS"
 LIBS="$OLD_LIBS"
 ###################################################################### libid3tag
+OLD_CPPFLAGS="$CPPFLAGS"
+OLD_LD_FLAGS="$LDFLAGS"
+OLD_LIBS="$LIBS"
+
+have_libid3tag="yes"
+AC_ARG_WITH(id3tag_headers, [AC_HELP_STRING(--with-id3tag-headers=dir,
+       [look for id3tag header files also in dir])])
+if test -n "$with_id3tag_headers"; then
+       id3tag_cppflags="-I$with_id3tag_headers"
+       CPPFLAGS="$CPPFLAGS $id3tag_cppflags"
+fi
+AC_ARG_WITH(id3tag_libs, [AC_HELP_STRING(--with-id3tag-libs=dir,
+       [look for id3tag libs also in dir])])
+if test -n "$with_id3tag_libs"; then
+       id3tag_libs="-L$with_id3tag_libs"
+       LDFLAGS="$LDFLAGS $id3tag_libs"
+fi
+
 AC_MSG_CHECKING(for libid3tag)
 AC_TRY_LINK([
        #include <id3tag.h>
 ],[
        struct id3_tag t = {.flags = 0};
-],[have_libid3tag=yes],[have_libid3tag=no])
+],[], [have_libid3tag=no])
 AC_MSG_RESULT($have_libid3tag)
+
 if test ${have_libid3tag} = yes; then
        AC_DEFINE(HAVE_LIBID3TAG, 1, define to 1 you have libid3tag)
-       server_ldflags="$server_ldflags -lid3tag"
-       afh_ldflags="$afh_ldflags -lid3tag"
+       server_ldflags="$server_ldflags $id3tag_libs -lid3tag -lz"
+       afh_ldflags="$afh_ldflags $id3tag_libs -lid3tag -lz"
+       AC_SUBST(id3tag_cppflags)
 else
        AC_MSG_WARN([no support for id3v2 tags])
 fi
+CPPFLAGS="$OLD_CPPFLAGS"
+LDFLAGS="$OLD_LDFLAGS"
+LIBS="$OLD_LIBS"
 ########################################################################### flac
 OLD_CPPFLAGS="$CPPFLAGS"
 OLD_LD_FLAGS="$LDFLAGS"
@@ -748,7 +780,7 @@ if test -n "$with_flac_libs"; then
        LDFLAGS="$LDFLAGS $flac_libs"
 fi
 AC_CHECK_HEADER(FLAC/stream_decoder.h, [], have_flac=no)
-AC_CHECK_LIB([FLAC], [FLAC__stream_decoder_init_file], [], have_flac=no)
+AC_CHECK_LIB([FLAC], [FLAC__stream_decoder_init_file], [], have_flac=no, -logg -lm)
 if test "$have_flac" = "yes"; then
        AC_DEFINE(HAVE_FLAC, 1, define to 1 if you want to build the flacdec filter)
        all_errlist_objs="$all_errlist_objs flacdec_filter flac_afh"
@@ -905,7 +937,69 @@ fi
 CPPFLAGS="$OLD_CPPFLAGS"
 LDFLAGS="$OLD_LDFLAGS"
 LIBS="$OLD_LIBS"
+############################################################# readline
+OLD_CPPFLAGS="$CPPFLAGS"
+OLD_LD_FLAGS="$LDFLAGS"
+OLD_LIBS="$LIBS"
+
+have_readline="yes"
+AC_ARG_WITH(readline_headers, [AC_HELP_STRING(--with-readline-headers=dir,
+       [look for libreadline header files also in dir])])
+if test -n "$with_readline_headers"; then
+       readline_cppflags="-I$with_readline_headers"
+       CPPFLAGS="$CPPFLAGS $readline_cppflags"
+fi
 
+AC_ARG_WITH(readline_libs, [AC_HELP_STRING(--with-readline-libs=dir,
+       [look for readline library also in dir])])
+if test -n "$with_readline_libs"; then
+       readline_libs="-L$with_readline_libs"
+       LDFLAGS="$LDFLAGS $readline_libs"
+fi
+msg="no interactive cli support"
+AC_CHECK_HEADERS([readline/readline.h], [
+       ], [
+       have_readline="no"
+       AC_MSG_WARN([readline/readline.h not found, $msg])
+])
+if test "$have_readline" = "yes"; then
+       readline_libs="$readline_libs -lreadline"
+       AC_SEARCH_LIBS([rl_replace_line], [readline], [], [have_readline="no"])
+       if test "$have_readline" = "no"; then # try with -lcurses
+                # clear cache
+               AC_MSG_NOTICE([trying again with -lcurses])
+                unset ac_cv_search_rl_replace_line 2> /dev/null
+               AC_SEARCH_LIBS([rl_replace_line], [readline], [
+                       have_readline=yes
+                       readline_libs="$readline_libs -lcurses"
+               ], [], [-lcurses])
+       fi
+       if test "$have_readline" = "no"; then # try with -ltermcap
+                # clear cache
+               AC_MSG_NOTICE([trying again with -ltermcap])
+                unset ac_cv_search_rl_replace_line 2> /dev/null
+               AC_SEARCH_LIBS([rl_replace_line], [readline], [
+                       have_readline=yes
+                       readline_libs="$readline_libs -ltermcap"
+               ], [], [-ltermcap])
+       fi
+fi
+
+if test "$have_readline" = "yes"; then
+       all_errlist_objs="$all_errlist_objs interactive"
+       client_errlist_objs="$client_errlist_objs interactive"
+       client_ldflags="$client_ldflags $readline_libs"
+       audioc_errlist_objs="$audioc_errlist_objs buffer_tree interactive sched time"
+       audioc_ldflags="$audioc_ldflags $readline_libs"
+       AC_SUBST(readline_cppflags)
+       AC_DEFINE(HAVE_READLINE, 1, define to 1 to turn on readline support)
+else
+       AC_MSG_WARN([libreadline not found or unusable])
+fi
+CPPFLAGS="$OLD_CPPFLAGS"
+LDFLAGS="$OLD_LDFLAGS"
+LIBS="$OLD_LIBS"
+#############################################################
 
 
 AC_SUBST(install_sh, [$INSTALL])
@@ -1048,6 +1142,7 @@ AC_MSG_NOTICE([
 paraslash configuration:
 ~~~~~~~~~~~~~~~~~~~~~~~~
 unix socket credentials: $have_ucred
+readline (interactive CLIs): $have_readline
 audio formats supported by para_server/para_afh: $server_audio_formats
 id3 version2 support: $have_libid3tag
 filters supported by para_audiod/para_filter: $filters