fixed compilation on debian squeeze. Removed placeHolder properties in CreateGxsForumMsg.ui and GxsGroupDialog.ui which need to be set in the cpp. Added a new DEFINE=NO_SQLCIPHER to compile without sqlcipher when sqlcipher cannot be found (no sqlcipher is available on debian squeeze).

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@7941 b45a01b8-16f6-495d-af2f-9b41ad6348cc

libretroshare/src/libretroshare.pro

@@ -143,6 +143,15 @@ linux-* {
 	target.path = $$LIB_DIR
 	INSTALLS *= target
 
+        SQLCIPHER_OK = $$system(pkg-config --exists sqlcipher && echo yes)
+        isEmpty(SQLCIPHER_OK) {
+# We need a explicit path here, to force using the home version of sqlite3 that really encrypts the database.
+		!exists(../../../lib/sqlcipher/.libs/libsqlcipher.a) {
+			message(libsqlcipher.a not found. Compilation will not use SQLCIPER. Database will be unencrypted.)
+				DEFINES *= NO_SQLCIPHER
+		}
+	}
+
 	# where to put the librarys interface
 	include_rsiface.path = $${INC_DIR}
 	include_rsiface.files = $$PUBLIC_HEADERS

libretroshare/src/util/retrodb.cc

@@ -32,7 +32,10 @@
 #include "rsdbbind.h"
 
 //#define RETRODB_DEBUG
+
+#ifndef NO_SQLCIPHER
 #define ENABLE_ENCRYPTED_DB
+#endif
 
 const int RetroDb::OPEN_READONLY = SQLITE_OPEN_READONLY;
 const int RetroDb::OPEN_READWRITE = SQLITE_OPEN_READWRITE;

libretroshare/src/util/retrodb.h

@@ -24,7 +24,11 @@
  *
  */
 
+#ifdef NO_SQLCIPHER
+#include <sqlite3.h>
+#else
 #include <sqlcipher/sqlite3.h>
+#endif
 
 #include <string>
 #include <set>

libretroshare/src/util/rsdbbind.h

@@ -26,7 +26,12 @@
 
 #include <string>
 #include <inttypes.h>
+
+#ifdef NO_SQLCIPHER
+#include <sqlite3.h>
+#else
 #include <sqlcipher/sqlite3.h>
+#endif
 
 class RetroBind
 {