mirror of
https://github.com/tuxbox-neutrino/neutrino.git
synced 2025-08-26 23:13:13 +02:00
- acinclude: resort
Conflicts: acinclude.m4 Signed-off-by: Thilo Graf <dbt@novatux.de>
This commit is contained in:
19
acinclude.m4
19
acinclude.m4
@@ -460,7 +460,7 @@ AC_ARG_WITH(boxtype,
|
||||
AC_ARG_WITH(boxmodel,
|
||||
AS_HELP_STRING([--with-boxmodel], [valid for generic: generic, raspi])
|
||||
AS_HELP_STRING([], [valid for coolstream: hd1, hd2])
|
||||
AS_HELP_STRING([], [valid for armbox: hd51, hd60, bre2ze4k, vusolo4k, vuduo4k, vuultimo4k, vuuno4k, vuuno4kse, vuzero4k|h7])
|
||||
AS_HELP_STRING([], [valid for armbox: hd51, hd60, bre2ze4k, h7, vusolo4k, vuduo4k, vuultimo4k, vuuno4k, vuuno4kse, vuzero4k])
|
||||
AS_HELP_STRING([], [valid for mipsbox: vuduo]),
|
||||
[case "${withval}" in
|
||||
generic|raspi)
|
||||
@@ -489,7 +489,7 @@ AS_HELP_STRING([], [valid for mipsbox: vuduo]),
|
||||
AC_MSG_ERROR([unknown model $withval for boxtype $BOXTYPE])
|
||||
fi
|
||||
;;
|
||||
hd51|hd60|bre2ze4k|vusolo4k|vuduo4k|vuultimo4k|vuuno4k|vuuno4kse|vuzero4k|h7)
|
||||
hd51|hd60|bre2ze4k|h7|vusolo4k|vuduo4k|vuultimo4k|vuuno4k|vuuno4kse|vuzero4k)
|
||||
if test "$BOXTYPE" = "armbox"; then
|
||||
BOXMODEL="$withval"
|
||||
else
|
||||
@@ -532,14 +532,13 @@ AM_CONDITIONAL(BOXMODEL_CS_HD2, test "$BOXMODEL" = "hd2")
|
||||
AM_CONDITIONAL(BOXMODEL_HD51, test "$BOXMODEL" = "hd51")
|
||||
AM_CONDITIONAL(BOXMODEL_HD60, test "$BOXMODEL" = "hd60")
|
||||
AM_CONDITIONAL(BOXMODEL_BRE2ZE4K, test "$BOXMODEL" = "bre2ze4k")
|
||||
AM_CONDITIONAL(BOXMODEL_H7, test "$BOXMODEL" = "h7")
|
||||
AM_CONDITIONAL(BOXMODEL_VUSOLO4K, test "$BOXMODEL" = "vusolo4k")
|
||||
AM_CONDITIONAL(BOXMODEL_VUDUO4K, test "$BOXMODEL" = "vuduo4k")
|
||||
AM_CONDITIONAL(BOXMODEL_VUULTIMO4K, test "$BOXMODEL" = "vuultimo4k")
|
||||
AM_CONDITIONAL(BOXMODEL_VUUNO4K, test "$BOXMODEL" = "vuuno4k")
|
||||
AM_CONDITIONAL(BOXMODEL_VUUNO4KSE, test "$BOXMODEL" = "vuuno4kse")
|
||||
AM_CONDITIONAL(BOXMODEL_VUZERO4K, test "$BOXMODEL" = "vuzero4k")
|
||||
AM_CONDITIONAL(BOXMODEL_VUDUO, test "$BOXMODEL" = "vuduo")
|
||||
AM_CONDITIONAL(BOXMODEL_H7, test "$BOXMODEL" = "h7")
|
||||
|
||||
# mipsbox
|
||||
AM_CONDITIONAL(BOXMODEL_VUDUO, test "$BOXMODEL" = "vuduo")
|
||||
@@ -575,6 +574,8 @@ elif test "$BOXMODEL" = "hd60"; then
|
||||
AC_DEFINE(BOXMODEL_HD60, 1, [hd60])
|
||||
elif test "$BOXMODEL" = "bre2ze4k"; then
|
||||
AC_DEFINE(BOXMODEL_BRE2ZE4K, 1, [bre2ze4k])
|
||||
elif test "$BOXMODEL" = "h7"; then
|
||||
AC_DEFINE(BOXMODEL_H7, 1, [h7])
|
||||
elif test "$BOXMODEL" = "vusolo4k"; then
|
||||
AC_DEFINE(BOXMODEL_VUSOLO4K, 1, [vusolo4k])
|
||||
elif test "$BOXMODEL" = "vuduo4k"; then
|
||||
@@ -589,14 +590,6 @@ elif test "$BOXMODEL" = "vuzero4k"; then
|
||||
AC_DEFINE(BOXMODEL_VUZERO4K, 1, [vuzero4k])
|
||||
elif test "$BOXMODEL" = "vuduo"; then
|
||||
AC_DEFINE(BOXMODEL_VUDUO, 1, [vuduo])
|
||||
AC_DEFINE(ENABLE_CHANGE_OSD_RESOLUTION, 1, [enable change the osd resolution])
|
||||
elif test "$BOXMODEL" = "h7"; then
|
||||
AC_DEFINE(BOXMODEL_H7, 1, [h7])
|
||||
AC_DEFINE(ENABLE_CHANGE_OSD_RESOLUTION, 1, [enable change the osd resolution])
|
||||
elif test "$BOXMODEL" = "generic"; then
|
||||
AC_DEFINE(BOXMODEL_GENERIC, 1, [generic pc])
|
||||
elif test "$BOXMODEL" = "raspi"; then
|
||||
AC_DEFINE(BOXMODEL_RASPI, 1, [raspberry pi])
|
||||
fi
|
||||
|
||||
# all vuplus BOXMODELs
|
||||
@@ -625,7 +618,7 @@ AM_CONDITIONAL(BOXMODEL_VUPLUS4K, test "$vuplus4k" = "true")
|
||||
|
||||
# BOXMODELs that allows to change osd resolution
|
||||
case "$BOXMODEL" in
|
||||
hd2|hd51|hd60|bre2ze4k|vusolo4k|vuduo4k|vuultimo4k|vuuno4k|vuuno4kse|vuzero4k|vuduo)
|
||||
hd2|hd51|hd60|bre2ze4k|h7|vusolo4k|vuduo4k|vuultimo4k|vuuno4k|vuuno4kse|vuzero4k|vuduo)
|
||||
AC_DEFINE(ENABLE_CHANGE_OSD_RESOLUTION, 1, [enable to change osd resolution])
|
||||
;;
|
||||
esac
|
||||
|
Reference in New Issue
Block a user