diff options
| author | Wilmer van der Gaast <wilmer@gaast.net> | 2013-04-20 14:05:55 +0100 |
|---|---|---|
| committer | Wilmer van der Gaast <wilmer@gaast.net> | 2013-04-20 14:05:55 +0100 |
| commit | e31e5b8f340a162180830dbe42dd438e59591cfd (patch) | |
| tree | 029bbb166fda2e9b98a041039338835beb35a08e /configure | |
| parent | 9b2a8c10b61540c3c6892a4de7f52bf8657d455e (diff) | |
| parent | bfafb99e6162b72e0f1ca7639de05f2b7bb3b23c (diff) | |
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).
Diffstat (limited to 'configure')
| -rwxr-xr-x | configure | 34 |
1 files changed, 0 insertions, 34 deletions
@@ -38,7 +38,6 @@ otr=0 skype=0 events=glib -ldap=0 ssl=auto pie=1 @@ -326,23 +325,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> @@ -456,22 +438,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 |