Changeset 85e9644 for configure

Timestamp:

2006-06-07T13:36:19Z (19 years ago)

Author:

Wilmer van der Gaast <wilmer@…>

Branches:

master

Children:

c121f89

Parents:

a312b6b (diff), 0025b51 (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 Jelmer's storage tree (with LDAP support).

File:

• configure (modified) (6 diffs)

configure

@@ -31 +31 @@
 
 events=glib
+ldap=auto
 ssl=auto
 
@@ -66 +67 @@
 
 --ipv6=0/1      IPv6 socket support                     $ipv6
+
+--ldap=0/1/auto LDAP support                            $ldap
 
 --events=...    Event handler (glib, libevent)          $events
@@ -146 +149 @@
 
 if [ -n "$CC" ]; then
-        echo "CC=$CC" >> Makefile.settings;
+        CC=$CC
 elif type gcc > /dev/null 2> /dev/null; then
-        echo "CC=gcc" >> Makefile.settings;
+        CC=gcc
 elif type cc > /dev/null 2> /dev/null; then
-        echo "CC=cc" >> Makefile.settings;
+        CC=cc
 else
         echo 'Cannot find a C compiler, aborting.'
         exit 1;
 fi
+
+echo "CC=$CC" >> Makefile.settings;
 
 if [ -n "$LD" ]; then
@@ -230 +235 @@
                 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
 }
 
@@ -292 +314 @@
 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;
@@ -444 +478 @@
         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