Fix LDAP test

diff --git a/configure.ac b/configure.ac
index e9b1c072412912dad6fa04c8a7263e7bf0594b1e..484a0dedf8f72eec16f52a88100b55b3cc9c4fb4 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -201,7 +201,7 @@ AM_CONDITIONAL(SOLARIS_MODULE, test x$solaris_module = xyes)
 AM_CONDITIONAL(HAVE_LIBGCRYPT, test x$neta_cv_have_libgcrypt = xyes)
 AM_CONDITIONAL(HAVE_OPENSSL, test x$neta_cv_have_openssl = xyes)
 AM_CONDITIONAL(HAVE_ACLS, test x"$with_acl_support" = x"yes")
-AM_CONDITIONAL(HAVE_LDAP, test x"$with_ldap" = x"yes")
+AM_CONDITIONAL(HAVE_LDAP, test x"$netatalk_cv_ldap" = x"yes")
 AM_CONDITIONAL(USE_DHX, test x$neta_cv_compile_dhx = xyes)
 AM_CONDITIONAL(USE_DHX2, test x$neta_cv_compile_dhx2 = xyes)
 AM_CONDITIONAL(USE_RANDNUM, test x$neta_cv_have_openssl = xyes)

diff --git a/libatalk/acl/Makefile.am b/libatalk/acl/Makefile.am
index 344cb92f510c2d2f17b6187e3a362df7753819c8..52a409eba311a8e9029f9e042c77f06af84d9cd4 100644 (file)
--- a/libatalk/acl/Makefile.am
+++ b/libatalk/acl/Makefile.am
@@ -4,10 +4,12 @@ noinst_HEADERS = aclldap.h cache.h
 
 noinst_LTLIBRARIES = libacl.la
 libacl_la_SOURCES = cache.c unix.c uuid.c
-libacl_la_LIBADD =
+libacl_la_LDFLAGS =
+libacl_la_LIBADD  =
 
 if HAVE_LDAP
 libacl_la_SOURCES += ldap.c ldap_config.c
-libacl_la_LIBADD += -lldap
+libacl_la_LIBADD  += @LDAP_LIBS@
+libacl_la_LDFLAGS += @LDAP_LDLFLAGS@
 endif
 

diff --git a/macros/netatalk.m4 b/macros/netatalk.m4
index 5aa460d95127a57700d4dbd70fe1a3d40d9aefd9..7c5210342b4fc934c4f76322f4f7ac08c7802657 100644 (file)
--- a/macros/netatalk.m4
+++ b/macros/netatalk.m4
@@ -576,14 +576,14 @@ AC_ARG_WITH(ldap,
 AC_MSG_RESULT($netatalk_cv_ldap)
 
 save_CFLAGS=$CFLAGS
-save_LIBS=$LIBS
+save_LDLFLAGS=$LDLFLAGS
 CFLAGS=""
-LIBS=""
+LDLFLAGS=""
 
 if test x"$netatalk_cv_ldap" != x"no" ; then
    if test x"$netatalk_cv_ldap" != x"yes" -a x"$netatalk_cv_ldap" != x"auto"; then
-       CFLAGS=$netatalk_cv_ldap/include
-       LIBS=$netatalk_cv_ldap/lib
+       CFLAGS=-I$netatalk_cv_ldap/include
+       LDLFLAGS=-L$netatalk_cv_ldap/lib
    fi
        AC_CHECK_HEADER([ldap.h], netatalk_cv_ldap=yes,
         [ if test x"$netatalk_cv_ldap" = x"yes" ; then
@@ -600,15 +600,18 @@ if test x"$netatalk_cv_ldap" != x"no" ; then
 fi
 
 if test x"$netatalk_cv_ldap" = x"yes"; then
+   echo "********************************************************************"
     LDAP_CFLAGS=$CFLAGS
-    LDAP_LIBS=$LIBS
+    LDAP_LDLFLAGS=$LDLFLAGS
+    LDAP_LIBS=-lldap
        AC_DEFINE(HAVE_LDAP,1,[Whether LDAP is available])
     AC_SUBST(LDAP_CFLAGS)
+    AC_SUBST(LDAP_LDLFLAGS)
     AC_SUBST(LDAP_LIBS)
 fi
 
 CFLAGS=$save_CFLAGS
-LIBS=$save_LIBS
+LDLFLAGS=$save_LDLFLAGS
 ])
 
 dnl Check for ACL support

diff --git a/macros/summary.m4 b/macros/summary.m4
index bb42e4afb19db89850adbf3e45c178471bec3098..a618cf31ccacca089ec2e3a67b9b78038c0af9e9 100644 (file)
--- a/macros/summary.m4
+++ b/macros/summary.m4
@@ -113,7 +113,7 @@ AC_DEFUN([AC_NETATALK_LIBS_SUMMARY], [
        fi
        if test x"$netatalk_cv_ldap" = x"yes"; then
                AC_MSG_RESULT([    LDAP:])
-               AC_MSG_RESULT([        LIBS   = $LDAP_LIBS])
+               AC_MSG_RESULT([        LIBS   = $LDAP_LDLFLAGS $LDAP_LIBS])
                AC_MSG_RESULT([        CFLAGS = $LDAP_CFLAGS])
        fi
 ])