Patrick Williams | 92b42cb | 2022-09-03 06:53:57 -0500 | [diff] [blame^] | 1 | From 263381ddd46eea2293c70bc811273b66bc52087b Mon Sep 17 00:00:00 2001 |
| 2 | From: Mateusz Marciniec <mateuszmar2@gmail.com> |
| 3 | Date: Fri, 19 Aug 2022 14:47:49 +0200 |
| 4 | Subject: [PATCH] configure.ac: Improve check for magic |
| 5 | |
| 6 | Check whether magic.h header exists before defining HAVE_MAGIC. |
| 7 | |
| 8 | Despite library availability there still can be missing header. |
| 9 | Current test doesn't cover that possibility which will lead compilation |
| 10 | to fail in case of separate sysroot. |
| 11 | |
| 12 | Upstream-Status: Backport |
| 13 | [https://github.com/util-linux/util-linux/commit/263381ddd46eea2293c70bc811273b66bc52087b] |
| 14 | |
| 15 | Signed-off-by: Mateusz Marciniec <mateuszmar2@gmail.com> |
| 16 | Signed-off-by: Tomasz Dziendzielski <tomasz.dziendzielski@gmail.com> |
| 17 | --- |
| 18 | configure.ac | 6 ++++-- |
| 19 | 1 file changed, 4 insertions(+), 2 deletions(-) |
| 20 | |
| 21 | diff --git a/configure.ac b/configure.ac |
| 22 | index daa8f0dca..968a0daf0 100644 |
| 23 | --- a/configure.ac |
| 24 | +++ b/configure.ac |
| 25 | @@ -1570,8 +1570,10 @@ AC_ARG_WITH([libmagic], |
| 26 | ) |
| 27 | AS_IF([test "x$with_libmagic" = xno], [have_magic=no], [ |
| 28 | AC_CHECK_LIB([magic], [magic_open], [ |
| 29 | - AC_DEFINE([HAVE_MAGIC], [1], [Define to 1 if you have the libmagic present.]) |
| 30 | - MAGIC_LIBS="-lmagic" |
| 31 | + AC_CHECK_HEADER(magic.h, [ |
| 32 | + AC_DEFINE([HAVE_MAGIC], [1], [Define to 1 if you have the libmagic present.]) |
| 33 | + MAGIC_LIBS="-lmagic" |
| 34 | + ]) |
| 35 | ]) |
| 36 | ]) |
| 37 | AC_SUBST([MAGIC_LIBS]) |
| 38 | -- |
| 39 | 2.37.1 |
| 40 | |