Build fixes for CollectAgent on Ubuntu. Hope it won't break the Mac

again.

CollectAgent/CollectAgent.cpp

@@ -13,9 +13,10 @@
 
 #include <sys/socket.h>
 #include <netinet/in.h>
-
+#include <signal.h>
 #include <sys/time.h>
 
+
 #include <thrift/Thrift.h>
 #include <thrift/transport/TTransport.h>
 #include <thrift/transport/TBufferTransports.h>
@@ -23,7 +24,7 @@
 #include <thrift/protocol/TProtocol.h>
 #include <thrift/protocol/TBinaryProtocol.h>
 
-#include "cassandra/cassandra.h"
+#include "cassandra/Cassandra.h"
 
 #include "mosquitto.h"
 
@@ -92,7 +93,7 @@ int main(void) {
       printf("Keyspaces:\n");
       std::vector<KsDef> keySpaces;
       myClient->describe_keyspaces(keySpaces);
-      for (int i=0; i<keySpaces.size(); i++) {
+      for (unsigned int i=0; i<keySpaces.size(); i++) {
           printf("   [%d]: %s\n", i, keySpaces[i].name.c_str());
           if(keySpaces[i].name == "dcdb") {
               dcdbKeyspace = i;
@@ -122,7 +123,7 @@ int main(void) {
 
       int sensordataCf = -1;
       printf("Column families in dcdb:\n");
-      for (int i=0; i<keySpaces[dcdbKeyspace].cf_defs.size(); i++) {
+      for (unsigned int i=0; i<keySpaces[dcdbKeyspace].cf_defs.size(); i++) {
           printf("   [%d]: %s\n", i, keySpaces[dcdbKeyspace].cf_defs[i].name.c_str());
           if (keySpaces[dcdbKeyspace].cf_defs[i].name == "sensordata") {
               sensordataCf = i;

CollectAgent/Makefile

@@ -9,6 +9,7 @@ TARGET =	CollectAgent
 SUBTARGETS = cassandra-lib check-thrift-env
 
 P =		$(shell cd ../../thrift/lib/cpp/.libs/;pwd)
+Q =		$(shell cd ../../mosquitto-1.1/lib/;pwd)
 U =		$(shell uname)
 
 $(TARGET):	$(SUBTARGETS) $(OBJS) 
@@ -23,8 +24,21 @@ check-thrift-env:
 	echo "******************************************"; echo "Please type the following line before running: "; echo '  export DYLD_LIBRARY_PATH=$$DYLD_LIBRARY_PATH:$P'; echo "******************************************"; \
 	fi; \
 	fi
+	@if [ "$U" = "Linux" ]; then \
+	R=`echo $$LD_LIBRARY_PATH | grep $P`; \
+	if [ "$$R" = "" ]; then \
+	echo "******************************************"; echo "Please type the following line before running: "; echo '  export LD_LIBRARY_PATH=$$LD_LIBRARY_PATH:$P:$Q'; echo "******************************************"; \
+	fi; \
+	fi
+
 
 cassandra-lib: cassandra-headers
+	@if [ "$U" = "Linux" ]; then \
+	echo -n "Fixing Thrift includes... "; \
+	sed -i '1i#include <stdint.h>' cassandra/cassandra_types.h; \
+	sed -i '1i#include <stdint.h>' cassandra/Cassandra.h; \
+	echo "Done."; \
+	fi
 
 cassandra-headers:
 	@if [ ! -e cassandra ]; then \