Merge branch 'maint'

diff --combined configure.ac
index 73e97997162e7435c0ad9db22494049904af4b82,55b38e548f5f40d77b801e73f25a2202c2d4f794..85d3088689f3980eaccb75562d36cea4f0a85b55
--- 1/configure.ac
--- 2/configure.ac
+++ b/configure.ac
@@@ -3,11 -3,13 +3,11 @@@
  
  AC_PREREQ([2.61])
  
 -
  AC_INIT([paraslash],[git],[maan@systemlinux.org])
  AC_CONFIG_HEADER([config.h])
  
  AC_CONFIG_FILES([Makefile])
  AC_DEFUN([add_dot_o],[$(for i in $@; do printf "$i.o "; done)])
 -AC_DEFUN([add_para],[$(for i in $@; do printf "para_$i "; done)])
  AC_DEFUN([objlist_to_errlist],[$(for i in $@; do printf "DEFINE_ERRLIST($(echo $i| tr 'a-z' 'A-Z'));"; done) [const char **para_errlist[[]]] = {$(for i in $@; do printf "PARA_ERRLIST($(echo $i | tr 'a-z' 'A-Z')), "; done) }])
  AC_PATH_PROG(UNAMEPATH, uname, no)
  if test "$UNAMEPATH" = "no"; then
@@@ -694,7 -696,7 +694,7 @@@ if test "$have_ogg" = "yes"; the
                CPPFLAGS="$CPPFLAGS $opus_cppflags"
        fi
        if test -n "$with_opus_libs"; then
-               speex_libs="-L$with_opus_libs"
+               opus_libs="-L$with_opus_libs"
                LDFLAGS="$LDFLAGS $opus_libs"
        fi
        AC_CHECK_LIB([opus], [opus_multistream_decode], [], [ have_opus="no" ])
@@@ -1323,7 -1325,7 +1323,7 @@@ AC_DEFINE_UNQUOTED(STATUS_ITEM_ARRAY, [
  AC_DEFINE_UNQUOTED(AUDIO_FORMAT_HANDLERS, "$audio_format_handlers",
        [formats supported by para_server and para_afh])
  
 -AC_SUBST(executables, add_para($executables))
 +AC_SUBST(executables)
  
  recv_objs="$recv_cmdline_objs $recv_errlist_objs"
  filter_objs="$filter_cmdline_objs $filter_errlist_objs"