diff options
| author | Max Kellermann <max@duempel.org> | 2013-12-29 14:12:33 +0100 |
|---|---|---|
| committer | Max Kellermann <max@duempel.org> | 2013-12-29 14:12:33 +0100 |
| commit | d7f80eab68b5cb0d2aa90e67fa2bb04b1bbef975 (patch) | |
| tree | d8a28a745420dee785deeb8312f07f59e6afea80 | |
| parent | e30b356eb018adcfb3efbce97c81bc0d99934826 (diff) | |
| download | mpd-d7f80eab68b5cb0d2aa90e67fa2bb04b1bbef975.tar.gz mpd-d7f80eab68b5cb0d2aa90e67fa2bb04b1bbef975.tar.xz mpd-d7f80eab68b5cb0d2aa90e67fa2bb04b1bbef975.zip | |
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.
| -rw-r--r-- | NEWS | 2 | ||||
| -rw-r--r-- | configure.ac | 2 |
2 files changed, 3 insertions, 1 deletions
@@ -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 |