Changeset 0153ba9


Ignore:
Timestamp:
2012-06-04T11:01:50Z (8 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:
2 deleted
1 edited

Legend:

Unmodified
Added
Removed
  • configure

    rc43f488 r0153ba9  
    3939
    4040events=glib
    41 ldap=0
    4241ssl=auto
    4342
     
    316315                ret=0;
    317316        fi;
    318 }
    319 
    320 detect_ldap()
    321 {
    322         TMPFILE=$(mktemp /tmp/bitlbee-configure.XXXXXX)
    323         if $CC -o $TMPFILE -shared -lldap 2>/dev/null >/dev/null; then
    324                 cat<<EOF>>Makefile.settings
    325 EFLAGS+=-lldap
    326 CFLAGS+=
    327 EOF
    328                 ldap=1
    329                 rm -f $TMPFILE
    330                 ret=1
    331         else
    332                 ldap=0
    333                 ret=0
    334         fi
    335317}
    336318
     
    470452STORAGES="xml"
    471453
    472 if [ "$ldap" = "auto" ]; then
    473         detect_ldap
    474 fi
    475 
    476 if [ "$ldap" = 0 ]; then
    477         echo "#undef WITH_LDAP" >> config.h
    478 elif [ "$ldap" = 1 ]; then
    479         echo
    480         echo 'LDAP support is a work in progress and does NOT work AT ALL right now.'
    481         echo
    482         exit 1
    483        
    484         echo "#define WITH_LDAP 1" >> config.h
    485         STORAGES="$STORAGES ldap"
    486 fi
    487 
    488454for i in $STORAGES; do
    489455        STORAGE_OBJS="$STORAGE_OBJS storage_$i.o"
Note: See TracChangeset for help on using the changeset viewer.