Changeset e31e5b8 for configure


Ignore:
Timestamp:
2013-04-20T13:05:55Z (6 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:
1 edited

Legend:

Unmodified
Added
Removed
  • configure

    r9b2a8c1 re31e5b8  
    3939
    4040events=glib
    41 ldap=0
    4241ssl=auto
    4342
     
    325324                ret=0;
    326325        fi;
    327 }
    328 
    329 detect_ldap()
    330 {
    331         TMPFILE=$(mktemp /tmp/bitlbee-configure.XXXXXX)
    332         if $CC -o $TMPFILE -shared -lldap 2>/dev/null >/dev/null; then
    333                 cat<<EOF>>Makefile.settings
    334 EFLAGS+=-lldap
    335 CFLAGS+=
    336 EOF
    337                 ldap=1
    338                 rm -f $TMPFILE
    339                 ret=1
    340         else
    341                 ldap=0
    342                 ret=0
    343         fi
    344326}
    345327
     
    457439STORAGES="xml"
    458440
    459 if [ "$ldap" = "auto" ]; then
    460         detect_ldap
    461 fi
    462 
    463 if [ "$ldap" = 0 ]; then
    464         echo "#undef WITH_LDAP" >> config.h
    465 elif [ "$ldap" = 1 ]; then
    466         echo
    467         echo 'LDAP support is a work in progress and does NOT work AT ALL right now.'
    468         echo
    469         exit 1
    470        
    471         echo "#define WITH_LDAP 1" >> config.h
    472         STORAGES="$STORAGES ldap"
    473 fi
    474 
    475441for i in $STORAGES; do
    476442        STORAGE_OBJS="$STORAGE_OBJS storage_$i.o"
Note: See TracChangeset for help on using the changeset viewer.