From: Andre Noll <maan@systemlinux.org>
Date: Sun, 22 Sep 2013 00:12:29 +0000 (+0200)
Subject: Merge branch 'maint'
X-Git-Tag: v0.5.1~13
X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=commitdiff_plain;h=282a5e463090205ef8a12f50a9ecf6498b860e88;hp=-c

Merge branch 'maint'

This incoporates a couple of important bug fixes found at athcx.
---

282a5e463090205ef8a12f50a9ecf6498b860e88
diff --combined configure.ac
index 0fd8fe8d,9ad36e14..73e97997
--- a/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
@@@ -295,7 -297,7 +295,7 @@@ f
  ########################################################################### osl
  have_osl=yes
  OLD_CPPFLAGS="$CPPFLAGS"
- OLD_LD_FLAGS="$LDFLAGS"
+ OLD_LDFLAGS="$LDFLAGS"
  OLD_LIBS="$LIBS"
  AC_ARG_WITH(osl_headers, [AS_HELP_STRING(--with-osl-headers=dir,
  	[look for osl.h also in dir])])
@@@ -390,7 -392,7 +390,7 @@@ esa
  ###################################################################### openssl
  if test "$check_openssl" = "yes"; then
  	OLD_CPPFLAGS="$CPPFLAGS"
- 	OLD_LD_FLAGS="$LDFLAGS"
+ 	OLD_LDFLAGS="$LDFLAGS"
  	OLD_LIBS="$LIBS"
  	have_openssl="yes"
  	AC_ARG_WITH(openssl_headers, [AS_HELP_STRING(--with-openssl-headers=dir,
@@@ -447,7 -449,7 +447,7 @@@ f
  ########################################################################### gcrypt
  if test "$check_gcrypt" = "yes"; then
  	OLD_CPPFLAGS="$CPPFLAGS"
- 	OLD_LD_FLAGS="$LDFLAGS"
+ 	OLD_LDFLAGS="$LDFLAGS"
  	OLD_LIBS="$LIBS"
  	have_gcrypt="yes"
  	AC_ARG_WITH(gcrypt_headers, [AS_HELP_STRING(--with-gcrypt-headers=dir,
@@@ -539,7 -541,7 +539,7 @@@ AC_SUBST(ggo_descriptions_declared
  ########################################################################### curses
  have_curses="yes"
  OLD_CPPFLAGS="$CPPFLAGS"
- OLD_LD_FLAGS="$LDFLAGS"
+ OLD_LDFLAGS="$LDFLAGS"
  OLD_LIBS="$LIBS"
  AC_ARG_WITH(curses_headers, [AS_HELP_STRING(--with-curses-headers=dir,
  	[look for curses.h also in dir])])
@@@ -630,7 -632,7 +630,7 @@@ f
  ####################################################### ogg/vorbis/speex/opus
  have_ogg="yes"
  OLD_CPPFLAGS="$CPPFLAGS"
- OLD_LD_FLAGS="$LDFLAGS"
+ OLD_LDFLAGS="$LDFLAGS"
  OLD_LIBS="$LIBS"
  AC_ARG_WITH(ogg_headers, [AS_HELP_STRING(--with-ogg-headers=dir,
  	[look for ogg headers also in dir])])
@@@ -795,7 -797,7 +795,7 @@@ if test "$have_opus" = "yes"; the
  	recv_errlist_objs="$recv_errlist_objs opus_afh opus_common"
  
  	audiod_audio_formats="$audiod_audio_formats opus"
- 	server_audio_formats="$server_audio_formats opus"
+ 	audio_format_handlers="$audio_format_handlers opus"
  else
  	AC_MSG_WARN([no ogg/opus $msg])
  fi
@@@ -805,7 -807,7 +805,7 @@@ LIBS="$OLD_LIBS
  ########################################################################### faad
  have_faad=yes
  OLD_CPPFLAGS="$CPPFLAGS"
- OLD_LD_FLAGS="$LDFLAGS"
+ OLD_LDFLAGS="$LDFLAGS"
  OLD_LIBS="$LIBS"
  AC_ARG_WITH(faad_headers, [AS_HELP_STRING(--with-faad-headers=dir,
  	[look for neaacdec.h also in dir])])
@@@ -851,7 -853,7 +851,7 @@@ LIBS="$OLD_LIBS
  ########################################################################### mad
  have_mad="yes"
  OLD_CPPFLAGS="$CPPFLAGS"
- OLD_LD_FLAGS="$LDFLAGS"
+ OLD_LDFLAGS="$LDFLAGS"
  OLD_LIBS="$LIBS"
  
  AC_ARG_WITH(mad_headers, [AS_HELP_STRING(--with-mad-headers=dir,
@@@ -895,7 -897,7 +895,7 @@@ LDFLAGS="$OLD_LDFLAGS
  LIBS="$OLD_LIBS"
  ###################################################################### libid3tag
  OLD_CPPFLAGS="$CPPFLAGS"
- OLD_LD_FLAGS="$LDFLAGS"
+ OLD_LDFLAGS="$LDFLAGS"
  OLD_LIBS="$LIBS"
  
  have_libid3tag="yes"
@@@ -936,7 -938,7 +936,7 @@@ LDFLAGS="$OLD_LDFLAGS
  LIBS="$OLD_LIBS"
  ########################################################################### flac
  OLD_CPPFLAGS="$CPPFLAGS"
- OLD_LD_FLAGS="$LDFLAGS"
+ OLD_LDFLAGS="$LDFLAGS"
  OLD_LIBS="$LIBS"
  
  have_flac="yes"
@@@ -981,7 -983,7 +981,7 @@@ LDFLAGS="$OLD_LDFLAGS
  LIBS="$OLD_LIBS"
  ########################################################################### oss
  OLD_CPPFLAGS="$CPPFLAGS"
- OLD_LD_FLAGS="$LDFLAGS"
+ OLD_LDFLAGS="$LDFLAGS"
  OLD_LIBS="$LIBS"
  
  have_oss="yes"
@@@ -1022,7 -1024,7 +1022,7 @@@ LIBS="$OLD_LIBS
  
  ########################################################################### alsa
  OLD_CPPFLAGS="$CPPFLAGS"
- OLD_LD_FLAGS="$LDFLAGS"
+ OLD_LDFLAGS="$LDFLAGS"
  OLD_LIBS="$LIBS"
  
  msg="=> no alsa support for para_audiod/para_write"
@@@ -1109,7 -1111,7 +1109,7 @@@ els
  fi
  ########################################################################### libao
  OLD_CPPFLAGS="$CPPFLAGS"
- OLD_LD_FLAGS="$LDFLAGS"
+ OLD_LDFLAGS="$LDFLAGS"
  OLD_LIBS="$LIBS"
  
  have_ao="yes"
@@@ -1172,7 -1174,7 +1172,7 @@@ LDFLAGS="$OLD_LDFLAGS
  LIBS="$OLD_LIBS"
  ############################################################# readline
  OLD_CPPFLAGS="$CPPFLAGS"
- OLD_LD_FLAGS="$LDFLAGS"
+ OLD_LDFLAGS="$LDFLAGS"
  OLD_LIBS="$LIBS"
  
  have_readline="yes"
@@@ -1243,7 -1245,7 +1243,7 @@@ LDFLAGS="$OLD_LDFLAGS
  LIBS="$OLD_LIBS"
  ############################################################# libsamplerate
  OLD_CPPFLAGS="$CPPFLAGS"
- OLD_LD_FLAGS="$LDFLAGS"
+ OLD_LDFLAGS="$LDFLAGS"
  OLD_LIBS="$LIBS"
  
  have_samplerate="yes"
@@@ -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"