Makefile.in | 2 +-
configure | 1 -
configure.ac | 1 -
m4/openldap.m4 | 8 ++++++--
4 files changed, 7 insertions(+), 5 deletions(-)
New commits:
commit 62ef849326a010e9a17c576817b0afc2830a8a6d
Author: Noriko Hosoi <nhosoi(a)redhat.com>
Date: Wed Aug 20 13:51:40 2014 -0700
Ticket #47875 - dirsrv not running with old openldap
Description: Changing the function of AC_CHECK_LIB from ldif_open
to _init so that regardless of the contents of the library, it's
linked to the server if it exists.
https://fedorahosted.org/389/ticket/47875
Reviewed by rmeggins(a)redhat.com (Thank you, Rich!!)
(cherry picked from commit 38c74d224c250abd907636f7d78e95775ebf63dd)
(cherry picked from commit 4917a5e4856c7fe0fb4f9b023c21eb64f277e319)
diff --git a/m4/openldap.m4 b/m4/openldap.m4
index 74700d7..1e297c4 100644
--- a/m4/openldap.m4
+++ b/m4/openldap.m4
@@ -146,8 +146,12 @@ if test "$with_openldap" = yes ; then
dnl ldif functionality into libldap
ldap_lib_ldif=""
LDFLAGS="$LDFLAGS"
- AC_CHECK_LIB([ldap$ol_libver], [ldif_open], [ldap_lib_ldif=],
- [ldap_lib_ldif=-lldif$ol_libver])
+ AC_CHECK_LIB([ldif$ol_libver], [_init], [ldap_lib_ldif=-lldif$ol_libver],
+ [ldap_lib_ldif=])
+ if test -z "$ldap_lib_ldif" ; then
+ AC_CHECK_LIB([ldif], [_init], [ldap_lib_ldif=-lldif],
+ [ldap_lib_ldif=])
+ fi
AC_SUBST([ldap_lib_ldif])
LDFLAGS="$save_ldflags"
CPPFLAGS="$save_cppflags"
commit f98bdeea02328bcd1746d909c4d51bc6bfa27fb8
Author: Noriko Hosoi <nhosoi(a)redhat.com>
Date: Wed Aug 20 15:17:36 2014 -0700
Revert "Ticket #47875 - dirsrv not running with old openldap"
This reverts commit dce84e1d4a12dbe9a461981d076ca3d0e17ef56c.
diff --git a/configure.ac b/configure.ac
index fd2e0d2..8281d67 100644
--- a/configure.ac
+++ b/configure.ac
@@ -655,7 +655,6 @@ AC_SUBST(openldap_inc)
AC_SUBST(openldap_lib)
AC_SUBST(openldap_libdir)
AC_SUBST(openldap_bindir)
-AC_SUBST(ldap_lib_ldif)
AC_SUBST(ldaptool_bindir)
AC_SUBST(ldaptool_opts)
AC_SUBST(plainldif_opts)
commit 576af11ec0f474b631b1580a393068eb780ce3c2
Author: Noriko Hosoi <nhosoi(a)redhat.com>
Date: Wed Aug 20 15:17:24 2014 -0700
Revert "Ticket #47875 - dirsrv not running with old openldap"
This reverts commit e476c664d6ad2875e454722c6451a5411b1f38d1.
diff --git a/Makefile.in b/Makefile.in
index 930d22b..f731cfb 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -10428,7 +10428,7 @@ distcheck: dist
*.zip*) \
unzip $(distdir).zip ;;\
esac
- chmod -R a-w $(distdir); chmod u+w $(distdir)
+ chmod -R a-w $(distdir); chmod a+w $(distdir)
mkdir $(distdir)/_build
mkdir $(distdir)/_inst
chmod a-w $(distdir)
diff --git a/configure b/configure
index c22046c..fba5e4f 100755
--- a/configure
+++ b/configure
@@ -25155,7 +25155,6 @@ fi
-
cat >>confdefs.h <<\_ACEOF
#define LDAP_DEBUG 1
_ACEOF