diff options
| author | Sumit Bose <sbose@redhat.com> | 2009-03-09 17:52:47 +0100 |
|---|---|---|
| committer | Simo Sorce <ssorce@redhat.com> | 2009-03-09 15:11:35 -0400 |
| commit | 10038e62d8ea6ee570346f98819e1994e70d47a5 (patch) | |
| tree | da6002de1d6d353de03a9c26ecb4984a53a291bc /server/external/ldap.m4 | |
| parent | 6d195b6c210b09284d94d79f78392ecc1d0092c5 (diff) | |
| download | sssd-10038e62d8ea6ee570346f98819e1994e70d47a5.tar.gz sssd-10038e62d8ea6ee570346f98819e1994e70d47a5.tar.xz sssd-10038e62d8ea6ee570346f98819e1994e70d47a5.zip | |
make openldap the only used LDAP library
Diffstat (limited to 'server/external/ldap.m4')
| -rw-r--r-- | server/external/ldap.m4 | 61 |
1 files changed, 25 insertions, 36 deletions
diff --git a/server/external/ldap.m4 b/server/external/ldap.m4 index 535c28908..5e817b824 100644 --- a/server/external/ldap.m4 +++ b/server/external/ldap.m4 @@ -9,43 +9,32 @@ dnl --------------------------------------------------------------------------- dnl - Check for Mozilla LDAP or OpenLDAP SDK dnl --------------------------------------------------------------------------- -AC_ARG_WITH(openldap, [ --with-openldap Use OpenLDAP]) +AC_CHECK_LIB(ldap, ldap_search, with_ldap=yes) +dnl Check for other libraries we need to link with to get the main routines. +test "$with_ldap" != "yes" && { AC_CHECK_LIB(ldap, ldap_open, [with_ldap=yes with_ldap_lber=yes], , -llber) } +test "$with_ldap" != "yes" && { AC_CHECK_LIB(ldap, ldap_open, [with_ldap=yes with_ldap_lber=yes with_ldap_krb=yes], , -llber -lkrb) } +test "$with_ldap" != "yes" && { AC_CHECK_LIB(ldap, ldap_open, [with_ldap=yes with_ldap_lber=yes with_ldap_krb=yes with_ldap_des=yes], , -llber -lkrb -ldes) } +dnl Recently, we need -lber even though the main routines are elsewhere, +dnl because otherwise be get link errors w.r.t. ber_pvt_opt_on. So just +dnl check for that (it's a variable not a fun but that doesn't seem to +dnl matter in these checks) and stick in -lber if so. Can't hurt (even to +dnl stick it in always shouldn't hurt, I don't think) ... #### Someone who +dnl #### understands LDAP needs to fix this properly. +test "$with_ldap_lber" != "yes" && { AC_CHECK_LIB(lber, ber_pvt_opt_on, with_ldap_lber=yes) } -if test x$with_openldap = xyes; then - AC_CHECK_LIB(ldap, ldap_search, with_ldap=yes) - dnl Check for other libraries we need to link with to get the main routines. - test "$with_ldap" != "yes" && { AC_CHECK_LIB(ldap, ldap_open, [with_ldap=yes with_ldap_lber=yes], , -llber) } - test "$with_ldap" != "yes" && { AC_CHECK_LIB(ldap, ldap_open, [with_ldap=yes with_ldap_lber=yes with_ldap_krb=yes], , -llber -lkrb) } - test "$with_ldap" != "yes" && { AC_CHECK_LIB(ldap, ldap_open, [with_ldap=yes with_ldap_lber=yes with_ldap_krb=yes with_ldap_des=yes], , -llber -lkrb -ldes) } - dnl Recently, we need -lber even though the main routines are elsewhere, - dnl because otherwise be get link errors w.r.t. ber_pvt_opt_on. So just - dnl check for that (it's a variable not a fun but that doesn't seem to - dnl matter in these checks) and stick in -lber if so. Can't hurt (even to - dnl stick it in always shouldn't hurt, I don't think) ... #### Someone who - dnl #### understands LDAP needs to fix this properly. - test "$with_ldap_lber" != "yes" && { AC_CHECK_LIB(lber, ber_pvt_opt_on, with_ldap_lber=yes) } - - if test "$with_ldap" = "yes"; then - if test "$with_ldap_des" = "yes" ; then - OPENLDAP_LIBS="${OPENLDAP_LIBS} -ldes" - fi - if test "$with_ldap_krb" = "yes" ; then - OPENLDAP_LIBS="${OPENLDAP_LIBS} -lkrb" - fi - if test "$with_ldap_lber" = "yes" ; then - OPENLDAP_LIBS="${OPENLDAP_LIBS} -llber" - fi - OPENLDAP_LIBS="${OPENLDAP_LIBS} -lldap" - else - AC_MSG_ERROR([OpenLDAP not found]) - fi - - AC_SUBST(OPENLDAP_LIBS) +if test "$with_ldap" = "yes"; then + if test "$with_ldap_des" = "yes" ; then + OPENLDAP_LIBS="${OPENLDAP_LIBS} -ldes" + fi + if test "$with_ldap_krb" = "yes" ; then + OPENLDAP_LIBS="${OPENLDAP_LIBS} -lkrb" + fi + if test "$with_ldap_lber" = "yes" ; then + OPENLDAP_LIBS="${OPENLDAP_LIBS} -llber" + fi + OPENLDAP_LIBS="${OPENLDAP_LIBS} -lldap" else - PKG_CHECK_MODULES(MOZLDAP, mozldap > 6) - MOZLDAP_CFLAGS="${MOZLDAP_CFLAGS} -DWITH_MOZLDAP" - AC_SUBST(MOZLDAP_CFLAGS) - AC_SUBST(MOZLDAP_LIBS) + AC_MSG_ERROR([OpenLDAP not found]) fi - +AC_SUBST(OPENLDAP_LIBS) |