use habitat-cpp bundled JsonCPP

configure.ac

@@ -286,12 +286,6 @@ if test "x$ac_cv_want_fldigi" = "xyes"; then
     AC_FLDIGI_JPEG
 fi
 
-### jsoncpp
-if test "x$ac_cv_want_fldigi" = "xyes"; then
-    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])

habitat-cpp-connector

@@ -1 +1 @@
-Subproject commit ff9d343ebb4ba2fadcac2b83f473eb2d709a1ba9
+Subproject commit 8a2e0891ad5b971bdcf594a34373ad342ee58706

m4/build.m4

@@ -9,7 +9,7 @@ AC_DEFUN([AC_FLDIGI_BUILD_INFO], [
 -I\$(srcdir)/fileselector -I\$(srcdir)/xmlrpcpp"
 # CXXFLAGS
   FLDIGI_BUILD_CXXFLAGS="$PORTAUDIO_CFLAGS $FLTK_CFLAGS $X_CFLAGS $SNDFILE_CFLAGS $SAMPLERATE_CFLAGS \
-$PULSEAUDIO_CFLAGS $HAMLIB_CFLAGS $PNG_CFLAGS $CURL_CFLAGS $XMLRPC_CFLAGS $MAC_UNIVERSAL_CFLAGS $JSONCPP_CFLAGS \
+$PULSEAUDIO_CFLAGS $HAMLIB_CFLAGS $PNG_CFLAGS $CURL_CFLAGS $XMLRPC_CFLAGS $MAC_UNIVERSAL_CFLAGS \
 $INTL_CFLAGS $PTW32_CFLAGS $BFD_CFLAGS -pipe -Wall -fexceptions $OPT_CFLAGS $DEBUG_CFLAGS $SSL_CFLAGS"
   if test "x$target_mingw32" = "xyes"; then
       FLDIGI_BUILD_CXXFLAGS="-mthreads $FLDIGI_BUILD_CXXFLAGS"
@@ -22,7 +22,7 @@ $INTL_CFLAGS $PTW32_CFLAGS $BFD_CFLAGS -pipe -Wall -fexceptions $OPT_CFLAGS $DEB
 # LDADD
   FLDIGI_BUILD_LDADD="$PORTAUDIO_LIBS $FLTK_LIBS $X_LIBS $SNDFILE_LIBS $SAMPLERATE_LIBS \
 $PULSEAUDIO_LIBS $HAMLIB_LIBS $PNG_LIBS $CURL_LIBS $XMLRPC_LIBS $INTL_LIBS $PTW32_LIBS $BFD_LIBS $EXTRA_LIBS \
-$SSL_LIBS $JSONCPP_LIBS"
+$SSL_LIBS"
 
 # CPPFLAGS
   FLARQ_BUILD_CPPFLAGS="-I\$(srcdir) -I\$(srcdir)/include -I\$(srcdir)/fileselector \

src/Makefile.am

@@ -416,6 +416,7 @@ dl_fldigi_SOURCES += \
 	include/table.h \
 	include/textio.h \
 	include/psk_browser.h \
+	include/jsoncpp.h \
 	include/dl_fldigi/dl_fldigi.h \
 	include/dl_fldigi/flights.h \
 	include/dl_fldigi/location.h \
@@ -564,6 +565,7 @@ dl_fldigi_SOURCES += \
 	xmlrpcpp/XmlRpcValue.cpp \
 	xmlrpcpp/XmlRpcValue.h \
 	xmlrpcpp/base64.h \
+	misc/jsoncpp.cpp \
 	habitat/CouchDB.cxx \
 	habitat/Extractor.cxx \
 	habitat/EZ.cxx \

src/dl_fldigi/flights.cxx

@@ -13,7 +13,6 @@
 #include <sstream>
 #include <set>
 #include <unistd.h>
-#include <json/json.h>
 
 #include "main.h"
 #include "debug.h"
@@ -21,6 +20,7 @@
 #include "configuration.h"
 #include "confdialog.h"
 
+#include "jsoncpp.h"
 #include "habitat/RFC3339.h"
 #include "dl_fldigi/dl_fldigi.h"
 #include "dl_fldigi/hbtint.h"

src/dl_fldigi/gps.cxx

@@ -14,7 +14,6 @@
 #include <stdio.h>
 #include <fcntl.h>
 #include <unistd.h>
-#include <json/json.h>
 
 #ifndef __MINGW32__
 #include <sys/types.h>
@@ -31,6 +30,8 @@
 #include "debug.h"
 #include "fl_digi.h"
 
+#include "jsoncpp.h"
+
 #include "dl_fldigi/dl_fldigi.h"
 #include "dl_fldigi/location.h"
 #include "dl_fldigi/hbtint.h"

src/dl_fldigi/hbtint.cxx

@@ -9,7 +9,6 @@
 
 #include <string>
 #include <sstream>
-#include <json/json.h>
 
 #include <FL/Fl.H>
 
@@ -17,6 +16,7 @@
 #include "debug.h"
 #include "fl_digi.h"
 
+#include "jsoncpp.h"
 #include "habitat/EZ.h"
 #include "habitat/UKHASExtractor.h"
 

src/habitat

@@ -1 +1 @@
-../habitat-cpp-connector/src/
+../../habitat-cpp-connector/src/

src/include/dl_fldigi/flights.h

@@ -2,7 +2,7 @@
 #define DL_FLDIGI_FLIGHTS_H
 
 #include <vector>
-#include <json/json.h>
+#include "jsoncpp.h"
 
 namespace dl_fldigi {
 namespace flights {

src/include/dl_fldigi/hbtint.h

@@ -3,7 +3,7 @@
 
 #include <string>
 #include <vector>
-#include <json/json.h>
+#include "jsoncpp.h"
 #include "habitat/Extractor.h"
 #include "habitat/UploaderThread.h"
 

src/include/habitat/README

@@ -0,0 +1,6 @@
+Note: In order to build habitat-cpp-connector directly into fldigi, the
+includes are both here (so that they are are available to dl-fldigi as
+#include "habitat/*.h"), and in dl-fldigi/src/habitat/ via the symlink to
+habitat-cpp-connector/src/ (since when the habitat-cpp-connector cpp files
+themselves are compiled they expect the headers to be available in the same
+directory).

src/include/jsoncpp.h

@@ -0,0 +1 @@
+../../habitat-cpp-connector/jsoncpp/jsoncpp.h

src/misc/jsoncpp.cpp

@@ -0,0 +1 @@
+../../habitat-cpp-connector/jsoncpp/jsoncpp.cpp