Changes in / [96ace1b:27ac72d]

Files:

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

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 += $(LDB_OBJ)
 
 # Expansion of variables

configure

@@ -28 +28 @@
 strip=1
 ipv6=1
-ldb=auto
 ssl=auto
 
@@ -64 +63 @@
 
 --ipv6=0/1      IPv6 socket support                     $ipv6
-
---ldb=0/1/auto  LDB support                             $ldb
 
 --ssl=...       SSL library to use (gnutls, nss, openssl, bogus, auto)
@@ -224 +221 @@
 }
 
-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
@@ -298 +281 @@
 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;
@@ -460 +431 @@
         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

storage.c

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