Changeset 0153ba9

Timestamp:

2012-06-04T11:01:50Z (13 years ago)

Author:

Wilmer van der Gaast <wilmer@…>

Branches:

master

Children:

a338faa

Parents:

c43f488

Message:

Drop the LDAP stuff that was never even close to finished.

There was actually a branch where LDAP support was more or less in a usable
state, but there were still some unsolved problems including the fact that
every setting has its own LDAP schema entry, which would mean lots of
maintenance overhead for pretty much every BitlBee release. :-(

Instead, we'll just stick to the XML format everywhere and just store it
in different ways.

Files:

• configure (modified) (3 diffs)
• doc/bitlbee.schema (deleted)
• storage_ldap.c (deleted)

configure

@@ -39 +39 @@
 
 events=glib
-ldap=0
 ssl=auto
 
@@ -316 +315 @@
                 ret=0;
         fi;
-}
-
-detect_ldap()
-{
-        TMPFILE=$(mktemp /tmp/bitlbee-configure.XXXXXX)
-        if $CC -o $TMPFILE -shared -lldap 2>/dev/null >/dev/null; then
-                cat<<EOF>>Makefile.settings
-EFLAGS+=-lldap
-CFLAGS+=
-EOF
-                ldap=1
-                rm -f $TMPFILE
-                ret=1
-        else
-                ldap=0
-                ret=0
-        fi
 }
 
@@ -470 +452 @@
 STORAGES="xml"
 
-if [ "$ldap" = "auto" ]; then
-        detect_ldap
-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
-
 for i in $STORAGES; do
         STORAGE_OBJS="$STORAGE_OBJS storage_$i.o"