Use autoheader

This commit adds a zncconfig.h to ZNC that is automatically generated by configure. This is done because the -DPACKAGE_STRING=\"znc\ 0.097\" that configure adds to CXXFLAGS breaks znc-buildmod. This means that we have to include zncconfig.h as the very first header in every C++ file that is compiled. This commit kinda cheats and instead adds this include as the very first thing to all header files we have. This should hopefully mean that modules don't have to include this. Because Csocket includes defines.h too late, this commit causes znc to divert from upstream Csocket once again. :( git-svn-id: https://znc.svn.sourceforge.net/svnroot/znc/trunk@2250 726aef4b-f618-498e-8847-2d620e286838
znc · Jan 7, 2011 · 3ecbf13 · 3ecbf13
1 parent 40a1bba
commit 3ecbf13
Show file tree

Hide file tree

Showing 27 changed files with 194 additions and 42 deletions.
diff --git a/Buffer.h b/Buffer.h
@@ -9,6 +9,7 @@
 #ifndef _BUFFER_H
 #define _BUFFER_H
 
+#include "zncconfig.h"
 #include "ZNCString.h"
 #include <deque>
 

diff --git a/Chan.h b/Chan.h
@@ -9,6 +9,7 @@
 #ifndef _CHAN_H
 #define _CHAN_H
 
+#include "zncconfig.h"
 #include "FileUtils.h"
 #include "Nick.h"
 #include "ZNCString.h"

diff --git a/Client.h b/Client.h
@@ -9,6 +9,7 @@
 #ifndef _CLIENT_H
 #define _CLIENT_H
 
+#include "zncconfig.h"
 #include "Socket.h"
 #include "Utils.h"
 #include "main.h"

diff --git a/Csocket.h b/Csocket.h
@@ -34,6 +34,9 @@
 
 #ifndef _HAS_CSOCKET_
 #define _HAS_CSOCKET_
+
+#include "zncconfig.h"
+
 #include <stdio.h>
 #include <unistd.h>
 #include <sys/time.h>

diff --git a/DCCBounce.h b/DCCBounce.h
@@ -9,6 +9,7 @@
 #ifndef _DCCBOUNCE_H
 #define _DCCBOUNCE_H
 
+#include "zncconfig.h"
 #include "Socket.h"
 
 class CUser;

diff --git a/DCCSock.h b/DCCSock.h
@@ -9,6 +9,7 @@
 #ifndef _DCCSOCK_H
 #define _DCCSOCK_H
 
+#include "zncconfig.h"
 #include "FileUtils.h"
 
 // Forward Declarations

diff --git a/FileUtils.h b/FileUtils.h
@@ -9,6 +9,7 @@
 #ifndef _FILEUTILS_H
 #define _FILEUTILS_H
 
+#include "zncconfig.h"
 #include "Socket.h"
 #include "ZNCString.h"
 #include <dirent.h>

diff --git a/HTTPSock.h b/HTTPSock.h
@@ -9,6 +9,7 @@
 #ifndef _HTTPSOCK_H
 #define _HTTPSOCK_H
 
+#include "zncconfig.h"
 #include "Socket.h"
 
 class CModule;

diff --git a/IRCSock.h b/IRCSock.h
@@ -9,6 +9,7 @@
 #ifndef _IRCSOCK_H
 #define _IRCSOCK_H
 
+#include "zncconfig.h"
 #include "Socket.h"
 #include "Nick.h"
 

diff --git a/Listener.h b/Listener.h
@@ -9,6 +9,7 @@
 #ifndef _LISTENER_H
 #define _LISTENER_H
 
+#include "zncconfig.h"
 #include "znc.h"
 
 // Forward Declarations

diff --git a/MD5.h b/MD5.h
@@ -3,6 +3,7 @@
 #ifndef _MD5_H
 #define _MD5_H
 
+#include "zncconfig.h"
 #include <string>
 using std::string;
 

diff --git a/Makefile.in b/Makefile.in
@@ -15,7 +15,7 @@ includedir  := @includedir@
 sbindir     := @sbindir@
 localstatedir := @localstatedir@
 CXX      := @CXX@
-CXXFLAGS := @DEFS@ @CPPFLAGS@ @CXXFLAGS@
+CXXFLAGS := @DEFS@ @CPPFLAGS@ @CXXFLAGS@ -I.
 LDFLAGS  := @LDFLAGS@
 LIBS     := @LIBS@
 LIBZNC   := @LIBZNC@

diff --git a/Modules.h b/Modules.h
@@ -9,6 +9,7 @@
 #ifndef _MODULES_H
 #define _MODULES_H
 
+#include "zncconfig.h"
 #include "WebModules.h"
 #include "FileUtils.h"
 #include "Utils.h"

diff --git a/Nick.h b/Nick.h
@@ -9,6 +9,7 @@
 #ifndef _NICK_H
 #define _NICK_H
 
+#include "zncconfig.h"
 #include "ZNCString.h"
 #include <set>
 #include <vector>

diff --git a/SHA256.h b/SHA256.h
@@ -37,6 +37,8 @@
 #define SHA256_DIGEST_SIZE ( 256 / 8)
 #define SHA256_BLOCK_SIZE  ( 512 / 8)
 
+#include "zncconfig.h"
+
 // C99 defines stdint.h which defines a uint32_t and uint8_t type.
 // But the other kids didn't want to play with poor little Solaris 9 and so he
 // just defines these in inttypes.h which is also part of C99 and is supposed to

diff --git a/Server.h b/Server.h
@@ -9,6 +9,7 @@
 #ifndef _SERVER_H
 #define _SERVER_H
 
+#include "zncconfig.h"
 #include "ZNCString.h"
 
 class CServer {

diff --git a/Socket.h b/Socket.h
@@ -9,6 +9,7 @@
 #ifndef SOCKET_H
 #define SOCKET_H
 
+#include "zncconfig.h"
 #include "Csocket.h"
 
 class CModule;

diff --git a/Template.h b/Template.h
@@ -9,6 +9,7 @@
 #ifndef _TEMPLATE_H
 #define _TEMPLATE_H
 
+#include "zncconfig.h"
 #include "Utils.h"
 #include <iostream>
 

diff --git a/User.h b/User.h
@@ -9,6 +9,7 @@
 #ifndef _USER_H
 #define _USER_H
 
+#include "zncconfig.h"
 #include "Buffer.h"
 #include "FileUtils.h"
 #include "Modules.h"

diff --git a/Utils.h b/Utils.h
@@ -9,6 +9,7 @@
 #ifndef _UTILS_H
 #define _UTILS_H
 
+#include "zncconfig.h"
 #include "ZNCString.h"
 #include <assert.h>
 #include <cstdio>

diff --git a/WebModules.h b/WebModules.h
@@ -9,6 +9,7 @@
 #ifndef _WEBMODULES_H
 #define _WEBMODULES_H
 
+#include "zncconfig.h"
 #include "Client.h"
 #include "Template.h"
 #include "HTTPSock.h"

diff --git a/ZNCString.h b/ZNCString.h
@@ -9,6 +9,7 @@
 #ifndef ZNCSTRING_H
 #define ZNCSTRING_H
 
+#include "zncconfig.h"
 #include <map>
 #include <set>
 #include <string>