[PATCH] configure: make libcheck dependency check unconditional

20 views
Skip to first unread message

Storm, Christian

unread,
Jan 8, 2024, 10:02:19 AM1/8/24
to efibootg...@googlegroups.com
From: Christian Storm <christi...@siemens.com>

libcheck is used in tools/tests which is not
dependent on the bootloader EFI being built.

Signed-off-by: Christian Storm <christi...@siemens.com>
---
configure.ac | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/configure.ac b/configure.ac
index b000603..1dfee62 100644
--- a/configure.ac
+++ b/configure.ac
@@ -199,10 +199,11 @@ fi
AS_IF([test "x$enable_bootloader" != "xno"],
[
PKG_CHECK_MODULES(LIBPCI, libpci)
- PKG_CHECK_MODULES(LIBCHECK, check)
])
AM_CONDITIONAL([BOOTLOADER], [test "x$enable_bootloader" != "xno"])

+PKG_CHECK_MODULES(LIBCHECK, check)
+
PKG_INSTALLDIR
AC_SUBST(LIBEBGENV_VERSION, $(echo $VERSION | cut -dv -f2))

--
2.43.0

Jan Kiszka

unread,
Jan 8, 2024, 10:17:02 AM1/8/24
to Storm, Christian, efibootg...@googlegroups.com, Michael Haener
Fixes - or rather reverts - 4d6e8b8eb391? Or did something change since
then? Looks like its needed, true.

Jan

--
Siemens AG, Technology
Linux Expert Center

Storm, Christian

unread,
Feb 7, 2024, 3:33:36 AM2/7/24
to Kiszka, Jan, efibootg...@googlegroups.com, Haener, Michael
Hi,

>> From: Christian Storm <christi...@siemens.com>
>>
>> libcheck is used in tools/tests which is not
>> dependent on the bootloader EFI being built.
>>
>> Signed-off-by: Christian Storm <christi...@siemens.com>
>> ---
>> configure.ac | 3 ++-
>> 1 file changed, 2 insertions(+), 1 deletion(-)
>>
>> diff --git a/configure.ac b/configure.ac
>> index b000603..1dfee62 100644
>> --- a/configure.ac
>> +++ b/configure.ac
>> @@ -199,10 +199,11 @@ fi
>> AS_IF([test "x$enable_bootloader" != "xno"],
>> [
>> PKG_CHECK_MODULES(LIBPCI, libpci)
>> - PKG_CHECK_MODULES(LIBCHECK, check)
>> ])
>> AM_CONDITIONAL([BOOTLOADER], [test "x$enable_bootloader" != "xno"])
>>
>> +PKG_CHECK_MODULES(LIBCHECK, check)
>> +
>> PKG_INSTALLDIR
>> AC_SUBST(LIBEBGENV_VERSION, $(echo $VERSION | cut -dv -f2))
>>
>
> Fixes - or rather reverts - 4d6e8b8eb391? Or did something change since
> then? Looks like its needed, true.


Ping. I haven't investigated the history or why it ended up this way,
I just fixed this...


Kind regards,
Christian

--
Dr. Christian Storm
Siemens AG, Technology, T CED OES-DE
Otto-Hahn-Ring 6, 81739 Munich, Germany

Jan Kiszka

unread,
Feb 12, 2024, 3:10:31 AM2/12/24
to Storm, Christian (T CED OES-DE), efibootg...@googlegroups.com, Häner, Michael (SI BP R&D ZG FW CCP)
Tuned the explanation while applying, thanks.
Reply all
Reply to author
Forward
0 new messages