Salastil/ncmpcpp
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Check for taglib with pkg-config before trying taglib-config (#558)

Browse Source 
Programs like taglib-config are not good when cross-compiling.
This commit is contained in:
James Le Cuirot
2024-07-24 17:07:34 +01:00
committed by GitHub
parent 95bca25cb6
commit b218d90193
1 changed files with 19 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
configure.ac
View File

@@ -257,19 +257,30 @@ PKG_CHECK_MODULES([libcurl], [libcurl], [
# taglib # taglib
if test "$taglib" != "no" ; then if test "$taglib" != "no" ; then
AC_PATH_PROG(TAGLIB_CONFIG, taglib-config) PKG_CHECK_MODULES([taglib], [taglib], [
if test "$TAGLIB_CONFIG" != "" ; then AC_SUBST(taglib_CFLAGS)
CPPFLAGS="$CPPFLAGS `$TAGLIB_CONFIG --cflags`" AC_SUBST(taglib_LIBS)
LIBS="$LIBS `$TAGLIB_CONFIG --libs`" ], [
AC_PATH_PROG([TAGLIB_CONFIG], [taglib-config])
if test "$TAGLIB_CONFIG" != ""; then
taglib_CFLAGS=`$TAGLIB_CONFIG --cflags`
taglib_LIBS=`$TAGLIB_CONFIG --libs`
else
if test "$taglib" = "yes" ; then
AC_MSG_ERROR([could not find taglib.pc or taglib-config executable])
fi
fi
])
if test "$TAGLIB_CONFIG$taglib_LIBS" != "" ; then
CPPFLAGS="$CPPFLAGS $taglib_CFLAGS"
LIBS="$LIBS $taglib_LIBS"
AC_CHECK_HEADERS([taglib.h], , AC_CHECK_HEADERS([taglib.h], ,
if test "$taglib" = "yes" ; then if test "$taglib" = "yes" ; then
AC_MSG_ERROR([missing taglib.h header]) AC_MSG_ERROR([missing taglib.h header])
fi fi
) )
else
if test "$taglib" = "yes" ; then
AC_MSG_ERROR([taglib-config executable is missing])
fi
fi fi
fi fi