aboutsummaryrefslogtreecommitdiffstats
path: root/unix.c
diff options
context:
space:
mode:
authorWilmer van der Gaast <wilmer@gaast.net>2010-10-10 11:40:06 -0700
committerWilmer van der Gaast <wilmer@gaast.net>2010-10-10 11:40:06 -0700
commitd150a9df0b0e84a3fe30af340762f96475f4b1e5 (patch)
tree03236e1d43e44621c5c55a18ac1b2a3ac04ddf6f /unix.c
parent619770237590e4a760346f2e12681d7e2220dda4 (diff)
Alas, commit 700 becomes a boring "Oops, --otr=0 still doesn't build without
libotr installed". Also, it appears that this code needs libotr 3.2.0 or higher, but I'm not adding a build-dep since that'll cause troubles on the build bot, people can just build with BITLBEE_OTR=0.
Diffstat (limited to 'unix.c')
-rw-r--r--unix.c5
1 files changed, 4 insertions, 1 deletions
diff --git a/unix.c b/unix.c
index 07f7c5f9..ad21c716 100644
--- a/unix.c
+++ b/unix.c
@@ -28,7 +28,6 @@
#include "arc.h"
#include "base64.h"
#include "commands.h"
-#include "otr.h"
#include "protocols/nogaim.h"
#include "help.h"
#include "ipc.h"
@@ -42,6 +41,10 @@
#include <pwd.h>
#include <locale.h>
+#if defined(OTR_BI) || defined(OTR_PI)
+#include "otr.h"
+#endif
+
global_t global; /* Against global namespace pollution */
static void sighandler( int signal );