diff options
| author | wsnipex <wsnipex@a1.net> | 2015-02-05 16:55:33 +0100 |
|---|---|---|
| committer | wsnipex <wsnipex@a1.net> | 2015-02-05 16:55:33 +0100 |
| commit | 27c749d4cedf537a755f92c5e81dd66ed4d115b7 (patch) | |
| tree | e7da70380bf2e96665b6ef8c65f7a61eaa462658 | |
| parent | d32e55ef5661d530e8a28e4668a1dc780d04e2d3 (diff) | |
[configure] check for tinyxml >= 2.6.2
| -rw-r--r-- | configure.in | 6 | ||||
| -rw-r--r-- | docs/README.linux | 2 |
2 files changed, 6 insertions, 2 deletions
diff --git a/configure.in b/configure.in index cf7365c166..7bcf070a86 100644 --- a/configure.in +++ b/configure.in @@ -1116,7 +1116,11 @@ if test "$use_mysql" = "yes"; then AC_CHECK_LIB([mysqlclient], [main],, AC_MSG_ERROR($missing_library)) fi AC_CHECK_LIB([bluetooth], [hci_devid],, AC_MSG_RESULT([Could not find suitable version of libbluetooth])) -AC_CHECK_LIB([tinyxml], [main],, AC_MSG_ERROR($missing_library)) + +PKG_CHECK_MODULES([TINYXML], [tinyxml >= 2.6.2], + [INCLUDES="$INCLUDES $TINYXML_CFLAGS"; LIBS="$LIBS $TINYXML_LIBS"], + AC_MSG_ERROR("libtinyxml >= 2.6.2 not found")) + PKG_CHECK_MODULES([YAJL], [yajl >= 2], [INCLUDES="$INCLUDES $YAJL_CFLAGS"; LIBS="$LIBS $YAJL_LIBS"; YAJL_FOUND="true"], [AC_COMPILE_IFELSE( diff --git a/docs/README.linux b/docs/README.linux index 47a22223ae..a9f1f271e5 100644 --- a/docs/README.linux +++ b/docs/README.linux @@ -53,7 +53,7 @@ Build-Depends: autoconf, automake, autopoint, autotools-dev, cmake, curl, libmodplug-dev, libmpcdec-dev, libmpeg2-4-dev, libmysqlclient-dev, libnfs-dev, libogg-dev, libpcre3-dev, libplist-dev, libpng12-dev | libpng-dev, libpostproc-dev, libpulse-dev, librtmp-dev, libsdl2-dev, libshairplay-dev, libsmbclient-dev, libsqlite3-dev, libssh-dev, - libssl-dev, libswscale-dev, libtag1-dev (>= 1.8), libtiff-dev, libtinyxml-dev, libtool, + libssl-dev, libswscale-dev, libtag1-dev (>= 1.8), libtiff-dev, libtinyxml-dev (>= 2.6.2), libtool, libudev-dev, libusb-dev, libva-dev, libvdpau-dev, libvorbis-dev, libxinerama-dev, libxml2-dev, libxmu-dev, libxrandr-dev, libxslt1-dev, libxt-dev, libyajl-dev (>=2.0), lsb-release, nasm [!amd64], python-dev, python-imaging, python-support, swig, unzip, |