From 7668a705578a87262dfec2eff1bb3bb6a5295ced Mon Sep 17 00:00:00 2001 From: vanhofen Date: Sat, 28 Jan 2023 12:06:17 +0100 Subject: [PATCH] acinclude: move theme handling to configure.ac Origin commit data ------------------ Branch: ni/coolstream Commit: https://github.com/neutrino-images/ni-neutrino/commit/eac0dd2f7dafc1d35d841a0574ab39de96ee13ab Author: vanhofen Date: 2023-01-28 (Sat, 28 Jan 2023) Origin message was: ------------------ - acinclude: move theme handling to configure.ac ------------------ No further description and justification available within origin commit message! ------------------ This commit was generated by Migit --- acinclude.m4 | 14 -------------- configure.ac | 14 ++++++++++++++ 2 files changed, 14 insertions(+), 14 deletions(-) diff --git a/acinclude.m4 b/acinclude.m4 index 71a0eed5f..0e2844f1b 100644 --- a/acinclude.m4 +++ b/acinclude.m4 @@ -119,20 +119,6 @@ AC_ARG_ENABLE(reschange, AC_DEFINE(ENABLE_CHANGE_OSD_RESOLUTION, 1, [enable to change osd resolution])) AM_CONDITIONAL(ENABLE_RESCHANGE, test "$enable_reschange" = "yes") -# default theme -AC_ARG_WITH(default-theme, - AS_HELP_STRING([--with-default-theme=THEMENAME], [Default theme for gui @<:@default is empty@:>@]), - [default_theme="$withval"], - [default_theme=""]) -AC_DEFINE_UNQUOTED([DEFAULT_THEME], ["$default_theme"], [Default theme for gui]) - -# default oled theme -AC_ARG_WITH(default-oled-theme, - AS_HELP_STRING([--with-default-oled-theme=THEMENAME], [Default theme for oled. @<:@default is empty@:>@]), - [default_oled_theme="$withval"], - [default_oled_theme=""]) -AC_DEFINE_UNQUOTED([DEFAULT_OLED_THEME], ["$default_oled_theme"], [Default theme for oled.]) - AC_MSG_CHECKING(target) if test "$TARGET" = "native"; then diff --git a/configure.ac b/configure.ac index dbe7d73fc..9b62bd9e6 100644 --- a/configure.ac +++ b/configure.ac @@ -343,6 +343,20 @@ AC_ARG_ENABLE(fribidi, AC_DEFINE(ENABLE_FRIBIDI, 1, [enable fribidi support])) AM_CONDITIONAL(ENABLE_FRIBIDI, test "$enable_fribidi" = "yes") +# default theme +AC_ARG_WITH(default-theme, + AS_HELP_STRING([--with-default-theme=THEMENAME], [default theme for gui @<:@default is empty@:>@]), + [default_theme="$withval"], + [default_theme=""]) +AC_DEFINE_UNQUOTED([DEFAULT_THEME], ["$default_theme"], [default theme for gui]) + +# default oled theme +AC_ARG_WITH(default-oled-theme, + AS_HELP_STRING([--with-default-oled-theme=THEMENAME], [default theme for oled @<:@default is empty@:>@]), + [default_oled_theme="$withval"], + [default_oled_theme=""]) +AC_DEFINE_UNQUOTED([DEFAULT_OLED_THEME], ["$default_oled_theme"], [default theme for oled]) + AC_ARG_WITH(stb-hal-includes, AS_HELP_STRING([--with-stb-hal-includes=PATH], [path to libstb-hal includes [[NONE]]]), [STB_HAL_INC="$withval"],