From: Mateusz Marciniec <mateuszmar2@gmail.com>
Date: Fri, 19 Aug 2022 12:47:49 +0000 (+0200)
Subject: configure.ac: Improve check for magic
X-Git-Tag: v2.39-rc1~545
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=263381ddd46eea2293c70bc811273b66bc52087b;p=thirdparty%2Futil-linux.git

configure.ac: Improve check for magic

Check whether magic.h header exists before defining HAVE_MAGIC.

Despite library availability there still can be missing header.
Current test doesn't cover that possibility which will lead compilation
to fail in case of separate sysroot.

Signed-off-by: Mateusz Marciniec <mateuszmar2@gmail.com>
Signed-off-by: Tomasz Dziendzielski <tomasz.dziendzielski@gmail.com>
---

diff --git a/configure.ac b/configure.ac
index daa8f0dca4..968a0daf02 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1570,8 +1570,10 @@ AC_ARG_WITH([libmagic],
 )
 AS_IF([test "x$with_libmagic" = xno], [have_magic=no], [
   AC_CHECK_LIB([magic], [magic_open], [
-    AC_DEFINE([HAVE_MAGIC], [1], [Define to 1 if you have the libmagic present.])
-    MAGIC_LIBS="-lmagic"
+    AC_CHECK_HEADER(magic.h, [
+      AC_DEFINE([HAVE_MAGIC], [1], [Define to 1 if you have the libmagic present.])
+      MAGIC_LIBS="-lmagic"
+    ])
   ])
 ])
 AC_SUBST([MAGIC_LIBS])