From d7f80eab68b5cb0d2aa90e67fa2bb04b1bbef975 Mon Sep 17 00:00:00 2001 From: Max Kellermann Date: Sun, 29 Dec 2013 14:12:33 +0100 Subject: [PATCH] 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. --- NEWS | 2 ++ configure.ac | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/NEWS b/NEWS index 2c145191e..41a44e05e 100644 --- a/NEWS +++ b/NEWS @@ -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 diff --git a/configure.ac b/configure.ac index 9909cb461..b2e952808 100644 --- a/configure.ac +++ b/configure.ac @@ -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