Skip to content

Commit

Permalink
Merge pull request #6380 from wsnipex/config-tinyxml
Browse files Browse the repository at this point in the history
[configure] tinyxml upstream does not provide a pkg-config file,
  • Loading branch information
wsnipex committed Feb 10, 2015
2 parents 62e1a68 + c214a83 commit 1ec8074
Showing 1 changed file with 13 additions and 1 deletion.
14 changes: 13 additions & 1 deletion configure.in
Original file line number Diff line number Diff line change
Expand Up @@ -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"],
Expand Down

0 comments on commit 1ec8074

Please sign in to comment.