Changeset 5973412

Timestamp:

2006-06-03T20:52:40Z (18 years ago)

Author:

Jelmer Vernooij <jelmer@…>

Branches:

master

Children:

0025b51

Parents:

9779c18

Message:

Try to detect -lldap

File:

• configure (modified) (3 diffs)

configure

@@ -143 +143 @@
 
 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
@@ -208 +210 @@
 detect_ldap()
 {
-        if $PKG_CONFIG --version > /dev/null 2>/dev/null && $PKG_CONFIG ldb; then
+        TMPFILE=`mktemp`
+        if $CC -o $TMPFILE -shared -lldap 2>/dev/null >/dev/null; then
                 cat<<EOF>>Makefile.settings
-EFLAGS+=`$PKG_CONFIG --libs ldb`
-CFLAGS+=`$PKG_CONFIG --cflags ldb`
+EFLAGS+=-lldap
+CFLAGS+=
 EOF
                 ldap=1
+                rm -f $TMPFILE
                 ret=1
         else
+                ldap=0
                 ret=0
         fi
@@ -286 +291 @@
 if [ "$ldap" = 0 ]; then
         echo "LDAP_OBJ=\# no ldap" >> Makefile.settings
-        echo "#undef LDAP" >> config.h
+        echo "#undef WITH_LDAP" >> config.h
 elif [ "$ldap" = 1 ]; then
-        echo "#define LDAP 1" >> config.h
+        echo "#define WITH_LDAP 1" >> config.h
         echo "LDAP_OBJ=storage_ldap.o" >> Makefile.settings
 fi