From 4f54736568612988f5650d4d62d6e046417fd133 Mon Sep 17 00:00:00 2001 From: vanhofen Date: Mon, 26 Aug 2019 17:46:18 +0200 Subject: [PATCH] acinclude.m4: sort helpstrings and code (start with generic and end up with armbox and mipsbox) Origin commit data ------------------ Branch: master Commit: https://github.com/neutrino-images/ni-libstb-hal/commit/100c10869a513da9b655e74e4083bb796d9c4075 Author: vanhofen Date: 2019-08-26 (Mon, 26 Aug 2019) Origin message was: ------------------ - acinclude.m4: sort helpstrings and code (start with generic and end up with armbox and mipsbox) ------------------ No further description and justification available within origin commit message! ------------------ This commit was generated by Migit --- acinclude.m4 | 52 ++++++++++++++++++++++++++++------------------------ 1 file changed, 28 insertions(+), 24 deletions(-) diff --git a/acinclude.m4 b/acinclude.m4 index 42549e6..c93afc7 100644 --- a/acinclude.m4 +++ b/acinclude.m4 @@ -75,9 +75,9 @@ AC_SYS_LARGEFILE AC_DEFUN([TUXBOX_BOXTYPE], [ AC_ARG_WITH(boxtype, - AS_HELP_STRING([--with-boxtype], [valid values: tripledragon, spark, azbox, generic, armbox, duckbox, mipsbox]), + AS_HELP_STRING([--with-boxtype], [valid values: generic, azbox, tripledragon, spark, duckbox, armbox, mipsbox]), [case "${withval}" in - tripledragon|spark|azbox|generic|armbox|duckbox|mipsbox) + generic|azbox|tripledragon|spark|duckbox|armbox|mipsbox) BOXTYPE="$withval" ;; *) @@ -88,13 +88,13 @@ AC_ARG_WITH(boxtype, AC_ARG_WITH(boxmodel, AS_HELP_STRING([--with-boxmodel], [valid for generic: generic, raspi]) -AS_HELP_STRING([], [valid for duckbox: ufs910, ufs912, ufs913, ufs922, atevio7500, fortis_hdbox, octagon1008, hs7110, hs7810a, hs7119, hs7819, dp7000, cuberevo, cuberevo_mini, cuberevo_mini2, cuberevo_250hd, cuberevo_2000hd, cuberevo_3000hd, ipbox9900, ipbox99, ipbox55, arivalink200, tf7700, hl101]) AS_HELP_STRING([], [valid for spark: spark, spark7162]) +AS_HELP_STRING([], [valid for duckbox: ufs910, ufs912, ufs913, ufs922, atevio7500, fortis_hdbox, octagon1008, hs7110, hs7810a, hs7119, hs7819, dp7000, cuberevo, cuberevo_mini, cuberevo_mini2, cuberevo_250hd, cuberevo_2000hd, cuberevo_3000hd, ipbox9900, ipbox99, ipbox55, arivalink200, tf7700, hl101]) AS_HELP_STRING([], [valid for armbox: hd51, hd60, bre2ze4k, vusolo4k, vuduo4k, vuzero4k]) AS_HELP_STRING([], [valid for mipsbox: vuduo]), [case "${withval}" in - ufs910|ufs912|ufs913|ufs922|atevio7500|fortis_hdbox|octagon1008|hs7110|hs7810a|hs7119|hs7819|dp7000|cuberevo|cuberevo_mini|cuberevo_mini2|cuberevo_250hd|cuberevo_2000hd|cuberevo_3000hd|ipbox9900|ipbox99|ipbox55|arivalink200|tf7700|hl101) - if test "$BOXTYPE" = "duckbox"; then + generic|raspi) + if test "$BOXTYPE" = "generic"; then BOXMODEL="$withval" else AC_MSG_ERROR([unknown model $withval for boxtype $BOXTYPE]) @@ -107,6 +107,13 @@ AS_HELP_STRING([], [valid for mipsbox: vuduo]), AC_MSG_ERROR([unknown model $withval for boxtype $BOXTYPE]) fi ;; + ufs910|ufs912|ufs913|ufs922|atevio7500|fortis_hdbox|octagon1008|hs7110|hs7810a|hs7119|hs7819|dp7000|cuberevo|cuberevo_mini|cuberevo_mini2|cuberevo_250hd|cuberevo_2000hd|cuberevo_3000hd|ipbox9900|ipbox99|ipbox55|arivalink200|tf7700|hl101) + if test "$BOXTYPE" = "duckbox"; then + BOXMODEL="$withval" + else + AC_MSG_ERROR([unknown model $withval for boxtype $BOXTYPE]) + fi + ;; hd51|hd60|bre2ze4k|vusolo4k|vuduo4k|vuzero4k) if test "$BOXTYPE" = "armbox"; then BOXMODEL="$withval" @@ -121,13 +128,6 @@ AS_HELP_STRING([], [valid for mipsbox: vuduo]), AC_MSG_ERROR([unknown model $withval for boxtype $BOXTYPE]) fi ;; - generic|raspi) - if test "$BOXTYPE" = "generic"; then - BOXMODEL="$withval" - else - AC_MSG_ERROR([unknown model $withval for boxtype $BOXTYPE]) - fi - ;; *) AC_MSG_ERROR([unsupported value $withval for --with-boxmodel]) ;; @@ -137,14 +137,18 @@ AS_HELP_STRING([], [valid for mipsbox: vuduo]), AC_SUBST(BOXTYPE) AC_SUBST(BOXMODEL) +AM_CONDITIONAL(BOXTYPE_GENERIC, test "$BOXTYPE" = "generic") AM_CONDITIONAL(BOXTYPE_AZBOX, test "$BOXTYPE" = "azbox") AM_CONDITIONAL(BOXTYPE_TRIPLE, test "$BOXTYPE" = "tripledragon") AM_CONDITIONAL(BOXTYPE_SPARK, test "$BOXTYPE" = "spark") -AM_CONDITIONAL(BOXTYPE_GENERIC, test "$BOXTYPE" = "generic") AM_CONDITIONAL(BOXTYPE_DUCKBOX, test "$BOXTYPE" = "duckbox") AM_CONDITIONAL(BOXTYPE_ARMBOX, test "$BOXTYPE" = "armbox") AM_CONDITIONAL(BOXTYPE_MIPSBOX, test "$BOXTYPE" = "mipsbox") +# generic +AM_CONDITIONAL(BOXMODEL_GENERIC, test "$BOXMODEL" = "generic") +AM_CONDITIONAL(BOXMODEL_RASPI, test "$BOXMODEL" = "raspi") + AM_CONDITIONAL(BOXMODEL_UFS910, test "$BOXMODEL" = "ufs910") AM_CONDITIONAL(BOXMODEL_UFS912, test "$BOXMODEL" = "ufs912") AM_CONDITIONAL(BOXMODEL_UFS913, test "$BOXMODEL" = "ufs913") @@ -173,18 +177,20 @@ AM_CONDITIONAL(BOXMODEL_ARIVALINK200, test "$BOXMODEL" = "arivalink200") AM_CONDITIONAL(BOXMODEL_TF7700, test "$BOXMODEL" = "tf7700") AM_CONDITIONAL(BOXMODEL_HL101, test "$BOXMODEL" = "hl101") +# armbox AM_CONDITIONAL(BOXMODEL_HD51, test "$BOXMODEL" = "hd51") AM_CONDITIONAL(BOXMODEL_HD60, test "$BOXMODEL" = "hd60") AM_CONDITIONAL(BOXMODEL_BRE2ZE4K, test "$BOXMODEL" = "bre2ze4k") AM_CONDITIONAL(BOXMODEL_VUSOLO4K, test "$BOXMODEL" = "vusolo4k") AM_CONDITIONAL(BOXMODEL_VUDUO4K, test "$BOXMODEL" = "vuduo4k") AM_CONDITIONAL(BOXMODEL_VUZERO4K, test "$BOXMODEL" = "vuzero4k") + +# mipsbox AM_CONDITIONAL(BOXMODEL_VUDUO, test "$BOXMODEL" = "vuduo") -AM_CONDITIONAL(BOXMODEL_GENERIC, test "$BOXMODEL" = "generic") -AM_CONDITIONAL(BOXMODEL_RASPI, test "$BOXMODEL" = "raspi") - -if test "$BOXTYPE" = "azbox"; then +if test "$BOXTYPE" = "generic"; then + AC_DEFINE(HAVE_GENERIC_HARDWARE, 1, [building for a generic device like a standard PC]) +elif test "$BOXTYPE" = "azbox"; then AC_DEFINE(HAVE_AZBOX_HARDWARE, 1, [building for an azbox]) elif test "$BOXTYPE" = "tripledragon"; then AC_DEFINE(HAVE_TRIPLEDRAGON, 1, [building for a tripledragon]) @@ -194,8 +200,6 @@ elif test "$BOXTYPE" = "spark"; then elif test "$BOXTYPE" = "duckbox"; then AC_DEFINE(HAVE_DUCKBOX_HARDWARE, 1, [building for a duckbox]) AC_DEFINE(HAVE_SH4_HARDWARE, 1, [building for a sh4 box]) -elif test "$BOXTYPE" = "generic"; then - AC_DEFINE(HAVE_GENERIC_HARDWARE, 1, [building for a generic device like a standard PC]) elif test "$BOXTYPE" = "armbox"; then AC_DEFINE(HAVE_ARM_HARDWARE, 1, [building for an armbox]) elif test "$BOXTYPE" = "mipsbox"; then @@ -203,7 +207,11 @@ elif test "$BOXTYPE" = "mipsbox"; then fi # TODO: do we need more defines? -if test "$BOXMODEL" = "ufs910"; then +if test "$BOXMODEL" = "generic"; then + AC_DEFINE(BOXMODEL_GENERIC, 1, [generic pc]) +elif test "$BOXMODEL" = "raspi"; then + AC_DEFINE(BOXMODEL_RASPI, 1, [raspberry pi]) +elif test "$BOXMODEL" = "ufs910"; then AC_DEFINE(BOXMODEL_UFS910, 1, [ufs910]) elif test "$BOXMODEL" = "ufs912"; then AC_DEFINE(BOXMODEL_UFS912, 1, [ufs912]) @@ -269,10 +277,6 @@ elif test "$BOXMODEL" = "vuzero4k"; then AC_DEFINE(BOXMODEL_VUZERO4K, 1, [vuzero4k]) elif test "$BOXMODEL" = "vuduo"; then AC_DEFINE(BOXMODEL_VUDUO, 1, [vuduo]) -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 ])