configure | 59 +++++++++++++++++++++++++++++++++++++++++++++++++--------
configure.ac | 1
m4/openldap.m4 | 8 +++++--
3 files changed, 57 insertions(+), 11 deletions(-)
New commits:
commit 939838311c6366b1cf4ba04a9f0a1b2b6adfb34d
Author: Noriko Hosoi <nhosoi(a)redhat.com>
Date: Wed Aug 20 15:15:12 2014 -0700
Ticket #47875 - dirsrv not running with old openldap
Description: Automatically generated files by autogen.sh.
diff --git a/configure b/configure
index fd1bfb6..c450b65 100755
--- a/configure
+++ b/configure
@@ -19288,14 +19288,14 @@ fi
ldap_lib_ldif=""
LDFLAGS="$LDFLAGS"
- as_ac_Lib=`$as_echo "ac_cv_lib_ldap$ol_libver''_ldif_open" |
$as_tr_sh`
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ldif_open in
-lldap$ol_libver" >&5
-$as_echo_n "checking for ldif_open in -lldap$ol_libver... " >&6; }
+ as_ac_Lib=`$as_echo "ac_cv_lib_ldif$ol_libver''__init" | $as_tr_sh`
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for _init in
-lldif$ol_libver" >&5
+$as_echo_n "checking for _init in -lldif$ol_libver... " >&6; }
if eval \${$as_ac_Lib+:} false; then :
$as_echo_n "(cached) " >&6
else
ac_check_lib_save_LIBS=$LIBS
-LIBS="-lldap$ol_libver $LIBS"
+LIBS="-lldif$ol_libver $LIBS"
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
@@ -19305,11 +19305,11 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
#ifdef __cplusplus
extern "C"
#endif
-char ldif_open ();
+char _init ();
int
main ()
{
-return ldif_open ();
+return _init ();
;
return 0;
}
@@ -19327,11 +19327,55 @@ eval ac_res=\$$as_ac_Lib
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
$as_echo "$ac_res" >&6; }
if eval test \"x\$"$as_ac_Lib"\" = x"yes"; then :
+ ldap_lib_ldif=-lldif$ol_libver
+else
ldap_lib_ldif=
+fi
+
+ if test -z "$ldap_lib_ldif" ; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for _init in -lldif"
>&5
+$as_echo_n "checking for _init in -lldif... " >&6; }
+if ${ac_cv_lib_ldif__init+:} false; then :
+ $as_echo_n "(cached) " >&6
else
- ldap_lib_ldif=-lldif$ol_libver
+ ac_check_lib_save_LIBS=$LIBS
+LIBS="-lldif $LIBS"
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h. */
+
+/* Override any GCC internal prototype to avoid an error.
+ Use char because int might match the return type of a GCC
+ builtin and then its argument prototype would still apply. */
+#ifdef __cplusplus
+extern "C"
+#endif
+char _init ();
+int
+main ()
+{
+return _init ();
+ ;
+ return 0;
+}
+_ACEOF
+if ac_fn_c_try_link "$LINENO"; then :
+ ac_cv_lib_ldif__init=yes
+else
+ ac_cv_lib_ldif__init=no
+fi
+rm -f core conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_check_lib_save_LIBS
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_ldif__init"
>&5
+$as_echo "$ac_cv_lib_ldif__init" >&6; }
+if test "x$ac_cv_lib_ldif__init" = xyes; then :
+ ldap_lib_ldif=-lldif
+else
+ ldap_lib_ldif=
fi
+ fi
LDFLAGS="$save_ldflags"
CPPFLAGS="$save_cppflags"
commit 4917a5e4856c7fe0fb4f9b023c21eb64f277e319
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)
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 977b77574e47b1b1962482e292d3f5b3a24d3f35
Author: Noriko Hosoi <nhosoi(a)redhat.com>
Date: Wed Aug 20 15:14:08 2014 -0700
Revert "Ticket #47875 - dirsrv not running with old openldap"
This reverts commit 1bb438916825d72df023ca5f67fa7d8b7e6e36e3.
diff --git a/configure.ac b/configure.ac
index e7f412d..908683e 100644
--- a/configure.ac
+++ b/configure.ac
@@ -664,7 +664,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 ec85360af0b930b6abaee27938c217a857a91504
Author: Noriko Hosoi <nhosoi(a)redhat.com>
Date: Wed Aug 20 15:13:54 2014 -0700
Revert "Ticket #47875 - dirsrv not running with old openldap"
This reverts commit 5995ff014d92da027f4ee925aefc6d7249a169bc.
diff --git a/configure b/configure
index 408275c..fd1bfb6 100755
--- a/configure
+++ b/configure
@@ -21212,7 +21212,6 @@ fi
-
# AC_DEFINE([USE_OLD_UNHASHED], [], [Use old unhashed code])
$as_echo "#define LDAP_DEBUG 1" >>confdefs.h