From: Karel Zak Date: Mon, 15 Jul 2019 13:32:49 +0000 (+0200) Subject: build-sys: improve hwclock CMOS dependences X-Git-Tag: v2.35-rc1~311 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=b1062292066e0568adbbdbb104b7afdcc5dac25f;p=thirdparty%2Futil-linux.git build-sys: improve hwclock CMOS dependences Let's use standard UL_* macros to check for dependencies (architectures and hwclock). Signed-off-by: Karel Zak --- diff --git a/configure.ac b/configure.ac index 8aa2fed38f..3bec9769b6 100644 --- a/configure.ac +++ b/configure.ac @@ -1516,17 +1516,16 @@ UL_BUILD_INIT([hwclock]) UL_REQUIRES_HAVE([hwclock], [io, linuxdummy], [ioperm iopl function or Linux]) AM_CONDITIONAL([BUILD_HWCLOCK], [test "x$build_hwclock" = xyes]) - -AC_ARG_ENABLE([hwclock-cmos], +AC_ARG_ENABLE([hwclock_cmos], AS_HELP_STRING([--disable-hwclock-cmos], [do not use CMOS clock]), - [], [use_hwclock_cmos="$build_hwclock"] -) - -AS_IF([test "x$use_hwclock_cmos" = xyes], [ - AM_CONDITIONAL([USE_HWCLOCK_CMOS], [true]) - AC_DEFINE([USE_HWCLOCK_CMOS], [1], [Define to 1 if want to use CMOS clock.]) -],[ - AM_CONDITIONAL([USE_HWCLOCK_CMOS], [false]) + [], [enable_hwclock_cmos=check] +) +UL_BUILD_INIT([hwclock_cmos]) +UL_REQUIRES_BUILD([hwclock_cmos], [hwclock]) +UL_REQUIRES_ARCH([hwclock_cmos], [i?86-*,x86_64*]) +AM_CONDITIONAL([USE_HWCLOCK_CMOS], [test "x$build_hwclock_cmos" = xyes]) +AS_IF([test "x$build_hwclock_cmos" = xyes ], [ + AC_DEFINE([USE_HWCLOCK_CMOS], [1], [Define to 1 if want to use CMOS clock.]) ])