From: Andre Noll <maan@systemlinux.org>
Date: Sun, 1 Dec 2013 10:40:40 +0000 (+0100)
Subject: Merge branch 'maint'
X-Git-Tag: v0.5.1~5
X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=commitdiff_plain;h=db3534991b7c1d72f9ceed435ecbcba39660a758;hp=-c

Merge branch 'maint'
---

db3534991b7c1d72f9ceed435ecbcba39660a758
diff --combined configure.ac
index 85d30886,1d1d6e3c..ec346059
--- 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
@@@ -968,7 -970,7 +968,7 @@@ if test "$have_flac" = "yes"; the
  	play_ldflags="$play_ldflags $flac_libs -lFLAC"
  	server_ldflags="$server_ldflags $flac_libs -lFLAC"
  	afh_ldflags="$afh_ldflags $flac_libs -lFLAC"
- 	recv_ldflags="$afh_ldflags $flac_libs -lFLAC"
+ 	recv_ldflags="$recv_ldflags $flac_libs -lFLAC"
  	filters="$filters flacdec"
  	audio_format_handlers="$audio_format_handlers flac"
  	audiod_audio_formats="$audiod_audio_formats flac"
@@@ -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"