X-Git-Url: http://git.tuebingen.mpg.de/?a=blobdiff_plain;f=configure.ac;h=85d3088689f3980eaccb75562d36cea4f0a85b55;hb=a29e6451e79365af6dce8d14f3056fc107b059fb;hp=6dc94ad7ace041db8a863bfcac9b11861e32bf05;hpb=034cda0df3b2da1048d5ee90296385c52efbbcae;p=paraslash.git

diff --git a/configure.ac b/configure.ac
index 6dc94ad7..85d30886 100644
--- a/configure.ac
+++ b/configure.ac
@@ -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
@@ -696,7 +694,7 @@ if test "$have_ogg" = "yes"; then
 		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" ])
@@ -797,7 +795,7 @@ if test "$have_opus" = "yes"; then
 	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
@@ -1325,7 +1323,7 @@ AC_DEFINE_UNQUOTED(STATUS_ITEM_ARRAY, [$result],
 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"