diff options
author | Wolfgang Schupp <w.schupp@a1.net> | 2015-02-10 10:31:04 +0100 |
---|---|---|
committer | Wolfgang Schupp <w.schupp@a1.net> | 2015-02-10 10:31:04 +0100 |
commit | 1ec80748cfaca50873a782e2ee6603eeb3533bb4 (patch) | |
tree | d2a78c090d126154a5ab66fa3a1b1c69b4a85608 | |
parent | 62e1a68c18dc02a79aa3c2d62ebd40bd9b42224c (diff) | |
parent | c214a83060b3909ceaf834fa0df5b40fe5495cb1 (diff) |
Merge pull request #6380 from wsnipex/config-tinyxml
[configure] tinyxml upstream does not provide a pkg-config file,
-rw-r--r-- | configure.in | 14 |
1 files changed, 13 insertions, 1 deletions
diff --git a/configure.in b/configure.in index 7bcf070a86..121f41c9a6 100644 --- a/configure.in +++ b/configure.in @@ -1117,9 +1117,21 @@ if test "$use_mysql" = "yes"; then fi AC_CHECK_LIB([bluetooth], [hci_devid],, AC_MSG_RESULT([Could not find suitable version of libbluetooth])) +AC_LANG_PUSH([C++]) 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")) + [AC_RUN_IFELSE( + [AC_LANG_SOURCE([[ +#include <stdlib.h> +#include <tinyxml.h> + +int main() { + if (TIXML_MAJOR_VERSION < 2) exit(1); + if (TIXML_MAJOR_VERSION == 2 && ( TIXML_MINOR_VERSION < 6 || ( TIXML_MINOR_VERSION == 6 && TIXML_PATCH_VERSION < 2 ))) exit(1); +} + ]])],[AC_CHECK_LIB([tinyxml], [main],, AC_MSG_ERROR("tinyxml >= 2.6.2 not found"))], [AC_MSG_ERROR([tinyxml >= 2.6.2 not found])] + )]) +AC_LANG_POP([C++]) PKG_CHECK_MODULES([YAJL], [yajl >= 2], [INCLUDES="$INCLUDES $YAJL_CFLAGS"; LIBS="$LIBS $YAJL_LIBS"; YAJL_FOUND="true"], |