At least for now, only enable OTR if the user specifically asks for it.

Distros can now ship a bitlbee-plugin-otr package (that should work with
both bitlbee and bitlbee-libpurple).

2 files changed, 8 insertions, 5 deletions

diff --git a/configure b/configure
index e5c9d299..fa7a76bd 100755
--- a/configure
+++ b/configure
@@ -33,7 +33,7 @@ debug=0
 strip=1
 gcov=0
 plugins=1
-otr=auto
+otr=0
 
 events=glib
 ldap=0
@@ -72,12 +72,14 @@ Option		Description				Default
 --twitter=0/1	Disable/enable Twitter part		$twitter
 
 --purple=0/1	Disable/enable libpurple support	$purple
+		(automatically disables other protocol modules)
 
 --debug=0/1	Disable/enable debugging		$debug
 --strip=0/1	Disable/enable binary stripping		$strip
 --gcov=0/1	Disable/enable test coverage reporting	$gcov
 --plugins=0/1	Disable/enable plugins support		$plugins
---otr=0/1	Disable/enable OTR encryption support	$otr
+--otr=0/1/auto/plugin
+		Disable/enable OTR encryption support	$otr
 
 --events=...	Event handler (glib, libevent)		$events
 --ssl=...	SSL library to use (gnutls, nss, openssl, bogus, auto)
diff --git a/doc/README b/doc/README
index 2f80ea70..5a3bb66e 100644
--- a/doc/README
+++ b/doc/README
@@ -66,9 +66,10 @@ DEPENDENCIES
 BitlBee's only real dependency is GLib. This is available on virtually every
 platform. Any recent version of GLib (2.4 or higher) will work.
 
-Off-the-Record encryption support will be included by default if the
-configure script finds libotr in one of the usual places. You can pass
---otr=1 or --otr=0 to force it on or off, respectively.
+Off-the-Record encryption support can be included if libotr is available on
+your machine. Pass --otr=1 to configure to build it into BitlBee, or
+--otr=plugin to build it as a separate loadable plugin (mostly meant for
+distro packages).
 
 These days, many IM protocols use SSL/TLS connections (for authentication
 or for the whole session). BitlBee can use several SSL libraries for this: