* Fix build under CentOS 5 with old glib 2.12

* Fix build of rspamd with CMAKE_BINARY_DIR differs from CMAKE_SOURCE_DIR
Rework include style.

12 files changed, 67 insertions, 67 deletions

diff --git a/src/plugins/chartable.c b/src/plugins/chartable.c
index ea30fca87..cdf7e3e4e 100644
--- a/src/plugins/chartable.c
+++ b/src/plugins/chartable.c
@@ -31,14 +31,13 @@
  *   (e.g. if threshold is 0.1 than charset change should occure more often than in 10 symbols), default: 0.1
  */
 
-#include "../config.h"
-#include "../main.h"
-#include "../message.h"
-#include "../modules.h"
-#include "../cfg_file.h"
-#include "../expressions.h"
-#include "../view.h"
-#include "../cfg_xml.h"
+#include "config.h"
+#include "main.h"
+#include "message.h"
+#include "cfg_file.h"
+#include "expressions.h"
+#include "view.h"
+#include "cfg_xml.h"
 
 #define DEFAULT_SYMBOL "R_CHARSET_MIXED"
 #define DEFAULT_THRESHOLD 0.1
diff --git a/src/plugins/custom/ipmark/ipmark.c b/src/plugins/custom/ipmark/ipmark.c
index f6d32b6ac..ab8abadeb 100644
--- a/src/plugins/custom/ipmark/ipmark.c
+++ b/src/plugins/custom/ipmark/ipmark.c
@@ -31,9 +31,9 @@
  * This plugin is a sample of custom filters system in rspamd
  */
 
-#include "../../../config.h"
-#include "../../../cfg_file.h"
-#include "../../../radix.h"
+#include "config.h"
+#include "cfg_file.h"
+#include "radix.h"
 
 #define ADD_COMMAND "add"
 #define DELETE_COMMAND "delete"
diff --git a/src/plugins/custom/regmark/metaphone.c b/src/plugins/custom/regmark/metaphone.c
index 3ac7b7c09..2285c5878 100644
--- a/src/plugins/custom/regmark/metaphone.c
+++ b/src/plugins/custom/regmark/metaphone.c
@@ -32,7 +32,7 @@
  * accesssing the array directly... 
  */
 
-#include "../../../config.h"
+#include "config.h"
 #include "metaphone.h"
 
 /*
diff --git a/src/plugins/custom/regmark/metaphone.h b/src/plugins/custom/regmark/metaphone.h
index 4de3292f9..6ea5d1be8 100644
--- a/src/plugins/custom/regmark/metaphone.h
+++ b/src/plugins/custom/regmark/metaphone.h
@@ -1,7 +1,7 @@
 #ifndef RSPAMD_METAPHONE_H
 #define RSPAMD_METAPHONE_H
 
-#include "../../../config.h"
+#include "config.h"
 
 
 #define ENCODE(c) (g_ascii_isalpha(c) ? _codes[((g_ascii_toupper(c)) - 'A')] : 0)
diff --git a/src/plugins/custom/regmark/prefix_tree.c b/src/plugins/custom/regmark/prefix_tree.c
index 5e8607aae..e86857a8e 100644
--- a/src/plugins/custom/regmark/prefix_tree.c
+++ b/src/plugins/custom/regmark/prefix_tree.c
@@ -22,7 +22,7 @@
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#include "../../../config.h"
+#include "config.h"
 #include "prefix_tree.h"
 
 static gint 
diff --git a/src/plugins/custom/regmark/prefix_tree.h b/src/plugins/custom/regmark/prefix_tree.h
index be766f80f..c52c322df 100644
--- a/src/plugins/custom/regmark/prefix_tree.h
+++ b/src/plugins/custom/regmark/prefix_tree.h
@@ -1,7 +1,7 @@
 #ifndef RSPAMD_PREFIX_TREE_H
 #define RSPAMD_PREFIX_TREE_H
 
-#include "../../../config.h"
+#include "config.h"
 
 #define LETTERS_NUMBER 26
 
diff --git a/src/plugins/custom/regmark/regmark.c b/src/plugins/custom/regmark/regmark.c
index 3b0e50903..73c30efce 100644
--- a/src/plugins/custom/regmark/regmark.c
+++ b/src/plugins/custom/regmark/regmark.c
@@ -45,9 +45,9 @@
  *  <string> level
  */
 
-#include "../../../config.h"
-#include "../../../cfg_file.h"
-#include "../../../main.h"
+#include "config.h"
+#include "cfg_file.h"
+#include "main.h"
 #include "metaphone.h"
 #include "prefix_tree.h"
 
diff --git a/src/plugins/fuzzy_check.c b/src/plugins/fuzzy_check.c
index 30e58fa45..0e581e41f 100644
--- a/src/plugins/fuzzy_check.c
+++ b/src/plugins/fuzzy_check.c
@@ -39,18 +39,17 @@
  *   fuzzy hashes
  */
 
-#include "../config.h"
-#include "../main.h"
-#include "../message.h"
-#include "../modules.h"
-#include "../cfg_file.h"
-#include "../expressions.h"
-#include "../util.h"
-#include "../view.h"
-#include "../map.h"
-#include "../images.h"
-#include "../fuzzy_storage.h"
-#include "../cfg_xml.h"
+#include "config.h"
+#include "main.h"
+#include "message.h"
+#include "cfg_file.h"
+#include "expressions.h"
+#include "util.h"
+#include "view.h"
+#include "map.h"
+#include "images.h"
+#include "fuzzy_storage.h"
+#include "cfg_xml.h"
 
 #define DEFAULT_SYMBOL "R_FUZZY_HASH"
 #define DEFAULT_UPSTREAM_ERROR_TIME 10
diff --git a/src/plugins/regexp.c b/src/plugins/regexp.c
index 3dbe2df6f..644522d87 100644
--- a/src/plugins/regexp.c
+++ b/src/plugins/regexp.c
@@ -28,18 +28,18 @@
 
 
 
-#include "../config.h"
-#include "../main.h"
-#include "../message.h"
-#include "../modules.h"
-#include "../cfg_file.h"
-#include "../map.h"
-#include "../util.h"
-#include "../expressions.h"
-#include "../view.h"
-#include "../lua/lua_common.h"
-#include "../json/jansson.h"
-#include "../cfg_xml.h"
+#include "config.h"
+#include "main.h"
+#include "message.h"
+#include "cfg_file.h"
+#include "map.h"
+#include "util.h"
+#include "expressions.h"
+#include "view.h"
+#include "lua/lua_common.h"
+#include "json/jansson.h"
+#include "cfg_xml.h"
+
 
 #define DEFAULT_STATFILE_PREFIX "./"
 
diff --git a/src/plugins/spf.c b/src/plugins/spf.c
index 1f6dcf071..5b4d7aa3a 100644
--- a/src/plugins/spf.c
+++ b/src/plugins/spf.c
@@ -32,18 +32,17 @@
  * - whitelist (map): map of whitelisted networks
  */
 
-#include "../config.h"
-#include "../main.h"
-#include "../message.h"
-#include "../modules.h"
-#include "../cfg_file.h"
-#include "../expressions.h"
-#include "../util.h"
-#include "../view.h"
-#include "../map.h"
-#include "../spf.h"
-#include "../cfg_xml.h"
-#include "../hash.h"
+#include "config.h"
+#include "main.h"
+#include "message.h"
+#include "cfg_file.h"
+#include "expressions.h"
+#include "util.h"
+#include "view.h"
+#include "map.h"
+#include "spf.h"
+#include "cfg_xml.h"
+#include "hash.h"
 
 #define DEFAULT_SYMBOL_FAIL "R_SPF_FAIL"
 #define DEFAULT_SYMBOL_SOFTFAIL "R_SPF_SOFTFAIL"
diff --git a/src/plugins/surbl.c b/src/plugins/surbl.c
index 4e7194ed0..700c86ad1 100644
--- a/src/plugins/surbl.c
+++ b/src/plugins/surbl.c
@@ -41,13 +41,17 @@
  * - bit (string): describes a prefix for a single bit
  */
 
-#include "../config.h"
-#include "../util.h"
-#include "../message.h"
-#include "../view.h"
-#include "../map.h"
-#include "../dns.h"
-#include "../cfg_xml.h"
+#include "config.h"
+#include "main.h"
+#include "message.h"
+#include "cfg_file.h"
+#include "expressions.h"
+#include "util.h"
+#include "view.h"
+#include "map.h"
+#include "dns.h"
+#include "cfg_xml.h"
+#include "hash.h"
 
 #include "surbl.h"
 
diff --git a/src/plugins/surbl.h b/src/plugins/surbl.h
index 1f56a8739..49b79ea8f 100644
--- a/src/plugins/surbl.h
+++ b/src/plugins/surbl.h
@@ -1,12 +1,11 @@
 #ifndef RSPAMD_MODULE_SURBL
 #define RSPAMD_MODULE_SURBL
 
-#include "../config.h"
-#include "../main.h"
-#include "../modules.h"
-#include "../cfg_file.h"
-#include "../memcached.h"
-#include "../trie.h"
+#include "config.h"
+#include "main.h"
+#include "cfg_file.h"
+#include "memcached.h"
+#include "trie.h"
 
 #define DEFAULT_REDIRECTOR_PORT 8080
 #define DEFAULT_SURBL_WEIGHT 10