Enhance LDAP configure optino to take a path

diff --git a/macros/netatalk.m4 b/macros/netatalk.m4
index 151be9956b6e7f81131ae98b4b4035c9c16262ae..15fce284e768956bf19be50a69c2f8a3c29dffea 100644 (file)
--- a/macros/netatalk.m4
+++ b/macros/netatalk.m4
@@ -570,34 +570,45 @@ AC_MSG_CHECKING(for LDAP (necessary for client-side ACL visibility))
 AC_ARG_WITH(ldap,
     [AS_HELP_STRING([--with-ldap],
         [LDAP support (default=auto)])],
-    [ case "$withval" in
-      yes|no)
-          with_ldap="$withval"
-                 ;;
-      *)
-          with_ldap=auto
-          ;;
-      esac ])
-AC_MSG_RESULT($with_ldap)
+        netatalk_cv_ldap=$withval,
+        netatalk_cv_ldap=auto
+        )
+AC_MSG_RESULT($netatalk_cv_ldap)
+
+save_CFLAGS=$CFLAGS
+save_LIBS=$LIBS
+CFLAGS=""
+LIBS=""
 
-if test x"$with_ldap" != x"no" ; then
-       AC_CHECK_HEADER([ldap.h], with_ldap=yes,
-        [ if test x"$with_ldap" = x"yes" ; then
+if test x"$netatalk_cv_ldap" != x"no" ; then
+   if test x"$netatalk_cv_ldap" != x"yes" -a test x"$netatalk_cv_ldap" != x"no"; then
+       CFLAGS=$netatalk_cv_ldap/include
+       LIBS=$netatalk_cv_ldap/lib
+   fi
+       AC_CHECK_HEADER([ldap.h], netatalk_cv_ldap=yes,
+        [ if test x"$netatalk_cv_ldap" = x"yes" ; then
             AC_MSG_ERROR([Missing LDAP headers])
         fi
-               with_ldap=no
+               netatalk_cv_ldap=no
         ])
-       AC_CHECK_LIB(ldap, ldap_init, with_ldap=yes,
-        [ if test x"$with_ldap" = x"yes" ; then
+       AC_CHECK_LIB(ldap, ldap_init, netatalk_cv_ldap=yes,
+        [ if test x"$netatalk_cv_ldap" = x"yes" ; then
             AC_MSG_ERROR([Missing LDAP library])
         fi
-               with_ldap=no
+               netatalk_cv_ldap=no
         ])
 fi
 
-if test x"$with_ldap" = x"yes"; then
+if test x"$netatalk_cv_ldap" = x"yes"; then
+    LDAP_CFLAGS=$CFLAGS
+    LDAP_LIBS=$LIBS
        AC_DEFINE(HAVE_LDAP,1,[Whether LDAP is available])
+    AC_SUBST(LDAP_CFLAGS)
+    AC_SUBST(LDAP_LIBS)
 fi
+
+CFLAGS=$save_CFLAGS
+LIBS=$save_LIBS
 ])
 
 dnl Check for ACL support

diff --git a/macros/summary.m4 b/macros/summary.m4
index e6927be761a53d405a03667fe1c47044488e57c4..8e93ff3d14a937f8589dc132ce0ecdee55d9c948 100644 (file)
--- a/macros/summary.m4
+++ b/macros/summary.m4
@@ -111,4 +111,9 @@ AC_DEFUN([AC_NETATALK_LIBS_SUMMARY], [
                AC_MSG_RESULT([        LIBS   = $ZEROCONF_LIBS])
                AC_MSG_RESULT([        CFLAGS = $ZEROCONF_CFLAGS])
        fi
+       if test x"$netatalk_cv_ldap" = x"yes"; then
+               AC_MSG_RESULT([    LDAP:])
+               AC_MSG_RESULT([        LIBS   = $LDAP_LIBS])
+               AC_MSG_RESULT([        CFLAGS = $LDAP_CFLAGS])
+       fi
 ])