From f665dabdff831743ea35e755b6ec1e2fe2551d9c Mon Sep 17 00:00:00 2001
From: Jelmer Vernooij <jelmer@samba.org>
Date: Sun, 12 Feb 2006 21:02:03 +1300
Subject: Initial work on new LDB-based storage backend

---
 configure | 35 +++++++++++++++++++++++++++++++++++
 1 file changed, 35 insertions(+)

(limited to 'configure')

diff --git a/configure b/configure
index 2731d5b1..f0f2adcc 100755
--- a/configure
+++ b/configure
@@ -24,6 +24,7 @@ yahoo=1
 debug=0
 strip=1
 ipv6=1
+ldb=auto
 ssl=auto
 
 arch=`uname -s`
@@ -59,6 +60,8 @@ Option		Description				Default
 
 --ipv6=0/1	IPv6 socket support			$ipv6
 
+--ldb=0/1/auto	LDB support				$ldb
+
 --ssl=...	SSL library to use (gnutls, nss, openssl, bogus, auto)
 							$ssl
 EOF
@@ -210,6 +213,20 @@ EOF
 	fi;
 }
 
+detect_ldb()
+{
+	if $PKG_CONFIG --version > /dev/null 2>/dev/null && $PKG_CONFIG ldb; then
+		cat<<EOF>>Makefile.settings
+EFLAGS+=`$PKG_CONFIG --libs ldb`
+CFLAGS+=`$PKG_CONFIG --cflags ldb`
+EOF
+		ldb=1
+		ret=1
+	else
+		ret=0
+	fi
+}
+
 if [ "$msn" = 1 -o "$jabber" = 1 ]; then
 	if [ "$ssl" = "auto" ]; then
 		detect_gnutls
@@ -270,6 +287,18 @@ if [ "$msn" = 1 -o "$jabber" = 1 ]; then
 	echo 'SSL_CLIENT=ssl_'$ssl'.o' >> Makefile.settings
 fi
 
+if [ "$ldb" = "auto" ]; then
+	detect_ldb
+fi
+
+if [ "$ldb" = 0 ]; then
+	echo "LDB_OBJ=\# no ldb" >> Makefile.settings
+	echo "#undef LDB" >> config.h
+elif [ "$ldb" = 1 ]; then
+	echo "#define LDB 1" >> config.h
+	echo "LDB_OBJ=storage_ldb.o" >> Makefile.settings
+fi
+
 if [ "$strip" = 0 ]; then
 	echo "STRIP=\# skip strip" >> Makefile.settings;
 else
@@ -407,3 +436,9 @@ if [ -n "$protocols" ]; then
 else
 	echo '  Building without IM-protocol support. We wish you a lot of fun...';
 fi
+
+if [ "$ldb" = "0" ]; then
+	echo "  LDB storage backend disabled."
+else
+	echo "  LDB storage backend enabled."
+fi
-- 
cgit v1.2.3


From f32d5578d7039f1e61e99b2e1f7bfd0a47828c8c Mon Sep 17 00:00:00 2001
From: Jelmer Vernooij <jelmer@samba.org>
Date: Fri, 24 Mar 2006 16:53:29 +0100
Subject: Switch from LDB to LDAP (LDB's authentication subsystem is not mature
 enough yet)

---
 configure | 30 +++++++++++++++---------------
 1 file changed, 15 insertions(+), 15 deletions(-)

(limited to 'configure')

diff --git a/configure b/configure
index 60d27b2e..6426a789 100755
--- a/configure
+++ b/configure
@@ -27,7 +27,7 @@ yahoo=1
 debug=0
 strip=1
 ipv6=1
-ldb=auto
+ldap=auto
 ssl=auto
 
 arch=`uname -s`
@@ -64,7 +64,7 @@ Option		Description				Default
 
 --ipv6=0/1	IPv6 socket support			$ipv6
 
---ldb=0/1/auto	LDB support				$ldb
+--ldap=0/1/auto	LDAP support				$ldap
 
 --ssl=...	SSL library to use (gnutls, nss, openssl, bogus, auto)
 							$ssl
@@ -223,14 +223,14 @@ EOF
 	fi;
 }
 
-detect_ldb()
+detect_ldap()
 {
 	if $PKG_CONFIG --version > /dev/null 2>/dev/null && $PKG_CONFIG ldb; then
 		cat<<EOF>>Makefile.settings
 EFLAGS+=`$PKG_CONFIG --libs ldb`
 CFLAGS+=`$PKG_CONFIG --cflags ldb`
 EOF
-		ldb=1
+		ldap=1
 		ret=1
 	else
 		ret=0
@@ -297,16 +297,16 @@ if [ "$msn" = 1 -o "$jabber" = 1 ]; then
 	echo 'SSL_CLIENT=ssl_'$ssl'.o' >> Makefile.settings
 fi
 
-if [ "$ldb" = "auto" ]; then
-	detect_ldb
+if [ "$ldap" = "auto" ]; then
+	detect_ldap
 fi
 
-if [ "$ldb" = 0 ]; then
-	echo "LDB_OBJ=\# no ldb" >> Makefile.settings
-	echo "#undef LDB" >> config.h
-elif [ "$ldb" = 1 ]; then
-	echo "#define LDB 1" >> config.h
-	echo "LDB_OBJ=storage_ldb.o" >> Makefile.settings
+if [ "$ldap" = 0 ]; then
+	echo "LDAP_OBJ=\# no ldap" >> Makefile.settings
+	echo "#undef LDAP" >> config.h
+elif [ "$ldap" = 1 ]; then
+	echo "#define LDAP 1" >> config.h
+	echo "LDAP_OBJ=storage_ldap.o" >> Makefile.settings
 fi
 
 if [ "$strip" = 0 ]; then
@@ -460,8 +460,8 @@ else
 	echo '  Building without IM-protocol support. We wish you a lot of fun...';
 fi
 
-if [ "$ldb" = "0" ]; then
-	echo "  LDB storage backend disabled."
+if [ "$ldap" = "0" ]; then
+	echo "  LDAP storage backend disabled."
 else
-	echo "  LDB storage backend enabled."
+	echo "  LDAP storage backend enabled."
 fi
-- 
cgit v1.2.3


From 85cf37ff0121898d01e9830e237f41f3ddd7dfaa Mon Sep 17 00:00:00 2001
From: Wilmer van der Gaast <wilmer@gaast.net>
Date: Sun, 14 May 2006 12:32:21 +0200
Subject: Added --events= flag to configure.

---
 configure | 45 +++++++++++++++++++++++++++++++++++++--------
 1 file changed, 37 insertions(+), 8 deletions(-)

(limited to 'configure')

diff --git a/configure b/configure
index a602fe3a..68baaa7e 100755
--- a/configure
+++ b/configure
@@ -13,11 +13,12 @@ etcdir='$prefix/etc/bitlbee/'
 mandir='$prefix/share/man/'
 datadir='$prefix/share/bitlbee/'
 config='/var/lib/bitlbee/'
+plugindir='$prefix/lib/bitlbee/'
+includedir='$prefix/include/bitlbee/'
+libevent='/usr/'
 pidfile='/var/run/bitlbee.pid'
 ipcsocket='/var/run/bitlbee'
-plugindir='$prefix/lib/bitlbee'
 pcdir='$prefix/lib/pkgconfig'
-includedir='$prefix/include/bitlbee'
 
 msn=1
 jabber=1
@@ -27,6 +28,8 @@ yahoo=1
 debug=0
 strip=1
 ipv6=1
+
+events=glib
 ssl=auto
 
 arch=`uname -s`
@@ -63,6 +66,7 @@ Option		Description				Default
 
 --ipv6=0/1	IPv6 socket support			$ipv6
 
+--events=...	Event handler (glib, libevent)		$events
 --ssl=...	SSL library to use (gnutls, nss, openssl, bogus, auto)
 							$ssl
 EOF
@@ -79,9 +83,11 @@ mandir=`eval echo "$mandir/" | sed 's/\/\{1,\}/\//g'`
 datadir=`eval echo "$datadir/" | sed 's/\/\{1,\}/\//g'`
 config=`eval echo "$config/" | sed 's/\/\{1,\}/\//g'`
 plugindir=`eval echo "$plugindir/" | sed 's/\/\{1,\}/\//g'`
+includedir=`eval echo "$includedir"/ | sed 's/\/\{1,\}/\//g'`
+libevent=`eval echo "$libevent"/ | sed 's/\/\{1,\}/\//g'`
+
 pidfile=`eval echo "$pidfile" | sed 's/\/\{1,\}/\//g'`
 ipcsocket=`eval echo "$ipcsocket" | sed 's/\/\{1,\}/\//g'`
-includedir=`eval echo "$includedir" | sed 's/\/\{1,\}/\//g'`
 pcdir=`eval echo "$pcdir" | sed 's/\/\{1,\}/\//g'`
 
 cat<<EOF>Makefile.settings
@@ -182,12 +188,36 @@ fi
 if [ -r /usr/include/iconv.h ]; then
 	:;
 elif [ -r /usr/local/include/iconv.h ]; then
-	echo CFLAGS+=-I/usr/local/include >> Makefile.settings;
+	echo CFLAGS+=-I/usr/local/include >> Makefile.settings
 else
 	echo
 	echo 'Warning: Could not find iconv.h, you might have to install it and/or modify'
-	echo 'Makefile.settings to tell where this file is.';
+	echo 'Makefile.settings to tell where this file is.'
+fi
+
+
+if [ "$events" = "libevent" ]; then
+	if ! [ -e "${libevent}include/event.h" ]; then
+		echo
+		echo 'Warning: Could not find event.h, you might have to install it and/or specify'
+		echo 'its location using the --libevent= argument. (Example: If event.h is in'
+		echo '/usr/local/include and binaries are in /usr/local/lib: --libevent=/usr/local)'
+	fi
+	
+	echo '#define EVENTS_LIBEVENT' >> config.h
+	cat <<EOF>>Makefile.settings
+EFLAGS+=-levent -L${libevent}lib
+CFLAGS+=-I${libevent}include
+EOF
+elif [ "$events" = "glib" ]; then
+	## We already use glib anyway, so this is all we need (and in fact not even this, but just to be sure...):
+	echo '#define EVENTS_GLIB' >> config.h
+else
+	echo
+	echo 'ERROR: Unknown event handler specified.'
+	exit 1
 fi
+echo 'EVENT_HANDLER=events_'$events'.o' >> Makefile.settings
 
 
 detect_gnutls()
@@ -421,9 +451,8 @@ else
 	echo '  Binary stripping disabled.';
 fi
 
-if [ "$msn" = "1" ]; then
-	echo '  Using SSL library: '$ssl;
-fi
+echo '  Using event handler: '$events;
+echo '  Using SSL library: '$ssl;
 
 #if [ "$flood" = "0" ]; then
 #	echo '  Flood protection disabled.';
-- 
cgit v1.2.3


From 574af7e01a0cc738b4bbe7e903572943a85b9691 Mon Sep 17 00:00:00 2001
From: Jelmer Vernooij <jelmer@samba.org>
Date: Fri, 26 May 2006 01:20:54 +0200
Subject: Require GLib 2

---
 configure | 35 +++++------------------------------
 1 file changed, 5 insertions(+), 30 deletions(-)

(limited to 'configure')

diff --git a/configure b/configure
index 63047303..ac7ff3b6 100755
--- a/configure
+++ b/configure
@@ -162,38 +162,16 @@ if [ -z "$PKG_CONFIG" ]; then
 	PKG_CONFIG=pkg-config
 fi
 
-GLIB=0
-
 if $PKG_CONFIG --version > /dev/null 2>/dev/null && $PKG_CONFIG glib-2.0; then
 	cat<<EOF>>Makefile.settings
 EFLAGS+=`$PKG_CONFIG --libs glib-2.0 gmodule-2.0`
 CFLAGS+=`$PKG_CONFIG --cflags glib-2.0 gmodule-2.0`
 EOF
-	echo '#define GLIB2' >> config.h
-	GLIB=2
-elif type glib-config > /dev/null 2> /dev/null; then
-	cat<<EOF>>Makefile.settings
-EFLAGS+=`glib-config --libs`
-CFLAGS+=`glib-config --cflags`
-EOF
-	echo '#define GLIB1' >> config.h
-	GLIB=1
 else
-	echo 'Cannot find glib development libraries, aborting. (Install libglib-dev?)'
+	echo 'Cannot find glib2 development libraries, aborting. (Install libglib2-dev?)'
 	exit 1;
 fi
 
-if [ GLIB = 1 -o -r /usr/include/iconv.h ]; then
-	:;
-elif [ -r /usr/local/include/iconv.h ]; then
-	echo CFLAGS+=-I/usr/local/include >> Makefile.settings;
-else
-	echo
-	echo 'Warning: Could not find iconv.h, you might have to install it and/or modify'
-	echo 'Makefile.settings to tell where this file is.';
-fi
-
-
 detect_gnutls()
 {
 	if libgnutls-config --version > /dev/null 2> /dev/null; then
@@ -389,18 +367,15 @@ Linux )
 GNU/* )
 ;;
 *BSD )
-	echo 'EFLAGS+=-liconv' >> Makefile.settings;
-;;
-SunOS )
-	echo 'EFLAGS+=-lresolv -lnsl -lsocket' >> Makefile.settings
-	echo 'STRIP=\# skip strip' >> Makefile.settings
-	echo 'EFLAGS+=-liconv' >> Makefile.settings;
 ;;
 Darwin )
-	echo 'EFLAGS+=-liconv' >> Makefile.settings;
 ;;
 IRIX )
 ;;
+SunOS )
+	echo 'EFLAGS+=-lresolv -lnsl -lsocket' >> Makefile.settings
+	echo 'STRIP=\# skip strip' >> Makefile.settings
+;;
 CYGWIN* )
 	echo 'Cygwin is not officially supported.'
 ;;
-- 
cgit v1.2.3


From 5973412f44269f6cb796c9d6d38c151290c7367a Mon Sep 17 00:00:00 2001
From: Jelmer Vernooij <jelmer@samba.org>
Date: Sat, 3 Jun 2006 22:52:40 +0200
Subject: Try to detect -lldap

---
 configure | 21 +++++++++++++--------
 1 file changed, 13 insertions(+), 8 deletions(-)

(limited to 'configure')

diff --git a/configure b/configure
index 97df1e27..c8a4c49f 100755
--- a/configure
+++ b/configure
@@ -142,16 +142,18 @@ 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;
+	CC=$CC
 elif type gcc > /dev/null 2> /dev/null; then
-	echo "CC=gcc" >> Makefile.settings;
+	CC=gcc
 elif type cc > /dev/null 2> /dev/null; then
-	echo "CC=cc" >> Makefile.settings;
+	CC=cc
 else
 	echo 'Cannot find a C compiler, aborting.'
 	exit 1;
 fi
 
+echo "CC=$CC" >> Makefile.settings;
+
 if [ -n "$LD" ]; then
 	echo "LD=$LD" >> Makefile.settings;
 elif type ld > /dev/null 2> /dev/null; then
@@ -207,14 +209,17 @@ EOF
 
 detect_ldap()
 {
-	if $PKG_CONFIG --version > /dev/null 2>/dev/null && $PKG_CONFIG ldb; then
+	TMPFILE=`mktemp`
+	if $CC -o $TMPFILE -shared -lldap 2>/dev/null >/dev/null; then
 		cat<<EOF>>Makefile.settings
-EFLAGS+=`$PKG_CONFIG --libs ldb`
-CFLAGS+=`$PKG_CONFIG --cflags ldb`
+EFLAGS+=-lldap
+CFLAGS+=
 EOF
 		ldap=1
+		rm -f $TMPFILE
 		ret=1
 	else
+		ldap=0
 		ret=0
 	fi
 }
@@ -285,9 +290,9 @@ fi
 
 if [ "$ldap" = 0 ]; then
 	echo "LDAP_OBJ=\# no ldap" >> Makefile.settings
-	echo "#undef LDAP" >> config.h
+	echo "#undef WITH_LDAP" >> config.h
 elif [ "$ldap" = 1 ]; then
-	echo "#define LDAP 1" >> config.h
+	echo "#define WITH_LDAP 1" >> config.h
 	echo "LDAP_OBJ=storage_ldap.o" >> Makefile.settings
 fi
 
-- 
cgit v1.2.3


From 10efa911cbf0d3761d42cc3e57973c8cd1a92821 Mon Sep 17 00:00:00 2001
From: Wilmer van der Gaast <wilmer@gaast.net>
Date: Sat, 17 Jun 2006 13:39:17 +0200
Subject: Fixed bug in LDAP Makefile generation.

---
 configure | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'configure')

diff --git a/configure b/configure
index b05aa155..05fb7cb4 100755
--- a/configure
+++ b/configure
@@ -318,7 +318,7 @@ if [ "$ldap" = "auto" ]; then
 fi
 
 if [ "$ldap" = 0 ]; then
-	echo "LDAP_OBJ=\# no ldap" >> Makefile.settings
+	echo "LDAP_OBJ=" >> Makefile.settings
 	echo "#undef WITH_LDAP" >> config.h
 elif [ "$ldap" = 1 ]; then
 	echo "#define WITH_LDAP 1" >> config.h
-- 
cgit v1.2.3


From df1694b9559d4abec748b0506b5f44e684d022a8 Mon Sep 17 00:00:00 2001
From: Wilmer van der Gaast <wilmer@gaast.net>
Date: Sun, 25 Jun 2006 14:15:42 +0200
Subject: Moving all generic files to lib/ instead of having some in / and some
 in protocols/, and adding RC4 code.

---
 configure | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'configure')

diff --git a/configure b/configure
index 05fb7cb4..3a333029 100755
--- a/configure
+++ b/configure
@@ -143,7 +143,7 @@ else
 	echo 'CFLAGS=-O3' >> Makefile.settings
 fi
 
-echo CFLAGS+=-I`pwd` -I`pwd`/protocols -I. >> Makefile.settings
+echo CFLAGS+=-I`pwd` -I`pwd`/lib -I`pwd`/protocols -I. >> Makefile.settings
 
 echo CFLAGS+=-DHAVE_CONFIG_H >> Makefile.settings
 
-- 
cgit v1.2.3


From b3c467bc312114eb7cdd45e6bc36a3d87bee6064 Mon Sep 17 00:00:00 2001
From: Wilmer van der Gaast <wilmer@gaast.net>
Date: Wed, 28 Jun 2006 11:59:33 +0200
Subject: Cleaned up Makefiles + configure: Cleaning up bitlbee.pc, removed the
 second piece of libevent probing code that mysteriously appeared (?), better
 handling of storage backends, an SSL module is now always included (so
 BitlBee can be compiled again when building without MSN- and Jabber-support
 (http_client also depends on SSL libs and can't be disabled)), oh, and fixed
 a compiler warning.

---
 configure | 179 +++++++++++++++++++++++++++-----------------------------------
 1 file changed, 77 insertions(+), 102 deletions(-)

(limited to 'configure')

diff --git a/configure b/configure
index fc9caffe..7cc99b41 100755
--- a/configure
+++ b/configure
@@ -206,29 +206,6 @@ else
 fi
 echo 'EVENT_HANDLER=events_'$events'.o' >> Makefile.settings
 
-if [ "$events" = "libevent" ]; then
-	if ! [ -e "${libevent}include/event.h" ]; then
-		echo
-		echo 'Warning: Could not find event.h, you might have to install it and/or specify'
-		echo 'its location using the --libevent= argument. (Example: If event.h is in'
-		echo '/usr/local/include and binaries are in /usr/local/lib: --libevent=/usr/local)'
-	fi
-	
-	echo '#define EVENTS_LIBEVENT' >> config.h
-	cat <<EOF>>Makefile.settings
-EFLAGS+=-levent -L${libevent}lib
-CFLAGS+=-I${libevent}include
-EOF
-elif [ "$events" = "glib" ]; then
-	## We already use glib anyway, so this is all we need (and in fact not even this, but just to be sure...):
-	echo '#define EVENTS_GLIB' >> config.h
-else
-	echo
-	echo 'ERROR: Unknown event handler specified.'
-	exit 1
-fi
-echo 'EVENT_HANDLER=events_'$events'.o' >> Makefile.settings
-
 detect_gnutls()
 {
 	if libgnutls-config --version > /dev/null 2> /dev/null; then
@@ -276,78 +253,89 @@ EOF
 	fi
 }
 
-if [ "$msn" = 1 -o "$jabber" = 1 ]; then
-	if [ "$ssl" = "auto" ]; then
-		detect_gnutls
-		if [ "$ret" = "0" ]; then
-			detect_nss
-		fi;
-	elif [ "$ssl" = "gnutls" ]; then
-		detect_gnutls;
-	elif [ "$ssl" = "nss" ]; then
-		detect_nss;
-	elif [ "$ssl" = "openssl" ]; then
-		echo
-		echo 'No detection code exists for OpenSSL. Make sure that you have a complete'
-		echo 'install of OpenSSL (including devel/header files) before reporting'
-		echo 'compilation problems.'
-		echo
-		echo 'Also, keep in mind that the OpenSSL is, according to some people, not'
-		echo 'completely GPL-compatible. Using GnuTLS or NSS is recommended and better'
-		echo 'supported by us. However, on many BSD machines, OpenSSL can be considered'
-		echo 'part of the operating system, which makes it GPL-compatible.'
-		echo
-		echo 'For more info, see: http://www.openssl.org/support/faq.html#LEGAL2'
-		echo '                    http://www.gnome.org/~markmc/openssl-and-the-gpl.html'
-		echo
-		echo 'Please note that distributing a BitlBee binary which links to OpenSSL is'
-		echo 'probably illegal. If you want to create and distribute a binary BitlBee'
-		echo 'package, you really should use GnuTLS or NSS instead.'
-		echo
-		echo 'Also, the OpenSSL license requires us to say this:'
-		echo ' *    "This product includes software developed by the OpenSSL Project'
-		echo ' *    for use in the OpenSSL Toolkit. (http://www.openssl.org/)"'
-		
-		echo 'EFLAGS+=-lssl -lcrypto' >> Makefile.settings
-		
-		ret=1;
-	elif [ "$ssl" = "bogus" ]; then
-		echo
-		echo 'Using bogus SSL code. This will not make the MSN module work, but it will'
-		echo 'allow you to use the Jabber module - although without working SSL support.'
-		
-		ret=1;
-	else
-		echo
-		echo 'ERROR: Unknown SSL library specified.'
-		exit 1;
+if [ "$ssl" = "auto" ]; then
+	detect_gnutls
+	if [ "$ret" = "0" ]; then
+		detect_nss
 	fi
+elif [ "$ssl" = "gnutls" ]; then
+	detect_gnutls
+elif [ "$ssl" = "nss" ]; then
+	detect_nss
+elif [ "$ssl" = "openssl" ]; then
+	echo
+	echo 'No detection code exists for OpenSSL. Make sure that you have a complete'
+	echo 'install of OpenSSL (including devel/header files) before reporting'
+	echo 'compilation problems.'
+	echo
+	echo 'Also, keep in mind that the OpenSSL is, according to some people, not'
+	echo 'completely GPL-compatible. Using GnuTLS or NSS is recommended and better'
+	echo 'supported by us. However, on many BSD machines, OpenSSL can be considered'
+	echo 'part of the operating system, which makes it GPL-compatible.'
+	echo
+	echo 'For more info, see: http://www.openssl.org/support/faq.html#LEGAL2'
+	echo '                    http://www.gnome.org/~markmc/openssl-and-the-gpl.html'
+	echo
+	echo 'Please note that distributing a BitlBee binary which links to OpenSSL is'
+	echo 'probably illegal. If you want to create and distribute a binary BitlBee'
+	echo 'package, you really should use GnuTLS or NSS instead.'
+	echo
+	echo 'Also, the OpenSSL license requires us to say this:'
+	echo ' *    "This product includes software developed by the OpenSSL Project'
+	echo ' *    for use in the OpenSSL Toolkit. (http://www.openssl.org/)"'
 	
-	if [ "$ret" = "0" ]; then
+	echo 'EFLAGS+=-lssl -lcrypto' >> Makefile.settings
+	
+	ret=1
+elif [ "$ssl" = "bogus" ]; then
+	echo
+	echo 'Using bogus SSL code. This means some features have to be disabled.'
+	
+	## Yes, you, at the console! How can you authenticate if you don't have any SSL!?
+	if [ "$msn" = "1" ]; then
 		echo
-		echo 'ERROR: Could not find a suitable SSL library (GnuTLS, libnss or OpenSSL).'
-		echo '       This is necessary for MSN and full Jabber support. To continue,'
-		echo '       install a suitable SSL library or disable MSN support (--msn=0).'
-		echo '       If you want Jabber without SSL support you can try --ssl=bogus.'
-		
-		exit 1;
-	fi;
+		echo 'Real SSL support is necessary for MSN authentication, will build without'
+		echo 'MSN protocol support.'
+		msn=0
+	fi
 	
-	echo 'SSL_CLIENT=ssl_'$ssl'.o' >> Makefile.settings
+	ret=1
+else
+	echo
+	echo 'ERROR: Unknown SSL library specified.'
+	exit 1
 fi
 
+if [ "$ret" = "0" ]; then
+	echo
+	echo 'ERROR: Could not find a suitable SSL library (GnuTLS, libnss or OpenSSL).'
+	echo '       Please note that this script doesn'\''t have detection code for OpenSSL,'
+	echo '       so if you want to use that, you have to select it by hand. If you don'\''t'
+	echo '       need SSL support, you can select the "bogus" SSL library. (--ssl=bogus)'
+	
+	exit 1
+fi;
+
+echo 'SSL_CLIENT=ssl_'$ssl'.o' >> Makefile.settings
+
+STORAGES="text xml"
+
 if [ "$ldap" = "auto" ]; then
 	detect_ldap
 fi
 
 if [ "$ldap" = 0 ]; then
-	echo "LDAP_OBJ=" >> Makefile.settings
 	echo "#undef WITH_LDAP" >> config.h
 elif [ "$ldap" = 1 ]; then
 	echo "#define WITH_LDAP 1" >> config.h
-	echo "LDAP_OBJ=storage_ldap.o" >> Makefile.settings
+	STORAGES="$STORAGES ldap"
 fi
 
+for i in $STORAGES; do
+	STORAGE_OBJS="$STORAGE_OBJS storage_$i.o"
+done
+echo "STORAGE_OBJS="$STORAGE_OBJS >> Makefile.settings
+
 if [ "$strip" = 0 ]; then
 	echo "STRIP=\# skip strip" >> Makefile.settings;
 else
@@ -360,8 +348,6 @@ else
 		echo "STRIP=$STRIP" >> Makefile.settings;
 	elif type strip > /dev/null 2> /dev/null; then
 		echo "STRIP=strip" >> Makefile.settings;
-	elif /bin/test -x /usr/ccs/bin/strip; then
-		echo "STRIP=/usr/ccs/bin/strip" >> Makefile.settings;
 	else
 		echo
 		echo 'No strip utility found, cannot remove unnecessary parts from executable.'
@@ -440,7 +426,7 @@ fi
 
 if [ "$protocols" = "PROTOCOLS = " ]; then
 	echo "WARNING: You haven't selected any communication protocol to compile!"
-	echo "         Bitlbee will run, but you will be unable to connect to IM servers!"
+	echo "         BitlBee will run, but you will be unable to connect to IM servers!"
 fi
 
 echo "PROTOCOLS = $protocols" >> Makefile.settings
@@ -475,34 +461,23 @@ echo
 echo 'Configuration done:'
 
 if [ "$debug" = "1" ]; then
-	echo '  Debugging enabled.';
+	echo '  Debugging enabled.'
 else
-	echo '  Debugging disabled.';
+	echo '  Debugging disabled.'
 fi
 
 if [ "$strip" = "1" ]; then
-	echo '  Binary stripping enabled.';
+	echo '  Binary stripping enabled.'
 else
-	echo '  Binary stripping disabled.';
+	echo '  Binary stripping disabled.'
 fi
 
-echo '  Using event handler: '$events;
-echo '  Using SSL library: '$ssl;
-
-#if [ "$flood" = "0" ]; then
-#	echo '  Flood protection disabled.';
-#else
-#	echo '  Flood protection enabled.';
-#fi
+echo '  Using event handler: '$events
+echo '  Using SSL library: '$ssl
+echo '  Building with these storage backends: '$STORAGES
 
 if [ -n "$protocols" ]; then
-	echo '  Building with these protocols:' $protocols;
-else
-	echo '  Building without IM-protocol support. We wish you a lot of fun...';
-fi
-
-if [ "$ldap" = "0" ]; then
-	echo "  LDAP storage backend disabled."
+	echo '  Building with these protocols:' $protocols
 else
-	echo "  LDAP storage backend enabled."
+	echo '  Building without IM-protocol support. We wish you a lot of fun...'
 fi
-- 
cgit v1.2.3


From 66b9e86eafc3709c491f96c917069db8b6a0c895 Mon Sep 17 00:00:00 2001
From: Jelmer Vernooij <jelmer@samba.org>
Date: Fri, 7 Jul 2006 15:33:31 +0200
Subject: Add support for checking test suite coverage using gcov.

---
 configure | 7 +++++++
 1 file changed, 7 insertions(+)

(limited to 'configure')

diff --git a/configure b/configure
index a3c16e75..43bd2f95 100755
--- a/configure
+++ b/configure
@@ -27,6 +27,7 @@ yahoo=1
 
 debug=0
 strip=1
+gcov=0
 ipv6=1
 
 events=glib
@@ -63,6 +64,7 @@ Option		Description				Default
 
 --debug=0/1	Disable/enable debugging		$debug
 --strip=0/1	Disable/enable binary stripping		$strip
+--gcov=0/1	Disable/enable test coverage reporting	$gcov
 
 --ipv6=0/1	IPv6 socket support			$ipv6
 
@@ -313,6 +315,11 @@ else
 	fi;
 fi
 
+if [ "$gcov" = "1" ]; then
+	echo "CFLAGS+=-ftest-coverage -fprofile-arcs" >> Makefile.settings
+	echo "EFLAGS+=-lgcov" >> Makefile.settings
+fi
+
 echo
 if [ -z "$BITLBEE_VERSION" -a -d .bzr ] && type bzr > /dev/null 2> /dev/null; then
 	nick=`bzr nick`
-- 
cgit v1.2.3


From 36e9f62a6e6fdb1217b3b819320ac5a94025c448 Mon Sep 17 00:00:00 2001
From: Wilmer van der Gaast <wilmer@gaast.net>
Date: Sat, 7 Oct 2006 19:46:28 +0200
Subject: Added SRV lookups to automatically find out the correct server for a
 domain.

---
 configure | 8 ++++++++
 1 file changed, 8 insertions(+)

(limited to 'configure')

diff --git a/configure b/configure
index 7cc99b41..78ba44e1 100755
--- a/configure
+++ b/configure
@@ -318,6 +318,14 @@ fi;
 
 echo 'SSL_CLIENT=ssl_'$ssl'.o' >> Makefile.settings
 
+for i in /lib /usr/lib /usr/local/lib; do
+	if [ -e $i/libresolv.a ]; then
+		echo '#define HAVE_RESOLV_A' >> config.h
+		echo 'EFLAGS+='$i'/libresolv.a' >> Makefile.settings
+		break
+	fi
+done
+
 STORAGES="text xml"
 
 if [ "$ldap" = "auto" ]; then
-- 
cgit v1.2.3


From 670204fe6b883397208758d1e8e0c3ada699379c Mon Sep 17 00:00:00 2001
From: Wilmer van der Gaast <wilmer@gaast.net>
Date: Sun, 22 Oct 2006 14:43:40 +0200
Subject: Copied 1.0.x changelogs, disabled LDAP support in configure (because
 the code just doesn't work yet) and added GLib version detection. (GLib 2.4
 and up *should* work.)

---
 configure | 17 +++++++++++++----
 1 file changed, 13 insertions(+), 4 deletions(-)

(limited to 'configure')

diff --git a/configure b/configure
index 7cc99b41..23bdd383 100755
--- a/configure
+++ b/configure
@@ -30,12 +30,14 @@ strip=1
 ipv6=1
 
 events=glib
-ldap=auto
+ldap=0
 ssl=auto
 
 arch=`uname -s`
 cpu=`uname -m`
 
+GLIB_MIN_VERSION=2.4
+
 echo BitlBee configure
 
 while [ -n "$1" ]; do
@@ -174,13 +176,20 @@ if [ -z "$PKG_CONFIG" ]; then
 fi
 
 if $PKG_CONFIG --version > /dev/null 2>/dev/null && $PKG_CONFIG glib-2.0; then
-	cat<<EOF>>Makefile.settings
+	if $PKG_CONFIG glib-2.0 --atleast-version=$GLIB_MIN_VERSION; then
+		cat<<EOF>>Makefile.settings
 EFLAGS+=`$PKG_CONFIG --libs glib-2.0 gmodule-2.0`
 CFLAGS+=`$PKG_CONFIG --cflags glib-2.0 gmodule-2.0`
 EOF
+	else
+		echo
+		echo 'Found glib2 '`$PKG_CONFIG glib-2.0 --modversion`', but version '$GLIB_MIN_VERSION' or newer is required.'
+		exit 1
+	fi
 else
+	echo
 	echo 'Cannot find glib2 development libraries, aborting. (Install libglib2-dev?)'
-	exit 1;
+	exit 1
 fi
 
 if [ "$events" = "libevent" ]; then
@@ -289,7 +298,7 @@ elif [ "$ssl" = "openssl" ]; then
 	ret=1
 elif [ "$ssl" = "bogus" ]; then
 	echo
-	echo 'Using bogus SSL code. This means some features have to be disabled.'
+	echo 'Using bogus SSL code. This means some features will not work properly.'
 	
 	## Yes, you, at the console! How can you authenticate if you don't have any SSL!?
 	if [ "$msn" = "1" ]; then
-- 
cgit v1.2.3


From 5c5a586d73330f3f3f2c1b0d6d9f1caddfb79850 Mon Sep 17 00:00:00 2001
From: Wilmer van der Gaast <wilmer@gaast.net>
Date: Sun, 18 Feb 2007 17:05:29 +0000
Subject: configure script tweaks.

---
 configure | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

(limited to 'configure')

diff --git a/configure b/configure
index d31109f2..c1243dcd 100755
--- a/configure
+++ b/configure
@@ -17,7 +17,7 @@ plugindir='$prefix/lib/bitlbee/'
 includedir='$prefix/include/bitlbee/'
 libevent='/usr/'
 pidfile='/var/run/bitlbee.pid'
-ipcsocket='/var/run/bitlbee'
+ipcsocket='/var/run/bitlbee.sock'
 pcdir='$prefix/lib/pkgconfig'
 
 msn=1
@@ -106,7 +106,6 @@ MANDIR=$mandir
 DATADIR=$datadir
 PLUGINDIR=$plugindir
 CONFIG=$config
-IPCSOCKET=$ipcsocket
 INCLUDEDIR=$includedir
 PCDIR=$pcdir
 
@@ -338,6 +337,11 @@ fi
 if [ "$ldap" = 0 ]; then
 	echo "#undef WITH_LDAP" >> config.h
 elif [ "$ldap" = 1 ]; then
+	echo
+	echo 'LDAP support is a work in progress and does NOT work AT ALL right now.'
+	echo
+	exit 1
+	
 	echo "#define WITH_LDAP 1" >> config.h
 	STORAGES="$STORAGES ldap"
 fi
-- 
cgit v1.2.3


From 8de63c3fdfb532e85f7d93778e63032f7c84b631 Mon Sep 17 00:00:00 2001
From: Wilmer van der Gaast <wilmer@gaast.net>
Date: Sun, 18 Feb 2007 17:37:54 +0000
Subject: AIX fixup. See #230.

---
 configure | 3 +++
 1 file changed, 3 insertions(+)

(limited to 'configure')

diff --git a/configure b/configure
index c1243dcd..10775c6d 100755
--- a/configure
+++ b/configure
@@ -468,6 +468,9 @@ SunOS )
 	echo 'EFLAGS+=-lresolv -lnsl -lsocket' >> Makefile.settings
 	echo 'STRIP=\# skip strip' >> Makefile.settings
 ;;
+AIX )
+	echo 'EFLAGS+=-Wl,-brtl' >> Makefile.settings
+;;
 CYGWIN* )
 	echo 'Cygwin is not officially supported.'
 ;;
-- 
cgit v1.2.3


From 1da00b12d498951219141000947927120b2fdbcc Mon Sep 17 00:00:00 2001
From: Wilmer van der Gaast <wilmer@gaast.net>
Date: Sun, 15 Jul 2007 00:47:38 +0100
Subject: Hiding LDAP support because it doesn't actually work at all ATM.

---
 configure | 2 --
 1 file changed, 2 deletions(-)

(limited to 'configure')

diff --git a/configure b/configure
index bb7ddd7d..fec7544e 100755
--- a/configure
+++ b/configure
@@ -71,8 +71,6 @@ Option		Description				Default
 
 --ipv6=0/1	IPv6 socket support			$ipv6
 
---ldap=0/1/auto	LDAP support				$ldap
-
 --events=...	Event handler (glib, libevent)		$events
 --ssl=...	SSL library to use (gnutls, nss, openssl, bogus, auto)
 							$ssl
-- 
cgit v1.2.3


From 2abfbc5e9ef942937f9ef662262d00fa5e47301f Mon Sep 17 00:00:00 2001
From: Wilmer van der Gaast <wilmer@gaast.net>
Date: Thu, 30 Aug 2007 23:17:51 +0100
Subject: From vmiklos: Added --plugins= option to configure script.

---
 configure | 8 ++++++++
 1 file changed, 8 insertions(+)

(limited to 'configure')

diff --git a/configure b/configure
index fec7544e..ca7e0268 100755
--- a/configure
+++ b/configure
@@ -28,6 +28,7 @@ yahoo=1
 debug=0
 strip=1
 gcov=0
+plugins=1
 ipv6=1
 
 events=glib
@@ -68,6 +69,7 @@ Option		Description				Default
 --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
 
 --ipv6=0/1	IPv6 socket support			$ipv6
 
@@ -382,6 +384,12 @@ if [ "$gcov" = "1" ]; then
 	echo "EFLAGS+=-lgcov" >> Makefile.settings
 fi
 
+if [ "$plugins" = 0 ]; then
+	echo '#undef WITH_PLUGINS' >> config.h
+else
+	echo '#define WITH_PLUGINS' >> config.h
+fi
+
 echo
 if [ -z "$BITLBEE_VERSION" -a -d .bzr ] && type bzr > /dev/null 2> /dev/null; then
 	nick=`bzr nick`
-- 
cgit v1.2.3


From 285b55d3b38d6e1c8b3fc4a64945f2bb9ace07f4 Mon Sep 17 00:00:00 2001
From: Wilmer van der Gaast <wilmer@gaast.net>
Date: Wed, 10 Oct 2007 23:45:19 +0100
Subject: configure script now allows one to override CFLAGS. (Bug #171)

---
 configure | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

(limited to 'configure')

diff --git a/configure b/configure
index ca7e0268..ffa0e2f2 100755
--- a/configure
+++ b/configure
@@ -139,13 +139,14 @@ if [ "$ipv6" = "1" ]; then
 fi
 
 if [ "$debug" = "1" ]; then
-	echo 'CFLAGS=-g' >> Makefile.settings
+	[ -z "$CFLAGS" ] && CFLAGS=-g
 	echo 'DEBUG=1' >> Makefile.settings
 	echo '#define DEBUG' >> config.h
 else
-	echo 'CFLAGS=-O3' >> Makefile.settings
+	[ -z "$CFLAGS" ] && CFLAGS=-O3
 fi
 
+echo CFLAGS=$CFLAGS >> Makefile.settings
 echo CFLAGS+=-I`pwd` -I`pwd`/lib -I`pwd`/protocols -I. >> Makefile.settings
 
 echo CFLAGS+=-DHAVE_CONFIG_H >> Makefile.settings
-- 
cgit v1.2.3


From e9b755e3726fa41ac2d4ed1c3a6192d1af68edbc Mon Sep 17 00:00:00 2001
From: Jelmer Vernooij <jelmer@samba.org>
Date: Thu, 18 Oct 2007 18:44:25 +0200
Subject: Use standard functions for dealing with both IPv6 and IPv4.

---
 configure | 7 -------
 1 file changed, 7 deletions(-)

(limited to 'configure')

diff --git a/configure b/configure
index ffa0e2f2..bc9960a9 100755
--- a/configure
+++ b/configure
@@ -29,7 +29,6 @@ debug=0
 strip=1
 gcov=0
 plugins=1
-ipv6=1
 
 events=glib
 ldap=0
@@ -71,8 +70,6 @@ Option		Description				Default
 --gcov=0/1	Disable/enable test coverage reporting	$gcov
 --plugins=0/1	Disable/enable plugins support		$plugins
 
---ipv6=0/1	IPv6 socket support			$ipv6
-
 --events=...	Event handler (glib, libevent)		$events
 --ssl=...	SSL library to use (gnutls, nss, openssl, bogus, auto)
 							$ssl
@@ -134,10 +131,6 @@ cat<<EOF>config.h
 #define CPU "$cpu"
 EOF
 
-if [ "$ipv6" = "1" ]; then
-	echo '#define IPV6' >> config.h
-fi
-
 if [ "$debug" = "1" ]; then
 	[ -z "$CFLAGS" ] && CFLAGS=-g
 	echo 'DEBUG=1' >> Makefile.settings
-- 
cgit v1.2.3


From 56f260affd91651cb0c44ee14713f7dfa0717ad4 Mon Sep 17 00:00:00 2001
From: Wilmer van der Gaast <wilmer@gaast.net>
Date: Thu, 22 Nov 2007 22:56:52 +0000
Subject: Some changes to get rid of compiler warnings. (And disabling strict
 aliasing because there are too many warnings about it. :-P)

---
 configure | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'configure')

diff --git a/configure b/configure
index bc9960a9..b84f3947 100755
--- a/configure
+++ b/configure
@@ -136,7 +136,7 @@ if [ "$debug" = "1" ]; then
 	echo 'DEBUG=1' >> Makefile.settings
 	echo '#define DEBUG' >> config.h
 else
-	[ -z "$CFLAGS" ] && CFLAGS=-O3
+	[ -z "$CFLAGS" ] && CFLAGS="-O2 -fno-strict-aliasing"
 fi
 
 echo CFLAGS=$CFLAGS >> Makefile.settings
-- 
cgit v1.2.3


From 911cc4f16e96c1ea9027bb12b024531a4b588038 Mon Sep 17 00:00:00 2001
From: Wilmer van der Gaast <wilmer@gaast.net>
Date: Sun, 2 Dec 2007 17:24:46 +0000
Subject: Defining DEBUG via CFLAGS so that it'll always be there, even when a
 file doesn't include config.h.

---
 configure | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'configure')

diff --git a/configure b/configure
index b84f3947..15e22623 100755
--- a/configure
+++ b/configure
@@ -134,7 +134,7 @@ EOF
 if [ "$debug" = "1" ]; then
 	[ -z "$CFLAGS" ] && CFLAGS=-g
 	echo 'DEBUG=1' >> Makefile.settings
-	echo '#define DEBUG' >> config.h
+	CFLAGS="$CFLAGS -DDEBUG"
 else
 	[ -z "$CFLAGS" ] && CFLAGS="-O2 -fno-strict-aliasing"
 fi
-- 
cgit v1.2.3


From 434627083613f016d432462fce73f728dd77172e Mon Sep 17 00:00:00 2001
From: Wilmer van der Gaast <wilmer@gaast.net>
Date: Sun, 6 Jan 2008 12:37:55 +0000
Subject: More consistency in error/warning errors. Until now "WARNING:" was
 usually in upper case while "Error:" wasn't .... that doesn't really make
 sense.

---
 configure | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'configure')

diff --git a/configure b/configure
index 15e22623..6f8d8ea6 100755
--- a/configure
+++ b/configure
@@ -453,7 +453,7 @@ else
 fi
 
 if [ "$protocols" = "PROTOCOLS = " ]; then
-	echo "WARNING: You haven't selected any communication protocol to compile!"
+	echo "Warning: You haven't selected any communication protocol to compile!"
 	echo "         BitlBee will run, but you will be unable to connect to IM servers!"
 fi
 
-- 
cgit v1.2.3


From 003553b6ac35ce3d9caa44ebe301e0eeb2125ed0 Mon Sep 17 00:00:00 2001
From: Wilmer van der Gaast <wilmer@gaast.net>
Date: Sat, 19 Jan 2008 18:23:56 +0000
Subject: Using test -f instead of test -e. This breaks if the include files
 are symlinks, but I guess that's less common than people trying to run
 BitlBee on Solaris machines... (Bug #350)

---
 configure | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'configure')

diff --git a/configure b/configure
index 6f8d8ea6..22989f60 100755
--- a/configure
+++ b/configure
@@ -188,7 +188,7 @@ else
 fi
 
 if [ "$events" = "libevent" ]; then
-	if ! [ -e "${libevent}include/event.h" ]; then
+	if ! [ -f "${libevent}include/event.h" ]; then
 		echo
 		echo 'Warning: Could not find event.h, you might have to install it and/or specify'
 		echo 'its location using the --libevent= argument. (Example: If event.h is in'
@@ -323,7 +323,7 @@ fi;
 echo 'SSL_CLIENT=ssl_'$ssl'.o' >> Makefile.settings
 
 for i in /lib /usr/lib /usr/local/lib; do
-	if [ -e $i/libresolv.a ]; then
+	if [ -f $i/libresolv.a ]; then
 		echo '#define HAVE_RESOLV_A' >> config.h
 		echo 'EFLAGS+='$i'/libresolv.a' >> Makefile.settings
 		break
-- 
cgit v1.2.3


From 31fc3970e53409f71ed7d09e277e0e33461ad571 Mon Sep 17 00:00:00 2001
From: Jelmer Vernooij <jelmer@samba.org>
Date: Sat, 27 Dec 2025 03:21:03 +0100
Subject: Use simpler flags for gcov.

---
 configure | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'configure')

diff --git a/configure b/configure
index 22989f60..02f01225 100755
--- a/configure
+++ b/configure
@@ -374,8 +374,8 @@ else
 fi
 
 if [ "$gcov" = "1" ]; then
-	echo "CFLAGS+=-ftest-coverage -fprofile-arcs" >> Makefile.settings
-	echo "EFLAGS+=-lgcov" >> Makefile.settings
+	echo "CFLAGS+=--coverage" >> Makefile.settings
+	echo "EFLAGS+=--coverage" >> Makefile.settings
 fi
 
 if [ "$plugins" = 0 ]; then
-- 
cgit v1.2.3