Changes in configure [5973412:574af7e]

File:

• configure (modified) (6 diffs)

configure

@@ -28 +28 @@
 strip=1
 ipv6=1
-ldap=auto
 ssl=auto
 
@@ -64 +63 @@
 
 --ipv6=0/1      IPv6 socket support                     $ipv6
-
---ldap=0/1/auto LDAP support                            $ldap
 
 --ssl=...       SSL library to use (gnutls, nss, openssl, bogus, auto)
@@ -143 +140 @@
 
 if [ -n "$CC" ]; then
-        CC=$CC
+        echo "CC=$CC" >> Makefile.settings;
 elif type gcc > /dev/null 2> /dev/null; then
-        CC=gcc
+        echo "CC=gcc" >> Makefile.settings;
 elif type cc > /dev/null 2> /dev/null; then
-        CC=cc
+        echo "CC=cc" >> Makefile.settings;
 else
         echo 'Cannot find a C compiler, aborting.'
         exit 1;
 fi
-
-echo "CC=$CC" >> Makefile.settings;
 
 if [ -n "$LD" ]; then
@@ -206 +201 @@
                 ret=0;
         fi;
-}
-
-detect_ldap()
-{
-        TMPFILE=`mktemp`
-        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
 }
 
@@ -285 +263 @@
 fi
 
-if [ "$ldap" = "auto" ]; then
-        detect_ldap
-fi
-
-if [ "$ldap" = 0 ]; then
-        echo "LDAP_OBJ=\# no ldap" >> Makefile.settings
-        echo "#undef WITH_LDAP" >> config.h
-elif [ "$ldap" = 1 ]; then
-        echo "#define WITH_LDAP 1" >> config.h
-        echo "LDAP_OBJ=storage_ldap.o" >> Makefile.settings
-fi
-
 if [ "$strip" = 0 ]; then
         echo "STRIP=\# skip strip" >> Makefile.settings;
@@ -450 +416 @@
         echo '  Building without IM-protocol support. We wish you a lot of fun...';
 fi
-
-if [ "$ldap" = "0" ]; then
-        echo "  LDAP storage backend disabled."
-else
-        echo "  LDAP storage backend enabled."
-fi