components/network/zabbix/patches/010-openldap.patch

   1 choose our openldap paths, do not clash with Mozilla ldap
   2
   3 diff --git a/m4/ldap.m4 b/m4/ldap.m4
   4 index e7659bd..e586598 100644
   5 --- a/m4/ldap.m4
   6 +++ b/m4/ldap.m4
   7 @@ -73,16 +73,16 @@ AS_HELP_STRING([--with-ldap@<:@=DIR@:>@],[Include LDAP support @<:@default=no@:>
   8       ],[_libldap_with=ifelse([$1],,[no],[$1])])
   9
  10    if test "x$_libldap_with" != x"no"; then
  11 -        AC_MSG_CHECKING([for LDAP support of ldap.h])
  12 +        AC_MSG_CHECKING([for OpenLDAP support of ldap.h])
  13
  14          if test "$_libldap_with" = "yes"; then
  15                  if test -f /usr/local/openldap/include/ldap.h; then
  16                          LDAP_INCDIR=/usr/local/openldap/include/
  17                          LDAP_LIBDIR=/usr/local/openldap/lib/
  18                          found_ldap="yes"
  19 -                elif test -f /usr/include/ldap.h; then
  20 -                        LDAP_INCDIR=/usr/include
  21 -                        LDAP_LIBDIR=/usr/lib
  22 +                elif test -f /usr/include/openldap/ldap.h; then
  23 +                        LDAP_INCDIR=/usr/include/openldap
  24 +                        LDAP_LIBDIR=/usr/lib/amd64/openldap
  25                          found_ldap="yes"
  26                  elif test -f /usr/local/include/ldap.h; then
  27                          LDAP_INCDIR=/usr/local/include