Merge required fix from integration

2 files changed, 4 insertions, 0 deletions

diff --git a/bitlbee.h b/bitlbee.h
index 17083ff2..e4cc2868 100644
--- a/bitlbee.h
+++ b/bitlbee.h
@@ -34,7 +34,9 @@
 
 #define MAX_STRING 128
 
+#if HAVE_CONFIG_H
 #include "config.h"
+#endif
 
 #include <fcntl.h>
 #include <time.h>
diff --git a/configure b/configure
index 365159f7..5d478010 100755
--- a/configure
+++ b/configure
@@ -123,6 +123,8 @@ fi
 
 echo CFLAGS+=-I`pwd` -I`pwd`/protocols -I. >> Makefile.settings
 
+echo CFLAGS+=-DHAVE_CONFIG_H >> Makefile.settings
+
 if [ -n "$CC" ]; then
 	echo "CC=$CC" >> Makefile.settings;
 elif type gcc > /dev/null 2> /dev/null; then