Changeset e31e5b8 for configure

Timestamp:

2013-04-20T13:05:55Z (12 years ago)

Author:

Wilmer van der Gaast <wilmer@…>

Branches:

master

Children:

dd95ce4

Parents:

9b2a8c1 (diff), bfafb99 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merging "storage" branch which I wrote long ago. It separates generation of
XML-formatted user configs from disk I/O so we can try to start using other
mechanisms to store them (a REST API or something, for example).

File:

• configure (modified) (3 diffs)

configure

@@ -39 +39 @@
 
 events=glib
-ldap=0
 ssl=auto
 
@@ -325 +324 @@
                 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
 }
 
@@ -457 +439 @@
 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"