Changes in / [fb62f81f:9779c18]

Files:

• Makefile (modified) (1 diff)
• configure (modified) (5 diffs)
• doc/bitlbee.schema (added)
• storage.c (modified) (1 diff)
• storage_ldap.c (added)

Makefile

@@ -13 +13 @@
 headers = account.h bitlbee.h commands.h conf.h config.h crypting.h help.h ini.h ipc.h irc.h log.h nick.h query.h set.h sock.h storage.h url.h user.h protocols/http_client.h protocols/md5.h protocols/nogaim.h protocols/proxy.h protocols/sha.h protocols/ssl_client.h
 subdirs = protocols
+
+objects += $(LDAP_OBJ)
 
 # Expansion of variables

configure

@@ -28 +28 @@
 strip=1
 ipv6=1
+ldap=auto
 ssl=auto
 
@@ -63 +64 @@
 
 --ipv6=0/1      IPv6 socket support                     $ipv6
+
+--ldap=0/1/auto LDAP support                            $ldap
 
 --ssl=...       SSL library to use (gnutls, nss, openssl, bogus, auto)
@@ -203 +206 @@
 }
 
+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
+                ldap=1
+                ret=1
+        else
+                ret=0
+        fi
+}
+
 if [ "$msn" = 1 -o "$jabber" = 1 ]; then
         if [ "$ssl" = "auto" ]; then
@@ -263 +280 @@
 fi
 
+if [ "$ldap" = "auto" ]; then
+        detect_ldap
+fi
+
+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
         echo "STRIP=\# skip strip" >> Makefile.settings;
@@ -416 +445 @@
         echo '  Building without IM-protocol support. We wish you a lot of fun...';
 fi
+
+if [ "$ldap" = "0" ]; then
+        echo "  LDAP storage backend disabled."
+else
+        echo "  LDAP storage backend enabled."
+fi

storage.c

@@ -6 +6 @@
 
 /* Support for multiple storage backends */
+
+/* Copyright (C) 2005 Jelmer Vernooij <jelmer@samba.org> */
 
 /*