diff --git a/acinclude.m4 b/acinclude.m4 index f186296bd..874795393 100644 --- a/acinclude.m4 +++ b/acinclude.m4 @@ -5,36 +5,40 @@ AM_MAINTAINER_MODE AC_GNU_SOURCE AC_ARG_WITH(target, - [ --with-target=TARGET target for compilation [[native,cdk]]], - [TARGET="$withval"],[TARGET="native"]) + AS_HELP_STRING([--with-target=TARGET], [target for compilation [[native,cdk]]]), + [TARGET="$withval"], + [TARGET="native"]) AC_ARG_WITH(targetprefix, - [ --with-targetprefix=PATH prefix relative to target root (only applicable in cdk mode)], - [TARGET_PREFIX="$withval"],[TARGET_PREFIX=""]) + AS_HELP_STRING([--with-targetprefix=PATH], [prefix relative to target root (only applicable in cdk mode)]), + [TARGET_PREFIX="$withval"], + [TARGET_PREFIX=""]) AC_ARG_WITH(debug, - [ --without-debug disable debugging code], - [DEBUG="$withval"],[DEBUG="yes"]) + AS_HELP_STRING([--without-debug], [disable debugging code]), + [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 debug messages]) fi AC_ARG_WITH(libcoolstream-static-dir, - [ --with-libcoolstream-static-dir=PATH path for static libcoolstream], - [LIBCOOLSTREAM_STATIC_DIR="$withval"],[LIBCOOLSTREAM_STATIC_DIR=""]) + AS_HELP_STRING([--with-libcoolstream-static-dir=PATH], [path for static libcoolstream]), + [LIBCOOLSTREAM_STATIC_DIR="$withval"], + [LIBCOOLSTREAM_STATIC_DIR=""]) AC_ARG_ENABLE(libcoolstream-static, - AS_HELP_STRING(--enable-libcoolstream-static,[libcoolstream static linked for testing])) -AM_CONDITIONAL(ENABLE_LIBCOOLSTREAM_STATIC,test "$enable_libcoolstream_static" = "yes") + AS_HELP_STRING([--enable-libcoolstream-static], [libcoolstream static linked for testing])) +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))) + 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]) + AC_DEFINE(ENABLE_CHANGE_OSD_RESOLUTION, 1, [enable change the osd resolution]) fi AC_MSG_CHECKING(target) @@ -155,7 +159,7 @@ TUXBOX_APPS_DIRECTORY_ONE(fontdir_var,FONTDIR_VAR,localstatedir,/var,/tuxbox/fon [--with-fontdir_var=PATH ],[where to find the fonts in /var]) TUXBOX_APPS_DIRECTORY_ONE(gamesdir,GAMESDIR,localstatedir,/var,/tuxbox/games, - [--with-gamesdir=PATH ],[where games data is stored]) + [--with-gamesdir=PATH ],[where to find the games]) TUXBOX_APPS_DIRECTORY_ONE(libdir,LIBDIR,libdir,/lib,/tuxbox, [--with-libdir=PATH ],[where to find the internal libs]) @@ -311,14 +315,15 @@ _TUXBOX_APPS_LIB_PKGCONFIG($1,$2) AC_DEFUN([TUXBOX_BOXTYPE],[ AC_ARG_WITH(boxtype, - [ --with-boxtype valid values: tripledragon,coolstream,spark,azbox,generic,armbox], + AS_HELP_STRING([--with-boxtype], [valid values: tripledragon, coolstream, spark, azbox, generic, armbox]), [case "${withval}" in tripledragon|coolstream|spark|azbox|generic|armbox) BOXTYPE="$withval" ;; *) AC_MSG_ERROR([bad value $withval for --with-boxtype]) ;; - esac], [BOXTYPE="coolstream"]) + esac], + [BOXTYPE="coolstream"]) AC_ARG_WITH(boxmodel, [ --with-boxmodel valid for coolstream: hd1, hd2 @@ -361,8 +366,8 @@ AC_ARG_WITH(boxmodel, *) AC_MSG_ERROR([unsupported value $withval for --with-boxmodel]) ;; - esac], [test "$BOXTYPE" = "coolstream" && BOXMODEL="hd1" || true] - ) + esac], + [test "$BOXTYPE" = "coolstream" && BOXMODEL="hd1" || true]) AC_SUBST(BOXTYPE) AC_SUBST(BOXMODEL) diff --git a/configure.ac b/configure.ac index b476e1633..548d85db0 100644 --- a/configure.ac +++ b/configure.ac @@ -36,23 +36,23 @@ else fi AC_ARG_ENABLE(ffmpegdec, - AS_HELP_STRING(--enable-ffmpegdec,include ffmpeg decoder support), + AS_HELP_STRING([--enable-ffmpegdec], [include ffmpeg decoder support]), ,[enable_ffmpegdec=no]) AM_CONDITIONAL(ENABLE_FFMPEGDEC,test "$enable_ffmpegdec" = "yes") if test "$enable_ffmpegdec" = "yes"; then - AC_DEFINE(ENABLE_FFMPEGDEC,1,[include ffmpeg decoder support]) + AC_DEFINE(ENABLE_FFMPEGDEC, 1, [include ffmpeg decoder support]) fi if test x"$enable_ffmpegdec" != xyes; then -AC_ARG_WITH([tremor], [AS_HELP_STRING([--with-tremor], - [use libvorbisidec instead of libogg/libvorbis])], +AC_ARG_WITH(tremor, + AS_HELP_STRING([--with-tremor], [use libvorbisidec instead of libogg/libvorbis]), [TREMOR="$withval"], [TREMOR=no]) -AC_ARG_WITH([tremor-static], [AS_HELP_STRING([--with-tremor-static], - [use statically linked libvorbisidec instead of libogg/libvorbis])], +AC_ARG_WITH(tremor-static, + AS_HELP_STRING([--with-tremor-static], [use statically linked libvorbisidec instead of libogg/libvorbis]), [TREMOR_STATIC="$withval"], [TREMOR_STATIC=no]) @@ -62,7 +62,7 @@ fi if test "$TREMOR" = "yes"; then TUXBOX_APPS_LIB_PKGCONFIG(VORBISIDEC,vorbisidec) - AC_DEFINE(USE_TREMOR,1,use libvorbisidec/tremor library) + AC_DEFINE(USE_TREMOR, 1, use libvorbisidec/tremor library) fi if test "$TREMOR_STATIC" = "yes"; then @@ -147,7 +147,7 @@ if test "$BOXTYPE" = "coolstream" || test "$BOXTYPE" = "generic" || test "$BOXTYPE" = "tripledragon" || test "$BOXTYPE" = "spark"; then - AC_DEFINE(SCREENSHOT,1,[Define to 1 if the platform supports screenshots]) + AC_DEFINE(SCREENSHOT, 1, [Define to 1 if the platform supports screenshots]) fi TUXBOX_APPS_LIB_PKGCONFIG(SIGC,sigc++-2.0) @@ -165,100 +165,98 @@ TUXBOX_APPS_LIB_PKGCONFIG(SIGC,sigc++-2.0) #TUXBOX_APPS_LIB_PKGCONFIG(TUXTXT,tuxbox-tuxtxt) AC_ARG_ENABLE(keyboard-no-rc, - [ --enable-keyboard-no-rc enable keyboard control, disable rc control], - [AC_DEFINE(KEYBOARD_INSTEAD_OF_REMOTE_CONTROL,1,[enable keyboard control, disable rc control])]) + AS_HELP_STRING([--enable-keyboard-no-rc], [enable keyboard control, disable rc control]), + AC_DEFINE(KEYBOARD_INSTEAD_OF_REMOTE_CONTROL, 1, [enable keyboard control, disable rc control])) AC_ARG_ENABLE(mdev, - [ --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], [disable broken neutrino mount hack, use with mdev]), + AC_DEFINE(ASSUME_MDEV, 1, [disable broken neutrino mount hack, use with mdev])) AC_ARG_ENABLE(freesatepg, - [ --enable-freesatepg enable Freesat EPG code (experimental)], - [AC_DEFINE(ENABLE_FREESATEPG,1,[enable Freesat EPG code])]) + AS_HELP_STRING([--enable-freesatepg], [enable Freesat EPG code (experimental)]), + AC_DEFINE(ENABLE_FREESATEPG, 1, [enable Freesat EPG code])) AC_ARG_ENABLE(viasatepg, - [ --enable-viasatepg enable ViaSat EPG code (experimental)], - [AC_DEFINE(ENABLE_VIASATEPG,1,[enable ViaSat EPG code])]) + AS_HELP_STRING([--enable-viasatepg], [enable ViaSat EPG code (experimental)]), + AC_DEFINE(ENABLE_VIASATEPG, 1, [enable ViaSat EPG code])) AC_ARG_ENABLE(fastscan, - [ --enable-fastscan enable Fastscan code)], - [AC_DEFINE(ENABLE_FASTSCAN,1,[enable fastscan code])]) + AS_HELP_STRING([--enable-fastscan], [enable fastscan code]), + 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]), ,[enable_giflib=no]) -AM_CONDITIONAL(ENABLE_GIFLIB,test "$enable_giflib" = "yes") +AM_CONDITIONAL(ENABLE_GIFLIB, test "$enable_giflib" = "yes") if test "$enable_giflib" = "yes"; then - AC_DEFINE(ENABLE_GIFLIB,1,[use giflib instead of libungif]) + AC_DEFINE(ENABLE_GIFLIB, 1, [use giflib instead of libungif]) fi -### USE_PUGIXML AC_ARG_ENABLE(pugixml, - AS_HELP_STRING(--enable-pugixml,use pugixml instead of xmltree), + AS_HELP_STRING([--enable-pugixml], [use pugixml instead of xmltree]), ,[enable_pugixml=no]) -AM_CONDITIONAL(USE_PUGIXML,test "$enable_pugixml" = "yes") +AM_CONDITIONAL(USE_PUGIXML, test "$enable_pugixml" = "yes") if test "$enable_pugixml" = "yes"; then - AC_DEFINE(USE_PUGIXML,1,[use pugixml instead of xmltree]) + AC_DEFINE(USE_PUGIXML, 1, [use pugixml instead of xmltree]) fi - -# FLAC - Free Lossless Audio Codec AC_ARG_ENABLE(flac, - AS_HELP_STRING(--enable-flac,include FLAC support), + AS_HELP_STRING([--enable-flac], [include FLAC support]), ,[enable_flac=no]) -AM_CONDITIONAL(ENABLE_FLAC,test "$enable_flac" = "yes") +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, [include FLAC support]) fi -# UPNP - upnp browser (borken right now) AC_ARG_ENABLE(upnp, - AS_HELP_STRING(--disable-upnp,disable UPNP support), + AS_HELP_STRING([--disable-upnp], [disable UPNP support]), ,[enable_upnp=yes]) -AM_CONDITIONAL(ENABLE_UPNP,test "$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 - currently broken]) + AC_DEFINE(ENABLE_UPNP, 1, [include UPNP support]) fi AC_ARG_ENABLE(extupdate, - AS_HELP_STRING(--enable-extupdate,include extended update routine), + AS_HELP_STRING([--enable-extupdate], [include extended update routine]), ,[enable_extupdate=no]) -AM_CONDITIONAL(ENABLE_EXTUPDATE,test "$enable_extupdate" = "yes") +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, [include extended update routine]) fi AC_ARG_WITH(stb-hal-includes, - [ --with-stb-hal-includes=PATH path for libstb-hal includes [[NONE]]], - [STB_HAL_INC="$withval"],[STB_HAL_INC=""]) + AS_HELP_STRING([--with-stb-hal-includes=PATH], [path for libstb-hal includes [[NONE]]]), + [STB_HAL_INC="$withval"], + [STB_HAL_INC=""]) + AC_ARG_WITH(stb-hal-build, - [ --with-stb-hal-build=PATH path where libstb-hal is built [[NONE]]], - [STB_HAL_LIB="-L$withval"],[STB_HAL_LIB=""]) + AS_HELP_STRING([--with-stb-hal-build=PATH], [path where libstb-hal is built [[NONE]]]), + [STB_HAL_LIB="-L$withval"], + [STB_HAL_LIB=""]) AM_CONDITIONAL(USE_STB_HAL, test "$BOXTYPE" != "coolstream") if test "$BOXTYPE" != coolstream; then - AC_DEFINE(USE_STB_HAL, 1,[use libstb-hal]) + AC_DEFINE(USE_STB_HAL, 1, [use libstb-hal]) if test "$STB_HAL_INC" = ""; then AC_MSG_ERROR([need libstb-hal includes path with --with-stb-hal-includes=...]) fi HWLIB_CFLAGS="-I$STB_HAL_INC" fi -# Lua - embeddable scripting language AC_ARG_ENABLE(lua, - AS_HELP_STRING(--disable-lua,disable Lua support), + AS_HELP_STRING([--disable-lua], [disable Lua support]), ,[enable_lua=yes]) -AM_CONDITIONAL(ENABLE_LUA,test "$enable_lua" = "yes") +AM_CONDITIONAL(ENABLE_LUA, test "$enable_lua" = "yes") if test "$enable_lua" = "yes"; then - AC_DEFINE(ENABLE_LUA,1,[include Lua support]) + AC_DEFINE(ENABLE_LUA, 1, [include Lua support]) PKG_CHECK_MODULES([LUA], [lua >= 5.2], echo "lua >= 5.2 found", [ PKG_CHECK_MODULES([LUA], [lua5.2 >= 5.2], echo "lua5.2 found", [ echo "=> lualib not found, assuming static lua in linker path..." @@ -267,29 +265,28 @@ if test "$enable_lua" = "yes"; then ]) ]) # hack... -AC_DEFINE(LUA_COMPAT_5_2,1,[does not really belong in config.h, but is needed for build with lua 5.3+]) +AC_DEFINE(LUA_COMPAT_5_2, 1, [does not really belong in config.h, but is needed for build with lua 5.3+]) fi AC_ARG_ENABLE(cleanup, - [ --enable-cleanup enable cleanup on exit], - [AC_DEFINE(EXIT_CLEANUP,1,[enable cleanup on exit])]) + AS_HELP_STRING([--enable-cleanup], [enable cleanup on exit]), + AC_DEFINE(EXIT_CLEANUP, 1, [enable cleanup on exit])) AC_ARG_ENABLE(pip, - [ --enable-pip enable picture in picture support], - [AC_DEFINE(ENABLE_PIP,1,[enable picture in picture support])]) - + AS_HELP_STRING([--enable-pip], [enable picture in picture support]), + AC_DEFINE(ENABLE_PIP, 1, [enable picture in picture support])) AC_ARG_ENABLE(testing, - AS_HELP_STRING(--enable-testing,include devel code parts for neutrino tests)) + AS_HELP_STRING([--enable-testing], [include dev code parts for neutrino tests])) -AM_CONDITIONAL(ENABLE_TESTING,test "$enable_testing" = "yes") +AM_CONDITIONAL(ENABLE_TESTING, test "$enable_testing" = "yes") if test "$enable_testing" = "yes"; then - AC_DEFINE(ENABLE_TESTING,1,[include devel code parts for neutrino tests - not recommended for general users!]) + AC_DEFINE(ENABLE_TESTING, 1, [include dev code parts for neutrino tests - not recommended for general users!]) fi -AC_ARG_ENABLE([fribidi], - AS_HELP_STRING([--enable-fribidi], [enable fribidi support]) -) +AC_ARG_ENABLE(fribidi, + AS_HELP_STRING([--enable-fribidi], [enable fribidi support])) + AM_CONDITIONAL(ENABLE_FRIBIDI, test "$enable_fribidi" = "yes") AS_IF([test "$enable_fribidi" = "yes"], AC_DEFINE(ENABLE_FRIBIDI, 1, [enable fribidi support]) @@ -297,16 +294,16 @@ AS_IF([test "$enable_fribidi" = "yes"], if test "$BOXTYPE" = "coolstream"; then if test -e ${srcdir}/lib/hardware/coolstream/hd1/libcoolstream/nevis_ir.h; then - AC_DEFINE(HAVE_COOLSTREAM_NEVIS_IR_H,1,[Define to 1 if you have the header file.]) + AC_DEFINE(HAVE_COOLSTREAM_NEVIS_IR_H, 1, [Define to 1 if you have the header file.]) fi HWLIB_CFLAGS='-I$(top_srcdir)/lib/hardware/coolstream/hd1/libcoolstream' if test "$BOXMODEL" = "hd2"; then if test -e ${srcdir}/lib/hardware/coolstream/hd2/libcoolstream/cs_ir_generic.h; then - AC_DEFINE(HAVE_COOLSTREAM_CS_IR_GENERIC_H,1,[Define to 1 if you have the header file.]) + AC_DEFINE(HAVE_COOLSTREAM_CS_IR_GENERIC_H, 1, [Define to 1 if you have the header file.]) fi if test -e ${srcdir}/lib/hardware/coolstream/hd2/libcoolstream/cs_frontpanel.h; then - AC_DEFINE(HAVE_COOLSTREAM_CS_FRONTPANEL_H,1,[Define to 1 if you have the header file.]) + AC_DEFINE(HAVE_COOLSTREAM_CS_FRONTPANEL_H, 1, [Define to 1 if you have the header file.]) fi HWLIB_CFLAGS='-I$(top_srcdir)/lib/hardware/coolstream/hd2/libcoolstream' fi