Re: [Musicpd-dev-team] [git pull] configure.ac cleanups
On 2009/03/06 08:34, Avuton Olrich avu...@gmail.com wrote: Well, that was not intentional. Not exactly what you asked for, but hopefully this will float the boat. That's better, thanks. configure.ac needs a *lot* of further cleanup: - for every feature, let the default be auto (auto-detect if library present); an explicit --enable-foo must fail when the library is not found! - separate the encoder API a little bit more from the shout output, because it may well be used by other code in the future. --enable-shout-ogg, --enable-shout-mp3 should be deprecated then, replaced with --enable-shout-output, --enable-lame-encoder, --enable-vorbis-encoder. The whole encoder API is disabled when no user (i.e. shout) is enabled. When auto-detecting shout, also auto-detect encoder plugins, and if none is present, disable shout. - remove redundant lines like the one you wanted to add (explicit $enableval assignment) - rename options: --enable-mad-decoder instead of --enable-mp3; leave --enable-mp3 as deprecated option for compatibility (no mention on the --help page); same for the other renamed plugins That's all I currently remember. Max -- Open Source Business Conference (OSBC), March 24-25, 2009, San Francisco, CA -OSBC tackles the biggest issue in open source: Open Sourcing the Enterprise -Strategies to boost innovation and cut costs with open source participation -Receive a $600 discount off the registration fee with the source code: SFAD http://p.sf.net/sfu/XcvMzF8H ___ Musicpd-dev-team mailing list Musicpd-dev-team@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/musicpd-dev-team
[Musicpd-dev-team] [git pull] configure.ac cleanups (part 2)
Hi max, Please pull from my tree, a few fixes you've asked for, a few that seemed logical to me. configure.ac is still in complete disarray, but these are some steps forward, I believe. The only one that seems iffy to me is 'don't include a help string with the --enable-mp3', if I don't include one it appears ac will make a blank space regardless. If it were my project I'd say screw backwards compatbility of configure arguments :). git://git.musicpd.org/ Not inlining the diff, it's around 1200 lines and who knows the limits of hte mailing list. To see it: http://avuton.googlepages.com/autoconf-cleanups.patch Avuton Olrich (11): configure: remove redundant explicit $enableval assignments. configure: Group libmad stuff together, rename --enable-mp3 --enable-mad configure: trim down the Tremor AC_ARG_WITH() statements configure: trim down the line length for the lame arguments configure: trim down the line length for the zeroconf help string configure: trim down the line length for the faad help strings configure: trim down the line length for the libOggFLAC help strings configure: specify that faad2 prefix is optional in the help string configure: No capitalization on beginning of help strings. configure: Move the faad stuff to m4/faad.m4 configure: global indention and trim line wc to 80 when practical. configure.ac | 525 -- m4/faad.m4 | 190 m4/lame.m4 | 20 ++- m4/libOggFLAC.m4 | 20 ++- -- avuton -- | (\_/) This is Bunny. Copy and paste Bunny | (='.'=) into your signature to help him gain | ()_() world domination. -- Open Source Business Conference (OSBC), March 24-25, 2009, San Francisco, CA -OSBC tackles the biggest issue in open source: Open Sourcing the Enterprise -Strategies to boost innovation and cut costs with open source participation -Receive a $600 discount off the registration fee with the source code: SFAD http://p.sf.net/sfu/XcvMzF8H ___ Musicpd-dev-team mailing list Musicpd-dev-team@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/musicpd-dev-team
[Musicpd-dev-team] [git pull] configure.ac cleanups
Avuton Olrich (4): configure: Fix configure warning presented by lastfm radio. configure: more complete autoconf stuff for lastfm configure: display the status of lastfm protocol support configure: Add 'Streaming Support' section to the configure display. configure.ac | 44 +++- 1 files changed, 27 insertions(+), 17 deletions(-) diff --git a/configure.ac b/configure.ac index 1e16690..de7ddcd 100644 --- a/configure.ac +++ b/configure.ac @@ -255,7 +255,8 @@ AM_CONDITIONAL(HAVE_CURL, test x$enable_curl = xyes) AC_ARG_ENABLE(lastfm, AS_HELP_STRING([--enable-lastfm], - [enable support for last.fm radio (default: disable)]),, + [enable support for last.fm radio (default: disable)]), + [enable_lastfm=$enableval], [enable_lastfm=no]) if test x$enable_lastfm = xyes; then @@ -263,7 +264,7 @@ if test x$enable_lastfm = xyes; then AC_MSG_ERROR([Cannot enable last.fm radio without curl]) fi - AC_DEFINE(ENABLE_LASTFM, 1, [Define when last.fm radio is enabled]), + AC_DEFINE(ENABLE_LASTFM, 1, [Define when last.fm radio is enabled]) fi AM_CONDITIONAL(ENABLE_LASTFM, test x$enable_lastfm = xyes) @@ -1445,24 +1446,39 @@ else fi echo -echo Other features: +echo Streaming support: + +if test x$enable_lame = xyes; then +echo lame support (mp3 output) .enabled +else +echo lame support (mp3 output) .disabled +fi + +if test x$enable_lastfm = xyes; then +echo last.fm radio support .enabled +else +echo last.fm radio support .disabled +fi if test x$enable_curl != xno; then - echo HTTP streaming (libcurl) ..enabled +echo libcurl support (streaming) ...enabled else - echo HTTP streaming (libcurl) ..disabled +echo libcurl support (streaming) ...disabled fi -if test x$enable_id3 = xyes; then - echo ID3 tag support ...enabled +if test x$enable_mms != xno; then +echo libmms support enabled else - echo ID3 tag support ...disabled +echo libmms support disabled fi -if test x$enable_lame = xyes; then - echo lame support ..enabled +echo +echo Other features: + +if test x$enable_id3 = xyes; then + echo ID3 tag support ...enabled else - echo lame support ..disabled + echo ID3 tag support ...disabled fi if test x$enable_lsr = xyes; then @@ -1471,12 +1487,6 @@ else echo libsamplerate support .disabled fi -if test x$enable_mms != xno; then - echo MMS streaming (libmms) enabled -else - echo MMS streaming (libmms) disabled -fi - if test x$with_zeroconf != xno; then echo Zeroconf support ..$with_zeroconf else -- avuton -- | (\_/) This is Bunny. Copy and paste Bunny | (='.'=) into your signature to help him gain | ()_() world domination. -- Open Source Business Conference (OSBC), March 24-25, 2009, San Francisco, CA -OSBC tackles the biggest issue in open source: Open Sourcing the Enterprise -Strategies to boost innovation and cut costs with open source participation -Receive a $600 discount off the registration fee with the source code: SFAD http://p.sf.net/sfu/XcvMzF8H ___ Musicpd-dev-team mailing list Musicpd-dev-team@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/musicpd-dev-team
Re: [Musicpd-dev-team] [git pull] configure.ac cleanups
On 2009/03/06 01:49, Avuton Olrich avu...@gmail.com wrote: configure: more complete autoconf stuff for lastfm AC_ARG_ENABLE(lastfm, AS_HELP_STRING([--enable-lastfm], - [enable support for last.fm radio (default: disable)]),, + [enable support for last.fm radio (default: disable)]), + [enable_lastfm=$enableval], [enable_lastfm=no]) The $enableval line is generated by autoconf automatically if not present. echo -echo Other features: +echo Streaming support: + +if test x$enable_lame = xyes; then +echo lame support (mp3 output) .enabled +else +echo lame support (mp3 output) .disabled +fi I'm not quite satisfied with this. The last patch is an overall improvement, but I don't see why LAME support should appear twice. We should probably write only one shout line, and create a new section for encoder plugins (lame + vorbis). Can you do that, please? All patches except more complete autoconf stuff for lastfm merged. Max -- Open Source Business Conference (OSBC), March 24-25, 2009, San Francisco, CA -OSBC tackles the biggest issue in open source: Open Sourcing the Enterprise -Strategies to boost innovation and cut costs with open source participation -Receive a $600 discount off the registration fee with the source code: SFAD http://p.sf.net/sfu/XcvMzF8H ___ Musicpd-dev-team mailing list Musicpd-dev-team@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/musicpd-dev-team
Re: [Musicpd-dev-team] [git pull] configure.ac cleanups
On Thu, Mar 5, 2009 at 9:53 PM, Max Kellermann m...@duempel.org wrote: On 2009/03/06 01:49, Avuton Olrich avu...@gmail.com wrote: echo -echo Other features: +echo Streaming support: + +if test x$enable_lame = xyes; then + echo lame support (mp3 output) .enabled +else + echo lame support (mp3 output) .disabled +fi I'm not quite satisfied with this. The last patch is an overall improvement, but I don't see why LAME support should appear twice. We should probably write only one shout line, and create a new section for encoder plugins (lame + vorbis). Can you do that, please? All patches except more complete autoconf stuff for lastfm merged. Well, that was not intentional. Not exactly what you asked for, but hopefully this will float the boat. Avuton Olrich (2): configure: make all tests the same, when possible. configure: remove duplicate LAME report, unify rest under SHOUTcast header. configure.ac | 32 1 files changed, 16 insertions(+), 16 deletions(-) diff --git a/configure.ac b/configure.ac index a3d929b..0bc29a4 100644 --- a/configure.ac +++ b/configure.ac @@ -1271,16 +1271,22 @@ else echo Media MVP support .disabled fi -if test x$enable_shout_ogg = xyes; then - echo Shout ogg streaming support ...enabled -else - echo Shout ogg streaming support ...disabled -fi +if test x$enable_shout = xyes; then + echo SHOUTcast support .enabled -if test x$enable_shout_mp3 = xyes; then - echo Shout mp3 streaming support ...enabled + if test x$enable_shout_mp3 = xyes; then + echowith LAME mp3 encoder ...enabled + else + echowith LAME mp3 encoder ...disabled + fi + + if test x$enable_shout_ogg = xyes; then + echowith Ogg Vorbis encoder .enabled + else + echowith Ogg Vorbis encoder .disabled + fi else - echo Shout mp3 streaming support ...disabled + echo SHOUTcast support .disabled fi echo @@ -1447,25 +1453,19 @@ fi echo echo Streaming support: -if test x$enable_lame = xyes; then -echo lame support (mp3 output) .enabled -else -echo lame support (mp3 output) .disabled -fi - if test x$enable_lastfm = xyes; then echo last.fm radio support .enabled else echo last.fm radio support .disabled fi -if test x$enable_curl != xno; then +if test x$enable_curl = xyes; then echo libcurl support (streaming) ...enabled else echo libcurl support (streaming) ...disabled fi -if test x$enable_mms != xno; then +if test x$enable_mms = xyes; then echo libmms support enabled else echo libmms support disabled -- avuton -- | (\_/) This is Bunny. Copy and paste Bunny | (='.'=) into your signature to help him gain | ()_() world domination. -- Open Source Business Conference (OSBC), March 24-25, 2009, San Francisco, CA -OSBC tackles the biggest issue in open source: Open Sourcing the Enterprise -Strategies to boost innovation and cut costs with open source participation -Receive a $600 discount off the registration fee with the source code: SFAD http://p.sf.net/sfu/XcvMzF8H ___ Musicpd-dev-team mailing list Musicpd-dev-team@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/musicpd-dev-team
