Rename SERVER_AUDIO_FORMATS to AUDIO_FORMAT_HANDLERS.

[paraslash.git] / configure.ac

diff --git a/configure.ac b/configure.ac
index f3e8fb070a2aa03254e2147c1c7392c32ad2ae24..4512c6fd38f7209aad203c14cfe31dc66d4e1d56 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -7,7 +7,6 @@ AC_PREREQ([2.61])
 AC_INIT([paraslash],[git],[maan@systemlinux.org])
 AC_CONFIG_HEADER([config.h])
 
-AC_SUBST(install_sh, [$INSTALL])
 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)])
@@ -39,6 +38,7 @@ test -z "$help2man" && AC_MSG_ERROR(
 AC_PROG_CC
 AC_PROG_CPP
 AC_PROG_INSTALL
+AC_SUBST(install_sh, [$INSTALL])
 AC_REPLACE_FNMATCH
 
 AC_HEADER_DIRENT
@@ -289,7 +289,7 @@ else
                acl udp_send"
 
        server_ldflags=""
-       server_audio_formats="mp3 wma"
+       audio_format_handlers="mp3 wma"
        AC_SUBST(osl_cppflags)
        server_ldflags="$server_ldflags $osl_libs -losl"
 fi
@@ -637,7 +637,7 @@ if test "$have_vorbis" = "yes"; then
        recv_errlist_objs="$recv_errlist_objs ogg_afh"
 
        audiod_audio_formats="$audiod_audio_formats ogg"
-       server_audio_formats="$server_audio_formats ogg"
+       audio_format_handlers="$audio_format_handlers ogg"
 else
        AC_MSG_WARN([no ogg/vorbis $msg])
 fi
@@ -661,7 +661,7 @@ if test "$have_speex" = "yes"; then
        recv_errlist_objs="$recv_errlist_objs spx_afh spx_common"
 
        audiod_audio_formats="$audiod_audio_formats spx"
-       server_audio_formats="$server_audio_formats spx"
+       audio_format_handlers="$audio_format_handlers spx"
 else
        AC_MSG_WARN([no ogg/speex $msg])
 fi
@@ -705,7 +705,7 @@ if test "$have_faad" = "yes"; then
        recv_ldflags="$afh_ldflags $faad_libs -lfaad"
 
        audiod_audio_formats="$audiod_audio_formats aac"
-       server_audio_formats="$server_audio_formats aac"
+       audio_format_handlers="$audio_format_handlers aac"
        filters="$filters aacdec"
        AC_SUBST(faad_cppflags)
 else
@@ -836,7 +836,7 @@ if test "$have_flac" = "yes"; then
        afh_ldflags="$afh_ldflags $flac_libs -lFLAC"
        recv_ldflags="$afh_ldflags $flac_libs -lFLAC"
        filters="$filters flacdec"
-       server_audio_formats="$server_audio_formats flac"
+       audio_format_handlers="$audio_format_handlers flac"
        audiod_audio_formats="$audiod_audio_formats flac"
        AC_SUBST(flac_cppflags)
 else
@@ -1186,7 +1186,7 @@ done
 AC_DEFINE_UNQUOTED(STATUS_ITEM_ARRAY, [$result],
        [char * array of all status items])
 
-AC_DEFINE_UNQUOTED(SERVER_AUDIO_FORMATS, "$server_audio_formats",
+AC_DEFINE_UNQUOTED(AUDIO_FORMAT_HANDLERS, "$audio_format_handlers",
        [formats supported by para_server and para_afh])
 
 AC_SUBST(executables, add_para($executables))
@@ -1284,10 +1284,10 @@ paraslash configuration:
 ~~~~~~~~~~~~~~~~~~~~~~~~
 unix socket credentials: $have_ucred
 readline (interactive CLIs): $have_readline
-audio formats supported by para_server/para_afh: $server_audio_formats
+audio formats handlers: $audio_format_handlers
 id3 version2 support: $have_libid3tag
-filters supported by para_audiod/para_filter: $filters
-writers supported by para_audiod/para_write: $writers
+filters: $filters
+writers: $writers
 optional executables: $extras
 $mixer_summary
 ])