From 36dc4d7feffc3e522ac7efe313af501d6f64113d Mon Sep 17 00:00:00 2001
From: Noriko Hosoi <nhosoi@redhat.com>
Date: Wed, 20 Aug 2014 18:20:41 -0400
Subject: [PATCH 255/255] Ticket #47875 - dirsrv not running with old openldap

Description: Automatically generated files by autogen.sh.
(cherry picked from commit 4a16332967096c6872ecf7e3686da3f7360b9b5f)
---
 Makefile.in |  2 +-
 configure   | 87 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++-----
 2 files changed, 81 insertions(+), 8 deletions(-)

diff --git a/Makefile.in b/Makefile.in
index f731cfb..930d22b 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -10428,7 +10428,7 @@ distcheck: dist
 	*.zip*) \
 	  unzip $(distdir).zip ;;\
 	esac
-	chmod -R a-w $(distdir); chmod a+w $(distdir)
+	chmod -R a-w $(distdir); chmod u+w $(distdir)
 	mkdir $(distdir)/_build
 	mkdir $(distdir)/_inst
 	chmod a-w $(distdir)
diff --git a/configure b/configure
index 809b471..22f87af 100755
--- a/configure
+++ b/configure
@@ -22363,14 +22363,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:$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:$LINENO: checking for _init in -lldif$ol_libver" >&5
+$as_echo_n "checking for _init in -lldif$ol_libver... " >&6; }
 if { as_var=$as_ac_Lib; eval "test \"\${$as_var+set}\" = set"; }; then
   $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
-LIBS="-lldap$ol_libver  $LIBS"
+LIBS="-lldif$ol_libver  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
@@ -22384,11 +22384,11 @@ cat >>conftest.$ac_ext <<_ACEOF
 #ifdef __cplusplus
 extern "C"
 #endif
-char ldif_open ();
+char _init ();
 int
 main ()
 {
-return ldif_open ();
+return _init ();
   ;
   return 0;
 }
@@ -22434,11 +22434,84 @@ $as_echo "$ac_res" >&6; }
 as_val=`eval 'as_val=${'$as_ac_Lib'}
 		 $as_echo "$as_val"'`
    if test "x$as_val" = 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:$LINENO: checking for _init in -lldif" >&5
+$as_echo_n "checking for _init in -lldif... " >&6; }
+if test "${ac_cv_lib_ldif__init+set}" = set; then
+  $as_echo_n "(cached) " >&6
 else
-  ldap_lib_ldif=-lldif$ol_libver
+  ac_check_lib_save_LIBS=$LIBS
+LIBS="-lldif  $LIBS"
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* 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
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (ac_try="$ac_link"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_link") 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest$ac_exeext && {
+	 test "$cross_compiling" = yes ||
+	 $as_test_x conftest$ac_exeext
+       }; then
+  ac_cv_lib_ldif__init=yes
+else
+  $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+	ac_cv_lib_ldif__init=no
 fi
 
+rm -rf conftest.dSYM
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+      conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_check_lib_save_LIBS
+fi
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_ldif__init" >&5
+$as_echo "$ac_cv_lib_ldif__init" >&6; }
+if test "x$ac_cv_lib_ldif__init" = x""yes; then
+  ldap_lib_ldif=-lldif
+else
+  ldap_lib_ldif=
+fi
+
+  fi
 
   LDFLAGS="$save_ldflags"
   CPPFLAGS="$save_cppflags"
-- 
1.8.1.4