From 62de6d53a257297556437b4847424d2935625495 Mon Sep 17 00:00:00 2001
From: Moritz Bunkus <mo@bunkus.online>
Date: Sun, 30 May 2021 23:03:26 +0200
Subject: [PATCH] configure: fix libmagic test if it isn't found via pkg-config
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Sigh… My previous fix broke more than it fixed.
---
 ac/magic.m4 | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)

diff --git a/ac/magic.m4 b/ac/magic.m4
index 957ede497..dd58aef22 100644
--- a/ac/magic.m4
+++ b/ac/magic.m4
@@ -17,15 +17,18 @@ if test x"$enable_magic" = xyes; then
     use_magic=yes
 
   else
+    magic_mingw_libs=""
+    if test "x$ac_cv_mingw32" = "xyes"; then
+      magic_mingw_libs="-lshlwapi"
+    fi
+
     AC_CHECK_LIB(magic, magic_open, [ magic_found=yes ], [ magic_found=no ], [-lz $GNURX_LIBS $magic_mingw_libs])
-    AC_CHECK_HEADERS([magic.h])
 
-    if test "x$magic_found" = "xyes" -a "x$ac_cv_header_magic_h" = "xyes" ; then
-      magic_mingw_libs=""
-      if test "x$ac_cv_mingw32" = "xyes"; then
-        magic_mingw_libs="-lshlwapi"
-      fi
+    if test "x$magic_found" = "xyes"; then
+      AC_CHECK_HEADERS([magic.h])
+    fi
 
+    if test "x$ac_cv_header_magic_h" = "xyes" ; then
       MAGIC_LIBS="-lmagic -lz $GNURX_LIBS $magic_mingw_libs"
       use_magic=yes
     fi