cava: rebuild for iniparser

This commit is contained in:
Marcin Puc 2024-05-26 23:42:47 +02:00 committed by Leah Neukirchen
parent 504f5d445b
commit d461ff9410
2 changed files with 25 additions and 1 deletions

View File

@ -0,0 +1,24 @@
diff --git a/configure.ac b/configure.ac
index 5aeda60..6913062 100644
--- a/configure.ac
+++ b/configure.ac
@@ -423,16 +423,10 @@ dnl checking for iniparser
dnl ######################
AC_CHECK_LIB(iniparser,iniparser_load, have_iniparser=yes, have_iniparser=no)
+ PKG_CHECK_MODULES(INIPARSER, iniparser, have_iniparser=yes, have_iniparser=no)
if [[ $have_iniparser = "yes" ]] ; then
- LIBS="$LIBS -liniparser"
- CPPFLAGS="$CPPFLAGS -I/usr/include/iniparser"
- AC_LINK_IFELSE([AC_LANG_PROGRAM([[#include <iniparser.h>]],
- [[dictionary* ini;
- const char *keys[3];
- iniparser_getseckeys(ini, "eq", keys);]])],
- [AC_MSG_RESULT(iniparser > 3.2 test OK)],
- [AC_MSG_RESULT(iniparser > 3.2 test failed falling back to legacy iniparser mode)
- CPPFLAGS="$CPPFLAGS -DLEGACYINIPARSER"])
+ LIBS="$LIBS $INIPARSER_LIBS"
+ CPPFLAGS="$CPPFLAGS $INIPARSER_CFLAGS"
fi
if [[ $have_iniparser = "no" ]] ; then
AC_MSG_ERROR([iniparser library is required!])

View File

@ -1,7 +1,7 @@
# Template file for 'cava'
pkgname=cava
version=0.10.2
revision=1
revision=2
build_style=gnu-configure
hostmakedepends="autoconf-archive automake libtool pkg-config"
makedepends="fftw-devel iniparser-devel ncurses-devel SDL2-devel