2 files changed, 10 insertions, 4 deletions
diff --git a/bitlbee.h b/bitlbee.h
index 26a1c982..14ca68d2 100644
--- a/bitlbee.h
+++ b/bitlbee.h
@@ -35,7 +35,9 @@ extern "C" {
 #endif
 
 #define PACKAGE "BitlBee"
+#ifndef BITLBEE_VERSION
 #define BITLBEE_VERSION "3.4.2"
+#endif
 #define VERSION BITLBEE_VERSION
 #define BITLBEE_VER(a, b, c) (((a) << 16) + ((b) << 8) + (c))
 #define BITLBEE_VERSION_CODE BITLBEE_VER(3, 4, 2)
diff --git a/irc.h b/irc.h
index 26e0c0a3..b9bf0e28 100644
--- a/irc.h
+++ b/irc.h
@@ -26,9 +26,13 @@
 #ifndef _IRC_H
 #define _IRC_H
 
-//#ifdef WITH_GNUTLS
+#ifndef CONFIG
+#include "config.h"
+#endif
+
+#ifdef WITH_GNUTLS
 # include <gnutls/gnutls.h>
-//#endif
+#endif
 
 #define IRC_MAX_LINE 512
 #define IRC_MAX_ARGS 16
@@ -92,12 +96,12 @@ typedef struct irc {
 	struct irc_user *root;
 	struct irc_user *user;
 
-//#ifdef WITH_GNUTLS
+#ifdef WITH_GNUTLS
 	int  ssl;
 	char *certfp;
 
 	gnutls_session_t ssl_session;
-//#endif
+#endif
 
 	char *password; /* HACK: Used to save the user's password, but before
 	                   logging in, this may contain a password we should