Use pkgconfig packed with debian jsoncpp instead

pull/2/head
Daniel Richman 2012-05-26 17:27:07 +01:00
rodzic 303f290b20
commit 30760d9fb0
2 zmienionych plików z 2 dodań i 12 usunięć

Wyświetl plik

@ -286,9 +286,10 @@ fi
### jsoncpp
if test "x$ac_cv_want_fldigi" = "xyes"; then
AC_FLDIGI_JSONCPP
AC_FLDIGI_PKG_CHECK([jsoncpp], [jsoncpp >= 0.5], [no], [no])
fi
### libssl
if test "x$ac_cv_want_fldigi" = "xyes"; then
AC_FLDIGI_PKG_CHECK([ssl], [libssl], [no], [no])

Wyświetl plik

@ -1,11 +0,0 @@
AC_DEFUN([AC_FLDIGI_JSONCPP], [
AC_LANG_PUSH([C++])
LIBS="$LIBS -ljsoncpp"
AC_MSG_CHECKING([for libjsoncpp])
AC_LINK_IFELSE(
[AC_LANG_PROGRAM([#include <jsoncpp/json.h>],
[Json::Value value(123); value = "test";])],
[AC_MSG_RESULT([yes])],
[AC_MSG_FAILURE([libjsoncpp is not installed.])])
AC_LANG_POP([C++])
])