kopia lustrzana https://github.com/jamescoxon/dl-fldigi
Move json/ to jsoncpp/ to avoid conflict with libjson0
rodzic
860c22cdd5
commit
3d5761994b
|
@ -1 +1 @@
|
|||
Subproject commit b974f5af885e9ded1bde7fd992f86e53bf8404f5
|
||||
Subproject commit a0c168fb7293a1be5d80aaf3ce9a58b54625837c
|
|
@ -3,7 +3,7 @@ AC_DEFUN([AC_FLDIGI_JSONCPP], [
|
|||
LIBS="$LIBS -ljsoncpp"
|
||||
AC_MSG_CHECKING([for libjsoncpp])
|
||||
AC_LINK_IFELSE(
|
||||
[AC_LANG_PROGRAM([#include <json/json.h>],
|
||||
[AC_LANG_PROGRAM([#include <jsoncpp/json.h>],
|
||||
[Json::Value value(123); value = "test";])],
|
||||
[AC_MSG_RESULT([yes])],
|
||||
[AC_MSG_FAILURE([libjsoncpp is not installed.])])
|
||||
|
|
|
@ -13,7 +13,7 @@
|
|||
#include <fstream>
|
||||
#include <sstream>
|
||||
#include <set>
|
||||
#include <json/json.h>
|
||||
#include <jsoncpp/json.h>
|
||||
#include <time.h>
|
||||
#include <math.h>
|
||||
#include <ctype.h>
|
||||
|
|
|
@ -5,7 +5,7 @@
|
|||
#include <string>
|
||||
#include <stdexcept>
|
||||
#include <utility>
|
||||
#include <json/json.h>
|
||||
#include <jsoncpp/json.h>
|
||||
#include "habitat/Extractor.h"
|
||||
#include "habitat/UploaderThread.h"
|
||||
|
||||
|
|
Ładowanie…
Reference in New Issue