diff options
| -rw-r--r-- | server/Makefile.in | 7 | ||||
| -rw-r--r-- | server/external/ldap.m4 | 61 | ||||
| -rw-r--r-- | sssd.spec | 3 |
3 files changed, 28 insertions, 43 deletions
diff --git a/server/Makefile.in b/server/Makefile.in index b772eca23..f2f3f9e01 100644 --- a/server/Makefile.in +++ b/server/Makefile.in @@ -55,11 +55,8 @@ PAM_LIBS = @PAM_LIBS@ OPENLDAP_LIBS = @OPENLDAP_LIBS@ -MOZLDAP_CFLAGS = @MOZLDAP_CFLAGS@ -MOZLDAP_LIBS = @MOZLDAP_LIBS@ - -LDAP_CFLAGS = $(MOZLDAP_CFLAGS) $(OPENLDAP_CFLAGS) -LDAP_LIBS = $(MOZLDAP_LIBS) $(OPENLDAP_LIBS) +LDAP_CFLAGS = $(OPENLDAP_CFLAGS) +LDAP_LIBS = $(OPENLDAP_LIBS) LIBDL = @LIBDL@ 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) @@ -1,6 +1,6 @@ Name: sssd Version: 0.1.0 -Release: 4%{dist} +Release: 6%{dist} Group: Applications/System Summary: System Security Services Daemon # The entire source code is GPLv3+ except replace/ which is LGPLv3+ @@ -54,7 +54,6 @@ pushd server --sysconfdir=%{_sysconfdir} \ --without-tests \ --without-policykit \ - --with-openldap \ --with-infopipe \ --with-init-dir=%{_initrddir} \ |