Download-Tools/mkvtoolnix
1
0
Fork 0
mirror of https://gitlab.com/mbunkus/mkvtoolnix.git synced 2024-10-22 07:21:21 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

configure: fix libmagic test if it isn't found via pkg-config

Browse Source 
Sigh… My previous fix broke more than it fixed.
This commit is contained in:
Moritz Bunkus 2021-05-30 23:03:26 +02:00
parent 54b3ab315f
commit 62de6d53a2
No known key found for this signature in database
GPG Key ID: 74AF00ADF2E32C85
1 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
ac/magic.m4
View File

@ -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