From 0153ba9a0dbed83fa98281f4d1ad34ad08e379b5 Mon Sep 17 00:00:00 2001
From: Wilmer van der Gaast <wilmer@gaast.net>
Date: Mon, 4 Jun 2012 12:01:50 +0100
Subject: 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.
---
 configure | 34 ----------------------------------
 1 file changed, 34 deletions(-)

(limited to 'configure')

diff --git a/configure b/configure
index 697a33bd..52aa863a 100755
--- a/configure
+++ b/configure
@@ -38,7 +38,6 @@ otr=0
 skype=0
 
 events=glib
-ldap=0
 ssl=auto
 
 arch=`uname -s`
@@ -317,23 +316,6 @@ EOF
 	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
-}
-
 RESOLV_TESTCODE='
 #include <sys/types.h>
 #include <netinet/in.h>
@@ -469,22 +451,6 @@ fi
 
 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"
 done
-- 
cgit v1.2.3