added rapidjson-1.1.0 code hard-coded in the source directory to allow everyone to compile without the need to tweak too much. When v1.1.0 is mainstream (espcially on ubuntu) we can revert back to an external dependency

libretroshare/src/libretroshare.pro

@@ -17,6 +17,11 @@ DESTDIR = lib
 #QMAKE_CFLAGS += -Werror
 #QMAKE_CXXFLAGS += -Werror
 
+# when rapidjson is mainstream on all distribs, we will not need the sources anymore
+# in the meantime, they are part of the RS directory so that it is always possible to find them
+
+INCLUDEPATH += ../../rapidjson-1.1.0
+
 debug {
 #	DEFINES *= DEBUG
 #	DEFINES *= OPENDHT_DEBUG DHT_DEBUG CONN_DEBUG DEBUG_UDP_SORTER P3DISC_DEBUG DEBUG_UDP_LAYER FT_DEBUG EXTADDRSEARCH_DEBUG

libretroshare/src/serialiser/rsserializer.h

@@ -154,7 +154,7 @@
 #include <string.h>
 #include <iostream>
 #include <string>
-#include <rapidjson/document.h>
+#include <rapid_json/document.h>
 
 #include "retroshare/rsflags.h"
 #include "serialiser/rsserial.h"

libretroshare/src/serialiser/rstypeserializer.cc

@@ -36,8 +36,8 @@
 #include <string>
 #include <typeinfo> // for typeid
 
-#include <rapidjson/document.h>
-#include <rapidjson/prettywriter.h>
+#include <rapid_json/document.h>
+#include <rapid_json/prettywriter.h>
 
 //static const uint32_t MAX_SERIALIZED_ARRAY_SIZE = 500 ;
 static const uint32_t MAX_SERIALIZED_CHUNK_SIZE = 10*1024*1024 ; // 10 MB.

libretroshare/src/serialiser/rstypeserializer.h

@@ -35,7 +35,7 @@
 #include "serialiser/rsserializer.h"
 #include "serialiser/rsserializable.h"
 
-#include <rapidjson/document.h>
+#include <rapid_json/document.h>
 #include <typeinfo> // for typeid
 #include <type_traits>
 #include <errno.h>