From d12e43ce05bd45c1dc4db7e1dc511210104932b3 Mon Sep 17 00:00:00 2001 From: svenhoefer Date: Sat, 9 Dec 2017 13:01:37 +0100 Subject: [PATCH] - acinclude/configure: show defaults Signed-off-by: Thilo Graf --- acinclude.m4 | 19 ++++++++----------- configure.ac | 46 +++++++++++++++++++++++----------------------- 2 files changed, 31 insertions(+), 34 deletions(-) diff --git a/acinclude.m4 b/acinclude.m4 index 6087f7448..0c7b3ed1b 100644 --- a/acinclude.m4 +++ b/acinclude.m4 @@ -15,13 +15,13 @@ AC_ARG_WITH(targetprefix, [TARGET_PREFIX=""]) AC_ARG_WITH(debug, - AS_HELP_STRING([--without-debug], [disable debugging code]), + AS_HELP_STRING([--without-debug], [disable debugging code @<:@default=no@:>@]), [DEBUG="$withval"], [DEBUG="yes"]) if test "$DEBUG" = "yes"; then DEBUG_CFLAGS="-g3 -ggdb" - AC_DEFINE(DEBUG, 1, [Enable debug messages]) + AC_DEFINE(DEBUG, 1, [enable debugging code]) fi AC_ARG_WITH(libcoolstream-static-dir, @@ -30,16 +30,13 @@ AC_ARG_WITH(libcoolstream-static-dir, [LIBCOOLSTREAM_STATIC_DIR=""]) AC_ARG_ENABLE(libcoolstream-static, - AS_HELP_STRING([--enable-libcoolstream-static], [libcoolstream static linked for testing])) + AS_HELP_STRING([--enable-libcoolstream-static], [libcoolstream static linked for testing @<:@default=no@:>@])) AM_CONDITIONAL(ENABLE_LIBCOOLSTREAM_STATIC, test "$enable_libcoolstream_static" = "yes") AC_ARG_ENABLE(reschange, - AS_HELP_STRING([--enable-reschange], [enable change the osd resolution (default for hd2 and hd51)])) - -AM_CONDITIONAL(ENABLE_RESCHANGE,test "$enable_reschange" = "yes") -if test "$enable_reschange" = "yes"; then - AC_DEFINE(ENABLE_CHANGE_OSD_RESOLUTION, 1, [enable change the osd resolution]) -fi + AS_HELP_STRING([--enable-reschange], [enable change the osd resolution @<:@default for hd2 and hd51@:>@]), + AC_DEFINE(ENABLE_CHANGE_OSD_RESOLUTION, 1, [enable change the osd resolution])) +AM_CONDITIONAL(ENABLE_RESCHANGE, test "$enable_reschange" = "yes") AC_MSG_CHECKING(target) @@ -403,9 +400,9 @@ if test "$BOXMODEL" = "hd1"; then AC_DEFINE(BOXMODEL_CS_HD1, 1, [coolstream hd1/neo/neo2/zee]) elif test "$BOXMODEL" = "hd2"; then AC_DEFINE(BOXMODEL_CS_HD2, 1, [coolstream tank/trinity/trinity v2/trinity duo/zee2/link]) - AC_DEFINE(ENABLE_CHANGE_OSD_RESOLUTION,1,[enable change the osd resolution]) + AC_DEFINE(ENABLE_CHANGE_OSD_RESOLUTION, 1, [enable change the osd resolution]) elif test "$BOXMODEL" = "hd51"; then - AC_DEFINE(ENABLE_CHANGE_OSD_RESOLUTION,1,[enable change the osd resolution]) + AC_DEFINE(ENABLE_CHANGE_OSD_RESOLUTION, 1, [enable change the osd resolution]) elif test "$BOXMODEL" = "raspi"; then AC_DEFINE(BOXMODEL_RASPI, 1, [Raspberry pi]) fi diff --git a/configure.ac b/configure.ac index 498529e15..1799b6fcd 100644 --- a/configure.ac +++ b/configure.ac @@ -36,7 +36,7 @@ else fi AC_ARG_ENABLE(ffmpegdec, - AS_HELP_STRING([--enable-ffmpegdec], [include ffmpeg decoder support]), + AS_HELP_STRING([--enable-ffmpegdec], [enable ffmpeg decoder support @<:@default=no@:>@]), ,[enable_ffmpegdec=no]) AM_CONDITIONAL(ENABLE_FFMPEGDEC,test "$enable_ffmpegdec" = "yes") @@ -47,12 +47,12 @@ fi if test x"$enable_ffmpegdec" != xyes; then AC_ARG_WITH(tremor, - AS_HELP_STRING([--with-tremor], [use libvorbisidec instead of libogg/libvorbis]), + AS_HELP_STRING([--with-tremor], [use libvorbisidec instead of libogg/libvorbis @<:@default=no@:>@]), [TREMOR="$withval"], [TREMOR=no]) AC_ARG_WITH(tremor-static, - AS_HELP_STRING([--with-tremor-static], [use statically linked libvorbisidec instead of libogg/libvorbis]), + AS_HELP_STRING([--with-tremor-static], [use statically linked libvorbisidec instead of libogg/libvorbis @<:@default=no@:>@]), [TREMOR_STATIC="$withval"], [TREMOR_STATIC=no]) @@ -153,29 +153,29 @@ fi TUXBOX_APPS_LIB_PKGCONFIG(SIGC,sigc++-2.0) AC_ARG_ENABLE(keyboard-no-rc, - AS_HELP_STRING([--enable-keyboard-no-rc], [enable keyboard control, disable rc control]), + AS_HELP_STRING([--enable-keyboard-no-rc], [enable keyboard control, disable rc control @<:@default=no@:>@]), AC_DEFINE(KEYBOARD_INSTEAD_OF_REMOTE_CONTROL, 1, [enable keyboard control, disable rc control])) AC_ARG_ENABLE(mdev, - AS_HELP_STRING([--enable-mdev], [disable broken neutrino mount hack, use with mdev]), - AC_DEFINE(ASSUME_MDEV, 1, [disable broken neutrino mount hack, use with mdev])) + AS_HELP_STRING([--enable-mdev], [use mdev instead of broken neutrino mount hack @<:@default=no@:>@]), + AC_DEFINE(ASSUME_MDEV, 1, [use mdev instead of broken neutrino mount hack])) AC_ARG_ENABLE(freesatepg, - AS_HELP_STRING([--enable-freesatepg], [enable Freesat EPG code (experimental)]), + AS_HELP_STRING([--enable-freesatepg], [enable Freesat EPG code @<:@default=no@:>@]), AC_DEFINE(ENABLE_FREESATEPG, 1, [enable Freesat EPG code])) AC_ARG_ENABLE(viasatepg, - AS_HELP_STRING([--enable-viasatepg], [enable ViaSat EPG code (experimental)]), + AS_HELP_STRING([--enable-viasatepg], [enable ViaSat EPG code @<:@default=no@:>@]), AC_DEFINE(ENABLE_VIASATEPG, 1, [enable ViaSat EPG code])) AC_ARG_ENABLE(fastscan, - AS_HELP_STRING([--enable-fastscan], [enable fastscan code]), + AS_HELP_STRING([--enable-fastscan], [enable fastscan code @<:@default=no@:>@]), AC_DEFINE(ENABLE_FASTSCAN, 1, [enable fastscan code])) AM_CONDITIONAL(ENABLE_FASTSCAN, test "$enable_fastscan" = "yes") AC_ARG_ENABLE(giflib, - AS_HELP_STRING([--enable-giflib], [use giflib instead of libungif]), + AS_HELP_STRING([--enable-giflib], [use giflib instead of libungif @<:@default=no@:>@]), ,[enable_giflib=no]) AM_CONDITIONAL(ENABLE_GIFLIB, test "$enable_giflib" = "yes") @@ -184,7 +184,7 @@ if test "$enable_giflib" = "yes"; then fi AC_ARG_ENABLE(pugixml, - AS_HELP_STRING([--enable-pugixml], [use pugixml instead of xmltree]), + AS_HELP_STRING([--enable-pugixml], [use pugixml instead of xmltree @<:@default=no@:>@]), ,[enable_pugixml=no]) AM_CONDITIONAL(USE_PUGIXML, test "$enable_pugixml" = "yes") @@ -193,30 +193,30 @@ if test "$enable_pugixml" = "yes"; then fi AC_ARG_ENABLE(flac, - AS_HELP_STRING([--enable-flac], [include FLAC support]), + AS_HELP_STRING([--enable-flac], [enable FLAC support @<:@default=no@:>@]), ,[enable_flac=no]) AM_CONDITIONAL(ENABLE_FLAC, test "$enable_flac" = "yes") if test "$enable_flac" = "yes"; then - AC_DEFINE(ENABLE_FLAC, 1, [include FLAC support]) + AC_DEFINE(ENABLE_FLAC, 1, [enable FLAC support]) fi AC_ARG_ENABLE(upnp, - AS_HELP_STRING([--disable-upnp], [disable UPNP support]), + AS_HELP_STRING([--disable-upnp], [disable UPNP support @<:@default=no@:>@]), ,[enable_upnp=yes]) AM_CONDITIONAL(ENABLE_UPNP, test "$enable_upnp" = "yes") if test "$enable_upnp" = "yes"; then - AC_DEFINE(ENABLE_UPNP, 1, [include UPNP support]) + AC_DEFINE(ENABLE_UPNP, 1, [enable UPNP support]) fi AC_ARG_ENABLE(extupdate, - AS_HELP_STRING([--enable-extupdate], [include extended update routine]), + AS_HELP_STRING([--enable-extupdate], [enable extended update routine @<:@default=no@:>@]), ,[enable_extupdate=no]) AM_CONDITIONAL(ENABLE_EXTUPDATE, test "$enable_extupdate" = "yes") if test "$enable_extupdate" = "yes"; then - AC_DEFINE(ENABLE_EXTUPDATE, 1, [include extended update routine]) + AC_DEFINE(ENABLE_EXTUPDATE, 1, [enable extended update routine]) fi AC_ARG_WITH(stb-hal-includes, @@ -239,7 +239,7 @@ if test "$BOXTYPE" != coolstream; then fi AC_ARG_ENABLE(lua, - AS_HELP_STRING([--disable-lua], [disable Lua support]), + AS_HELP_STRING([--disable-lua], [disable Lua support @<:@default=no@:>@]), ,[enable_lua=yes]) AM_CONDITIONAL(ENABLE_LUA, test "$enable_lua" = "yes") @@ -257,23 +257,23 @@ AC_DEFINE(LUA_COMPAT_5_2, 1, [does not really belong in config.h, but is needed fi AC_ARG_ENABLE(cleanup, - AS_HELP_STRING([--enable-cleanup], [enable cleanup on exit]), + AS_HELP_STRING([--enable-cleanup], [enable cleanup on exit @<:@default=no@:>@]), AC_DEFINE(EXIT_CLEANUP, 1, [enable cleanup on exit])) AC_ARG_ENABLE(pip, - AS_HELP_STRING([--enable-pip], [enable picture in picture support]), + AS_HELP_STRING([--enable-pip], [enable picture in picture support @<:@default=no@:>@]), AC_DEFINE(ENABLE_PIP, 1, [enable picture in picture support])) AC_ARG_ENABLE(testing, - AS_HELP_STRING([--enable-testing], [include dev code parts for neutrino tests])) + AS_HELP_STRING([--enable-testing], [enable development code @<:@default=no@:>@])) AM_CONDITIONAL(ENABLE_TESTING, test "$enable_testing" = "yes") if test "$enable_testing" = "yes"; then - AC_DEFINE(ENABLE_TESTING, 1, [include dev code parts for neutrino tests - not recommended for general users!]) + AC_DEFINE(ENABLE_TESTING, 1, [enable development code]) fi AC_ARG_ENABLE(fribidi, - AS_HELP_STRING([--enable-fribidi], [enable fribidi support])) + AS_HELP_STRING([--enable-fribidi], [enable fribidi support @<:@default=no@:>@])) AM_CONDITIONAL(ENABLE_FRIBIDI, test "$enable_fribidi" = "yes") AS_IF([test "$enable_fribidi" = "yes"],