From: Andre Noll Date: Wed, 21 Jun 2023 16:40:21 +0000 (+0200) Subject: build: Remove _errlist in shell variables of configure.ac. X-Git-Url: http://git.tue.mpg.de/?a=commitdiff_plain;h=646d6a7e6a9dbf3860f613596b19000c1c4ea008;p=paraslash.git build: Remove _errlist in shell variables of configure.ac. This used to make sense when we had two types of variables per executable, but those times are long gone. --- diff --git a/configure.ac b/configure.ac index 02a26e14..3b042aca 100644 --- a/configure.ac +++ b/configure.ac @@ -386,7 +386,7 @@ if test -n "$CRYPTOLIB" && test $HAVE_OSL = yes && test -n "$BISON" && \ test -n "$FLEX"; then build_server="yes" executables="$executables server upgrade_db" - server_errlist_objs=" + server_objs=" server afh_common mp3_afh @@ -427,19 +427,18 @@ if test -n "$CRYPTOLIB" && test $HAVE_OSL = yes && test -n "$BISON" && \ lsu " if test "$CRYPTOLIB" = openssl; then - server_errlist_objs="$server_errlist_objs openssl" + server_objs="$server_objs openssl" else - server_errlist_objs="$server_errlist_objs gcrypt" + server_objs="$server_objs gcrypt" fi - NEED_OGG_OBJECTS() && server_errlist_objs="$server_errlist_objs ogg_afh_common" - NEED_VORBIS_OBJECTS() && server_errlist_objs="$server_errlist_objs ogg_afh" - NEED_SPEEX_OBJECTS() && server_errlist_objs="$server_errlist_objs spx_afh spx_common" - NEED_OPUS_OBJECTS() && server_errlist_objs="$server_errlist_objs opus_afh opus_common" - NEED_FLAC_OBJECTS && server_errlist_objs="$server_errlist_objs flac_afh" + NEED_OGG_OBJECTS() && server_objs="$server_objs ogg_afh_common" + NEED_VORBIS_OBJECTS() && server_objs="$server_objs ogg_afh" + NEED_SPEEX_OBJECTS() && server_objs="$server_objs spx_afh spx_common" + NEED_OPUS_OBJECTS() && server_objs="$server_objs opus_afh opus_common" + NEED_FLAC_OBJECTS && server_objs="$server_objs flac_afh" if test $HAVE_FAAD = yes; then - server_errlist_objs="$server_errlist_objs aac_afh mp4" + server_objs="$server_objs aac_afh mp4" fi - server_objs="$server_errlist_objs" AC_SUBST(server_objs, add_dot_o($server_objs)) else build_server="no" @@ -459,7 +458,7 @@ AC_SUBST(upgrade_db_objs, add_dot_o($upgrade_db_objs)) if test -n "$CRYPTOLIB"; then build_client="yes" executables="$executables client" - client_errlist_objs=" + client_objs=" client net string @@ -477,15 +476,14 @@ if test -n "$CRYPTOLIB"; then version " if test "$CRYPTOLIB" = openssl; then - client_errlist_objs="$client_errlist_objs openssl" + client_objs="$client_objs openssl" else - client_errlist_objs="$client_errlist_objs gcrypt" + client_objs="$client_objs gcrypt" fi if test $HAVE_READLINE = yes; then - client_errlist_objs="$client_errlist_objs interactive" + client_objs="$client_objs interactive" fi - client_objs="$client_errlist_objs" - AC_SUBST(client_objs, add_dot_o($client_errlist_objs)) + AC_SUBST(client_objs, add_dot_o($client_objs)) else build_client="no" fi @@ -494,7 +492,7 @@ if test -n "$CRYPTOLIB"; then build_audiod="yes" executables="$executables audiod" audiod_audio_formats="wma" - audiod_errlist_objs="$audiod_errlist_objs + audiod_objs="$audiod_objs audiod signal string @@ -534,47 +532,46 @@ if test -n "$CRYPTOLIB"; then lsu " if test "$CRYPTOLIB" = openssl; then - audiod_errlist_objs="$audiod_errlist_objs openssl" + audiod_objs="$audiod_objs openssl" else - audiod_errlist_objs="$audiod_errlist_objs gcrypt" + audiod_objs="$audiod_objs gcrypt" fi NEED_VORBIS_OBJECTS && { - audiod_errlist_objs="$audiod_errlist_objs oggdec_filter" + audiod_objs="$audiod_objs oggdec_filter" audiod_audio_formats="$audiod_audio_formats ogg" } NEED_SPEEX_OBJECTS && { - audiod_errlist_objs="$audiod_errlist_objs spxdec_filter spx_common" + audiod_objs="$audiod_objs spxdec_filter spx_common" audiod_audio_formats="$audiod_audio_formats spx" } NEED_OPUS_OBJECTS && { - audiod_errlist_objs="$audiod_errlist_objs opusdec_filter opus_common" + audiod_objs="$audiod_objs opusdec_filter opus_common" audiod_audio_formats="$audiod_audio_formats opus" } NEED_FLAC_OBJECTS && { - audiod_errlist_objs="$audiod_errlist_objs flacdec_filter" + audiod_objs="$audiod_objs flacdec_filter" audiod_audio_formats="$audiod_audio_formats flac" } if test $HAVE_FAAD = yes; then - audiod_errlist_objs="$audiod_errlist_objs aacdec_filter" + audiod_objs="$audiod_objs aacdec_filter" audiod_audio_formats="$audiod_audio_formats aac" fi if test $HAVE_MAD = yes; then audiod_audio_formats="$audiod_audio_formats mp3" - audiod_errlist_objs="$audiod_errlist_objs mp3dec_filter" + audiod_objs="$audiod_objs mp3dec_filter" fi if test $HAVE_OSS = yes; then - audiod_errlist_objs="$audiod_errlist_objs oss_write" + audiod_objs="$audiod_objs oss_write" fi if test $HAVE_ALSA = yes; then - audiod_errlist_objs="$audiod_errlist_objs alsa_write" + audiod_objs="$audiod_objs alsa_write" fi NEED_AO_OBJECTS && { - audiod_errlist_objs="$audiod_errlist_objs ao_write" + audiod_objs="$audiod_objs ao_write" } if test $HAVE_SAMPLERATE = yes; then - audiod_errlist_objs="$audiod_errlist_objs resample_filter check_wav" + audiod_objs="$audiod_objs resample_filter check_wav" fi - audiod_objs="$audiod_errlist_objs" AC_SUBST(audiod_objs, add_dot_o($audiod_objs)) enum="$(for i in $audiod_audio_formats; do printf "AUDIO_FORMAT_${i}, " | tr '[a-z]' '[A-Z]'; done)" @@ -589,14 +586,13 @@ fi if test $HAVE_OSS = yes -o $HAVE_ALSA = yes; then build_mixer="yes" executables="$executables mixer" - mixer_errlist_objs="mixer exec string fd time lsu version" + mixer_objs="mixer exec string fd time lsu version" if test $HAVE_OSS = yes; then - mixer_errlist_objs="$mixer_errlist_objs oss_mix" + mixer_objs="$mixer_objs oss_mix" fi if test $HAVE_ALSA = yes; then - mixer_errlist_objs="$mixer_errlist_objs alsa_mix" + mixer_objs="$mixer_objs alsa_mix" fi - mixer_objs="$mixer_errlist_objs" AC_SUBST(mixer_objs, add_dot_o($mixer_objs)) else build_mixer="no" @@ -606,7 +602,7 @@ fi if test $HAVE_CURSES = yes; then build_gui="yes" executables="$executables gui" - gui_errlist_objs=" + gui_objs=" exec signal string @@ -620,14 +616,13 @@ if test $HAVE_CURSES = yes; then sched version " - gui_objs="$gui_errlist_objs" AC_SUBST(gui_objs, add_dot_o($gui_objs)) else build_gui="no" AC_MSG_WARN([no curses lib, cannot build para_gui]) fi ######################################################################## filter -filter_errlist_objs=" +filter_objs=" filter_common wav_filter compress_filter @@ -652,24 +647,22 @@ filter_errlist_objs=" net sync_filter " -NEED_VORBIS_OBJECTS && filter_errlist_objs="$filter_errlist_objs oggdec_filter" -NEED_SPEEX_OBJECTS && filter_errlist_objs="$filter_errlist_objs spxdec_filter spx_common" -NEED_OPUS_OBJECTS && filter_errlist_objs="$filter_errlist_objs opusdec_filter opus_common" -NEED_FLAC_OBJECTS && filter_errlist_objs="$filter_errlist_objs flacdec_filter" +NEED_VORBIS_OBJECTS && filter_objs="$filter_objs oggdec_filter" +NEED_SPEEX_OBJECTS && filter_objs="$filter_objs spxdec_filter spx_common" +NEED_OPUS_OBJECTS && filter_objs="$filter_objs opusdec_filter opus_common" +NEED_FLAC_OBJECTS && filter_objs="$filter_objs flacdec_filter" if test $HAVE_FAAD = yes; then - filter_errlist_objs="$filter_errlist_objs aacdec_filter" + filter_objs="$filter_objs aacdec_filter" fi if test $HAVE_MAD = yes; then - filter_errlist_objs="$filter_errlist_objs mp3dec_filter" + filter_objs="$filter_objs mp3dec_filter" fi if test $HAVE_SAMPLERATE = yes; then - filter_errlist_objs="$filter_errlist_objs resample_filter check_wav" + filter_objs="$filter_objs resample_filter check_wav" fi -filter_objs="$filter_errlist_objs" - AC_SUBST(filter_objs, add_dot_o($filter_objs)) ########################################################################## recv -recv_errlist_objs=" +recv_objs=" http_recv recv_common recv @@ -689,20 +682,19 @@ recv_errlist_objs=" mp3_afh version " -NEED_OGG_OBJECTS && recv_errlist_objs="$recv_errlist_objs ogg_afh_common" -NEED_VORBIS_OBJECTS && recv_errlist_objs="$recv_errlist_objs ogg_afh" -NEED_SPEEX_OBJECTS && recv_errlist_objs="$recv_errlist_objs spx_afh spx_common" -NEED_OPUS_OBJECTS && recv_errlist_objs="$recv_errlist_objs opus_afh opus_common" -NEED_FLAC_OBJECTS && recv_errlist_objs="$recv_errlist_objs flac_afh" +NEED_OGG_OBJECTS && recv_objs="$recv_objs ogg_afh_common" +NEED_VORBIS_OBJECTS && recv_objs="$recv_objs ogg_afh" +NEED_SPEEX_OBJECTS && recv_objs="$recv_objs spx_afh spx_common" +NEED_OPUS_OBJECTS && recv_objs="$recv_objs opus_afh opus_common" +NEED_FLAC_OBJECTS && recv_objs="$recv_objs flac_afh" if test $HAVE_FAAD = yes; then - recv_errlist_objs="$recv_errlist_objs aac_afh mp4" + recv_objs="$recv_objs aac_afh mp4" fi -recv_objs="$recv_errlist_objs" AC_SUBST(recv_objs, add_dot_o($recv_objs)) ########################################################################### afh audio_format_handlers="mp3 wma" -afh_errlist_objs=" +afh_objs=" afh string fd @@ -713,33 +705,30 @@ afh_errlist_objs=" wma_common version " -NEED_OGG_OBJECTS && afh_errlist_objs="$afh_errlist_objs ogg_afh_common" +NEED_OGG_OBJECTS && afh_objs="$afh_objs ogg_afh_common" NEED_VORBIS_OBJECTS && { - afh_errlist_objs="$afh_errlist_objs ogg_afh" + afh_objs="$afh_objs ogg_afh" audio_format_handlers="$audio_format_handlers ogg" } NEED_SPEEX_OBJECTS && { - afh_errlist_objs="$afh_errlist_objs spx_afh spx_common" + afh_objs="$afh_objs spx_afh spx_common" audio_format_handlers="$audio_format_handlers spx" } NEED_OPUS_OBJECTS && { - afh_errlist_objs="$afh_errlist_objs opus_afh opus_common" + afh_objs="$afh_objs opus_afh opus_common" audio_format_handlers="$audio_format_handlers opus" } NEED_FLAC_OBJECTS && { - afh_errlist_objs="$afh_errlist_objs flac_afh" + afh_objs="$afh_objs flac_afh" audio_format_handlers="$audio_format_handlers flac" } if test $HAVE_FAAD = yes; then - afh_errlist_objs="$afh_errlist_objs aac_afh mp4" + afh_objs="$afh_objs aac_afh mp4" audio_format_handlers="$audio_format_handlers aac" fi - -afh_objs="$afh_errlist_objs" - AC_SUBST(afh_objs, add_dot_o($afh_objs)) ########################################################################## play -play_errlist_objs=" +play_objs=" play fd sched @@ -772,48 +761,46 @@ play_errlist_objs=" sync_filter lsu " -NEED_OGG_OBJECTS && play_errlist_objs="$play_errlist_objs ogg_afh_common" +NEED_OGG_OBJECTS && play_objs="$play_objs ogg_afh_common" NEED_VORBIS_OBJECTS && { - play_errlist_objs="$play_errlist_objs oggdec_filter ogg_afh" + play_objs="$play_objs oggdec_filter ogg_afh" } NEED_SPEEX_OBJECTS && { - play_errlist_objs="$play_errlist_objs spxdec_filter spx_afh spx_common" + play_objs="$play_objs spxdec_filter spx_afh spx_common" } NEED_OPUS_OBJECTS && - play_errlist_objs="$play_errlist_objs + play_objs="$play_objs opusdec_filter opus_afh opus_common " NEED_FLAC_OBJECTS && { - play_errlist_objs="$play_errlist_objs flacdec_filter flac_afh" + play_objs="$play_objs flacdec_filter flac_afh" } if test $HAVE_FAAD = yes; then - play_errlist_objs="$play_errlist_objs aac_afh aacdec_filter mp4" + play_objs="$play_objs aac_afh aacdec_filter mp4" fi if test $HAVE_MAD = yes; then - play_errlist_objs="$play_errlist_objs mp3dec_filter" + play_objs="$play_objs mp3dec_filter" fi if test $HAVE_OSS = yes; then - play_errlist_objs="$play_errlist_objs oss_write" + play_objs="$play_objs oss_write" fi if test $HAVE_ALSA = yes; then - play_errlist_objs="$play_errlist_objs alsa_write" + play_objs="$play_objs alsa_write" fi NEED_AO_OBJECTS && { - play_errlist_objs="$play_errlist_objs ao_write" + play_objs="$play_objs ao_write" } if test $HAVE_READLINE = yes; then - play_errlist_objs="$play_errlist_objs interactive" + play_objs="$play_objs interactive" fi if test $HAVE_SAMPLERATE = yes; then - play_errlist_objs="$play_errlist_objs resample_filter check_wav" + play_objs="$play_objs resample_filter check_wav" fi - -play_objs="$play_errlist_objs" AC_SUBST(play_objs, add_dot_o($play_objs)) ######################################################################### write -write_errlist_objs=" +write_objs=" write write_common file_write @@ -828,18 +815,17 @@ write_errlist_objs=" " NEED_AO_OBJECTS && { - write_errlist_objs="$write_errlist_objs ao_write" + write_objs="$write_objs ao_write" } if test $HAVE_OSS = yes; then - write_errlist_objs="$write_errlist_objs oss_write" + write_objs="$write_objs oss_write" fi if test $HAVE_ALSA = yes; then - write_errlist_objs="$write_errlist_objs alsa_write" + write_objs="$write_objs alsa_write" fi -write_objs="$write_errlist_objs" AC_SUBST(write_objs, add_dot_o($write_objs)) ######################################################################## audioc -audioc_errlist_objs=" +audioc_objs=" audioc string lsu @@ -849,13 +835,12 @@ audioc_errlist_objs=" version " if test $HAVE_READLINE = yes; then - audioc_errlist_objs="$audioc_errlist_objs + audioc_objs="$audioc_objs buffer_tree interactive sched " fi -audioc_objs="$audioc_errlist_objs" AC_SUBST(audioc_objs, add_dot_o($audioc_objs)) AC_DEFINE_UNQUOTED(AUDIO_FORMAT_HANDLERS, "$audio_format_handlers",