oysteikt
/
mpd
0
0
Fork 0
Code Issues Pull Requests Releases Activity

configure.ac: improved check for libyajl 1.0 

If we have libyajl 2.0.1 (without a pkg-config file), our configure.ac
would assume this is the libyajl 1.0 API, because the function
yajl_alloc() exists in both.  This commit changes the library check to
the function yajl_parse_complete() which was removed in the 2.0 API.
This fixes build failure with libyajl 2.0.1.
This commit is contained in:
Max Kellermann 2013-12-29 14:12:33 +01:00
parent e30b356eb0
commit d7f80eab68
2 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
NEWS
View File

@ -1,4 +1,6 @@
ver 0.18.7 (not yet released)
* playlist
- soundcloud: fix build failure with libyajl 2.0.1
* daemon: don't initialize supplementary groups when already running
as the configured user

2
configure.ac
View File

@ -732,7 +732,7 @@ dnl --------------------------------- Soundcloud ------------------------------
if test x$enable_soundcloud != xno; then
PKG_CHECK_MODULES([YAJL], [yajl >= 2.0],
[found_soundcloud=yes],
AC_CHECK_LIB([yajl], [yajl_alloc],
AC_CHECK_LIB([yajl], [yajl_parse_complete],
[found_soundcloud=yes YAJL_CFLAGS=-DHAVE_YAJL1 YAJL_LIBS=-lyajl],
[found_soundcloud=no]))
fi