mirrors/neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-neutrino/neutrino.git synced 2025-08-26 23:13:13 +02:00
Code Issues Packages Projects Releases Wiki Activity

- acinclude: move enable-change-osd-resolution handling to configure.ac; rework handling

Browse Source 
Conflicts:
	configure.ac
This commit is contained in:
vanhofen
2023-01-28 12:06:17 +01:00
committed by Thilo Graf
parent b0f72f65ea
commit 49342bbee0
2 changed files with 23 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
acinclude.m4
View File

@@ -29,11 +29,6 @@ if test "$DEBUG" = "yes"; then
AC_DEFINE(DEBUG, 1, [enable debugging code])
fi
AC_ARG_ENABLE(reschange,
AS_HELP_STRING([--enable-reschange], [enable to change osd resolution]),
AC_DEFINE(ENABLE_CHANGE_OSD_RESOLUTION, 1, [enable to change osd resolution]))
AM_CONDITIONAL(ENABLE_RESCHANGE, test "$enable_reschange" = "yes")
AC_MSG_CHECKING(target)
if test "$TARGET" = "native"; then
@@ -136,7 +131,6 @@ AC_REQUIRE([TUXBOX_APPS])
#
# FIXME:
# This breaks --sysconfdir= etc. switches in cdk mode.
# Is --with-targetprefix= and the resulting ${TARGET_PREFIX} really needed?
#
if test "$TARGET" = "cdk"; then
datadir="\${prefix}/share"
@@ -531,11 +525,11 @@ elif test "$BOXMODEL" = "protek4k"; then
AC_DEFINE(BOXMODEL_PROTEK4K, 1, [protek4k])
elif test "$BOXMODEL" = "osmini4k"; then
AC_DEFINE(BOXMODEL_OSMINI4K, 1, [osmini4k])
AC_DEFINE(BOXMODEL_OSMINI4K, 1, [osmini4k])
elif test "$BOXMODEL" = "osmio4k"; then
AC_DEFINE(BOXMODEL_OSMIO4K, 1, [osmio4k])
AC_DEFINE(BOXMODEL_OSMIO4K, 1, [osmio4k])
elif test "$BOXMODEL" = "osmio4kplus"; then
AC_DEFINE(BOXMODEL_OSMIO4KPLUS, 1, [osmio4kplus])
AC_DEFINE(BOXMODEL_OSMIO4KPLUS, 1, [osmio4kplus])
elif test "$BOXMODEL" = "vusolo4k"; then
AC_DEFINE(BOXMODEL_VUSOLO4K, 1, [vusolo4k])
@@ -616,13 +610,6 @@ case "$BOXMODEL" in
;;
esac
AM_CONDITIONAL(BOXMODEL_HISILICON, test "$hisilicon" = "true")
# BOXMODELs that allows to change osd resolution
case "$BOXMODEL" in
hd2|hd60|hd61|multibox|multiboxse|hd51|bre2ze4k|h7|e4hdultra|protek4k|osmini4k|osmio4k|osmio4kplus|vusolo4k|vuduo4k|vuduo4kse|vuultimo4k|vuuno4k|vuuno4kse|vuzero4k|vuduo|vuduo2|gb800se|osnino|osninoplus|osninopro)
AC_DEFINE(ENABLE_CHANGE_OSD_RESOLUTION, 1, [enable to change osd resolution])
;;
esac
])
dnl backward compatiblity

20
configure.ac
View File

@@ -440,6 +440,26 @@ AC_ARG_WITH(default-oled-theme,
[default_oled_theme=""])
AC_DEFINE_UNQUOTED([DEFAULT_OLED_THEME], ["$default_oled_theme"], [default theme for oled])
AC_ARG_ENABLE(change-osd-resolution,
AS_HELP_STRING([--enable-change-osd-resolution], [enable to change osd resolution @<:@default=yes@:>@]]),
[enable_change_osd_resolution="$enableval"],
[enable_change_osd_resolution="yes"])
# BOXMODELs that *not* allows to change osd resolution
case "$BOXMODEL" in
hd1)
if test "$enable_change_osd_resolution" = "yes"; then
AC_MSG_WARN([--enable-change-osd-resolution=yes is not allowed for boxmodel $BOXMODEL])
enable_change_osd_resolution="no"
fi
;;
esac
if test "$enable_change_osd_resolution" = "yes"; then
AC_DEFINE(ENABLE_CHANGE_OSD_RESOLUTION, 1, [enable to change osd resolution])
fi
AM_CONDITIONAL(ENABLE_CHANGE_OSD_RESOLUTION, test "$enable_change_osd_resolution" = "yes")
# webif content
AC_ARG_WITH(webif,
AS_HELP_STRING([--without-webif], [disable installation of webif content within defined public httpd path provided by yWeb @<:@default it is enabled@:>@]),