* Fix include dependencies

diff --git a/cfg_file.h b/cfg_file.h
index ff4eeb0d710de9a283b60191a68675fbd7461582..5fe89cf6d508c71c2e09191ca960385777323ce4 100644 (file)
--- a/cfg_file.h
+++ b/cfg_file.h
@@ -19,7 +19,6 @@
 #include <glib.h>
 #include "upstream.h"
 #include "memcached.h"
-#include "main.h"
 
 #define DEFAULT_BIND_PORT 768
 #define MAX_MEMCACHED_SERVERS 48

diff --git a/cfg_utils.c b/cfg_utils.c
index 03598062448499008174f4c5e393cf552c1e2402..3339e2bd0dca9f5fd0995e929884499201d59931 100644 (file)
--- a/cfg_utils.c
+++ b/cfg_utils.c
@@ -1,4 +1,5 @@
 #include <sys/types.h>
+#include <sys/socket.h>
 #include <ctype.h>
 #include <errno.h>
 #include <stdarg.h>
@@ -11,16 +12,18 @@
 #include <syslog.h>
 #include <netdb.h>
 #include <math.h>
+#include <netinet/in.h>
+#include <arpa/inet.h>
+
 #include "config.h"
+#include "cfg_file.h"
+#include "main.h"
 #ifndef HAVE_OWN_QUEUE_H
 #include <sys/queue.h>
 #else
 #include "queue.h"
 #endif
 
-#include "cfg_file.h"
-#include "memcached.h"
-
 extern int yylineno;
 extern char *yytext;
 

diff --git a/configure b/configure
index 9031313a9c3f771848607a9e7ad37a87bfccef71..ef2665501e284f5fd2394d5ae9af832a918b5fda 100755 (executable)
--- a/configure
+++ b/configure
@@ -180,7 +180,7 @@ check_include()
        if [ $? -eq 0 ] ; then 
                echo "found"
                echo "-> OK" >> config.log
-               _CFLAG=`echo "HAVE_$INCLUDE" | sed -e 's/[./]/_/g' | tr '[:lower:]' '[:upper:]'`
+               _CFLAG=`echo "$INCLUDE" | sed -e 's/[./]/_/g' | tr '[:lower:]' '[:upper:]'`
                have_opt $_CFLAG
                cleanup
                return 0

diff --git a/plugins/surbl.c b/plugins/surbl.c
index bcb5f38bade694223eebd43013cae900a35fd14e..b163a4f2f7e92afd26ab3809579895ada773a0e3 100644 (file)
--- a/plugins/surbl.c
+++ b/plugins/surbl.c
@@ -13,6 +13,7 @@
 #include <syslog.h>
 #include <fcntl.h>
 #include <stdlib.h>
+#include <string.h>
 
 #include <evdns.h>
 

diff --git a/test/rspamd_url_test.c b/test/rspamd_url_test.c
index 0db5084bfb3b9eae40e0126048f61325a41fc86b..43545252d9bb5c4aeb898ec17d228d5e5d78b8c7 100644 (file)
--- a/test/rspamd_url_test.c
+++ b/test/rspamd_url_test.c
@@ -9,7 +9,7 @@
 #include <syslog.h>
 #include <fcntl.h>
 #include <stdlib.h>
-
+#include <string.h>
 
 #include "../config.h"
 #include "../main.h"

diff --git a/url.c b/url.c
index 9fc6ecc988e2fa3c1ed6aea4c761016a7ff0b71c..367aa7d6a3d62f9673d68bd62b46aba8c9ebb8ab 100644 (file)
--- a/url.c
+++ b/url.c
@@ -7,6 +7,7 @@
 #include <arpa/inet.h>
 #include <netinet/in.h>
 #include <netdb.h>
+#include <string.h>
 
 #include "url.h"
 #include "fstring.h"

diff --git a/util.c b/util.c
index ed6d18fb615aa8587b347453bf18998f2f651a56..78ca58e5a4c42dd8db4f1af199290cedd2467acd 100644 (file)
--- a/util.c
+++ b/util.c
@@ -7,11 +7,13 @@
 #include <netdb.h>
 #include <errno.h>
 #include <unistd.h>
+#include <stdarg.h>
+#include <sys/file.h>
+
+#include "config.h"
 #ifdef HAVE_LIBUTIL_H
 #include <libutil.h>
 #endif
-#include <stdarg.h>
-#include <sys/file.h>
 #include "util.h"
 #include "cfg_file.h"
 

diff --git a/utils/url_extracter.c b/utils/url_extracter.c
index dc2138e6f4508d895632271467e8846f2f6d00eb..8cd8498dfb7a6bc4c0fa50b9daa3ce1f37821230 100644 (file)
--- a/utils/url_extracter.c
+++ b/utils/url_extracter.c
@@ -9,6 +9,7 @@
 #include <syslog.h>
 #include <fcntl.h>
 #include <stdlib.h>
+#include <string.h>
 
 #include <gmime/gmime.h>