From 3149d1abf98a54e78a805f6c4b025b4d99bfd6f0 Mon Sep 17 00:00:00 2001 From: Max Kellermann Date: Fri, 7 Jan 2011 17:26:09 +0100 Subject: [PATCH] configure.ac: eliminate bashism "echo -n" Use "printf" instead. --- configure.ac | 30 +++++++++++++++--------------- m4/pretty_print.m4 | 10 +++++----- 2 files changed, 20 insertions(+), 20 deletions(-) diff --git a/configure.ac b/configure.ac index c2e1f09f7..a7e1612a5 100644 --- a/configure.ac +++ b/configure.ac @@ -1495,23 +1495,23 @@ dnl --------------------------------------------------------------------------- echo '' echo '########### MPD CONFIGURATION ############' -echo -ne '\nArchive support:\n\t' +printf '\nArchive support:\n\t' results(bzip2,[bzip2]) results(iso9660,[ISO9660]) results(zzip,[ZIP]) if test x$with_zeroconf != xno; then - echo -ne '\nAutodiscovery support:\n\t' + printf '\nAutodiscovery support:\n\t' results(avahi, [Avahi]) results(bonjour, [Bonjour]) fi -echo -ne '\nClient support:\n\t' +printf '\nClient support:\n\t' results(ipv6, "IPv6") results(tcp, "TCP") results(un,[UNIX Domain Sockets]) -echo -ne '\nFile format support:\n\t' +printf '\nFile format support:\n\t' results(aac, [AAC]) results(sidplay, [C64 SID]) results(ffmpeg, [FFMPEG]) @@ -1519,7 +1519,7 @@ results(flac, [FLAC]) results(fluidsynth, [FluidSynth]) results(gme, [GME]) results(sndfile, [libsndfile]) -echo -ne '\n\t' +printf '\n\t' results(mikmod, [MikMod]) results(modplug, [MODPLUG]) results(mad, [MAD]) @@ -1527,23 +1527,23 @@ results(mpg123, [MPG123]) results(mp4, [MP4]) results(mpc, [Musepack]) results(oggflac, [OggFLAC], flac) -echo -ne '\n\t' +printf '\n\t' results(tremor, [OggTremor]) results(vorbis, [OggVorbis]) results(audiofile, [WAVE]) results(wavpack, [WavPack]) results(wildmidi, [WildMidi]) -echo -en '\nOther features:\n\t' +printf '\nOther features:\n\t' results(lsr, [libsamplerate]) results(inotify, [inotify]) results(sqlite, [SQLite]) -echo -en '\nMetadata support:\n\t' +printf '\nMetadata support:\n\t' results(cue,[cue]) results(id3,[ID3]) -echo -en '\nPlayback support:\n\t' +printf '\nPlayback support:\n\t' results(alsa,ALSA) results(ffado,FFADO) results(fifo,FIFO) @@ -1552,14 +1552,14 @@ results(httpd_output,[HTTP Daemon]) results(jack,[JACK]) results(ao,[libao]) results(oss,[OSS]) -echo -ne '\n\t' +printf '\n\t' results(openal,[OpenAL]) results(osx, [OS X]) results(pipe_output, [Pipeline]) results(pulse, [PulseAudio]) results(mvp, [Media MVP]) results(shout, [SHOUTcast]) -echo -ne '\n\t' +printf '\n\t' results(solaris, [Solaris]) results(winmm_output, [WinMM]) @@ -1567,7 +1567,7 @@ if test x$enable_shout = xyes || test x$enable_recorder = xyes || test x$enable_httpd_output = xyes; then - echo -en '\nStreaming encoder support:\n\t' + printf '\nStreaming encoder support:\n\t' results(flac_encoder, [FLAC]) results(lame_encoder, [LAME]) results(vorbis_encoder, [Ogg Vorbis]) @@ -1575,19 +1575,19 @@ if results(wave_encoder, [WAVE]) fi -echo -en '\nStreaming support:\n\t' +printf '\nStreaming support:\n\t' results(curl,[CURL]) results(lastfm,[Last.FM]) results(mms,[MMS]) -echo -ne '\n\n##########################################\n\n' +printf '\n\n##########################################\n\n' if test x$enable_sndfile = xyes && test x$enable_modplug = xyes; then AC_MSG_WARN([compilation may fail, because libmodplug conflicts with libsndfile]) AC_MSG_WARN([libmodplug ships modplug/sndfile.h, which hides libsndfile's sndfile.h]) fi -echo -ne 'Generating files needed for compilation\n' +echo 'Generating files needed for compilation' dnl --------------------------------------------------------------------------- dnl Generate files diff --git a/m4/pretty_print.m4 b/m4/pretty_print.m4 index da235946c..687dceefe 100644 --- a/m4/pretty_print.m4 +++ b/m4/pretty_print.m4 @@ -7,13 +7,13 @@ AC_DEFUN([results], [ var="`echo '$'enable_$1`" fi - echo -n '(' + printf '(' if eval "test x$var = xyes"; then - echo -n '+' + printf '+' elif test -n "$3" && eval "test x$var = x$3"; then - echo -n '+' + printf '+' else - echo -n '-' + printf '-' fi - echo -n "$2) " + printf '%s) ' "$2" ])