|
 |
dc8c34 |
From 36dc4d7feffc3e522ac7efe313af501d6f64113d Mon Sep 17 00:00:00 2001
|
|
|
dc8c34 |
From: Noriko Hosoi <nhosoi@redhat.com>
|
|
|
dc8c34 |
Date: Wed, 20 Aug 2014 18:20:41 -0400
|
|
|
dc8c34 |
Subject: [PATCH 255/255] Ticket #47875 - dirsrv not running with old openldap
|
|
|
dc8c34 |
|
|
|
dc8c34 |
Description: Automatically generated files by autogen.sh.
|
|
|
dc8c34 |
(cherry picked from commit 4a16332967096c6872ecf7e3686da3f7360b9b5f)
|
|
|
dc8c34 |
---
|
|
|
dc8c34 |
Makefile.in | 2 +-
|
|
|
dc8c34 |
configure | 87 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++-----
|
|
|
dc8c34 |
2 files changed, 81 insertions(+), 8 deletions(-)
|
|
|
dc8c34 |
|
|
|
dc8c34 |
diff --git a/Makefile.in b/Makefile.in
|
|
|
dc8c34 |
index f731cfb..930d22b 100644
|
|
|
dc8c34 |
--- a/Makefile.in
|
|
|
dc8c34 |
+++ b/Makefile.in
|
|
|
dc8c34 |
@@ -10428,7 +10428,7 @@ distcheck: dist
|
|
|
dc8c34 |
*.zip*) \
|
|
|
dc8c34 |
unzip $(distdir).zip ;;\
|
|
|
dc8c34 |
esac
|
|
|
dc8c34 |
- chmod -R a-w $(distdir); chmod a+w $(distdir)
|
|
|
dc8c34 |
+ chmod -R a-w $(distdir); chmod u+w $(distdir)
|
|
|
dc8c34 |
mkdir $(distdir)/_build
|
|
|
dc8c34 |
mkdir $(distdir)/_inst
|
|
|
dc8c34 |
chmod a-w $(distdir)
|
|
|
dc8c34 |
diff --git a/configure b/configure
|
|
|
dc8c34 |
index 809b471..22f87af 100755
|
|
|
dc8c34 |
--- a/configure
|
|
|
dc8c34 |
+++ b/configure
|
|
|
dc8c34 |
@@ -22363,14 +22363,14 @@ fi
|
|
|
dc8c34 |
|
|
|
dc8c34 |
ldap_lib_ldif=""
|
|
|
dc8c34 |
LDFLAGS="$LDFLAGS"
|
|
|
dc8c34 |
- as_ac_Lib=`$as_echo "ac_cv_lib_ldap$ol_libver''_ldif_open" | $as_tr_sh`
|
|
|
dc8c34 |
-{ $as_echo "$as_me:$LINENO: checking for ldif_open in -lldap$ol_libver" >&5
|
|
|
dc8c34 |
-$as_echo_n "checking for ldif_open in -lldap$ol_libver... " >&6; }
|
|
|
dc8c34 |
+ as_ac_Lib=`$as_echo "ac_cv_lib_ldif$ol_libver''__init" | $as_tr_sh`
|
|
|
dc8c34 |
+{ $as_echo "$as_me:$LINENO: checking for _init in -lldif$ol_libver" >&5
|
|
|
dc8c34 |
+$as_echo_n "checking for _init in -lldif$ol_libver... " >&6; }
|
|
|
dc8c34 |
if { as_var=$as_ac_Lib; eval "test \"\${$as_var+set}\" = set"; }; then
|
|
|
dc8c34 |
$as_echo_n "(cached) " >&6
|
|
|
dc8c34 |
else
|
|
|
dc8c34 |
ac_check_lib_save_LIBS=$LIBS
|
|
|
dc8c34 |
-LIBS="-lldap$ol_libver $LIBS"
|
|
|
dc8c34 |
+LIBS="-lldif$ol_libver $LIBS"
|
|
|
dc8c34 |
cat >conftest.$ac_ext <<_ACEOF
|
|
|
dc8c34 |
/* confdefs.h. */
|
|
|
dc8c34 |
_ACEOF
|
|
|
dc8c34 |
@@ -22384,11 +22384,11 @@ cat >>conftest.$ac_ext <<_ACEOF
|
|
|
dc8c34 |
#ifdef __cplusplus
|
|
|
dc8c34 |
extern "C"
|
|
|
dc8c34 |
#endif
|
|
|
dc8c34 |
-char ldif_open ();
|
|
|
dc8c34 |
+char _init ();
|
|
|
dc8c34 |
int
|
|
|
dc8c34 |
main ()
|
|
|
dc8c34 |
{
|
|
|
dc8c34 |
-return ldif_open ();
|
|
|
dc8c34 |
+return _init ();
|
|
|
dc8c34 |
;
|
|
|
dc8c34 |
return 0;
|
|
|
dc8c34 |
}
|
|
|
dc8c34 |
@@ -22434,11 +22434,84 @@ $as_echo "$ac_res" >&6; }
|
|
|
dc8c34 |
as_val=`eval 'as_val=${'$as_ac_Lib'}
|
|
|
dc8c34 |
$as_echo "$as_val"'`
|
|
|
dc8c34 |
if test "x$as_val" = x""yes; then
|
|
|
dc8c34 |
+ ldap_lib_ldif=-lldif$ol_libver
|
|
|
dc8c34 |
+else
|
|
|
dc8c34 |
ldap_lib_ldif=
|
|
|
dc8c34 |
+fi
|
|
|
dc8c34 |
+
|
|
|
dc8c34 |
+ if test -z "$ldap_lib_ldif" ; then
|
|
|
dc8c34 |
+ { $as_echo "$as_me:$LINENO: checking for _init in -lldif" >&5
|
|
|
dc8c34 |
+$as_echo_n "checking for _init in -lldif... " >&6; }
|
|
|
dc8c34 |
+if test "${ac_cv_lib_ldif__init+set}" = set; then
|
|
|
dc8c34 |
+ $as_echo_n "(cached) " >&6
|
|
|
dc8c34 |
else
|
|
|
dc8c34 |
- ldap_lib_ldif=-lldif$ol_libver
|
|
|
dc8c34 |
+ ac_check_lib_save_LIBS=$LIBS
|
|
|
dc8c34 |
+LIBS="-lldif $LIBS"
|
|
|
dc8c34 |
+cat >conftest.$ac_ext <<_ACEOF
|
|
|
dc8c34 |
+/* confdefs.h. */
|
|
|
dc8c34 |
+_ACEOF
|
|
|
dc8c34 |
+cat confdefs.h >>conftest.$ac_ext
|
|
|
dc8c34 |
+cat >>conftest.$ac_ext <<_ACEOF
|
|
|
dc8c34 |
+/* end confdefs.h. */
|
|
|
dc8c34 |
+
|
|
|
dc8c34 |
+/* Override any GCC internal prototype to avoid an error.
|
|
|
dc8c34 |
+ Use char because int might match the return type of a GCC
|
|
|
dc8c34 |
+ builtin and then its argument prototype would still apply. */
|
|
|
dc8c34 |
+#ifdef __cplusplus
|
|
|
dc8c34 |
+extern "C"
|
|
|
dc8c34 |
+#endif
|
|
|
dc8c34 |
+char _init ();
|
|
|
dc8c34 |
+int
|
|
|
dc8c34 |
+main ()
|
|
|
dc8c34 |
+{
|
|
|
dc8c34 |
+return _init ();
|
|
|
dc8c34 |
+ ;
|
|
|
dc8c34 |
+ return 0;
|
|
|
dc8c34 |
+}
|
|
|
dc8c34 |
+_ACEOF
|
|
|
dc8c34 |
+rm -f conftest.$ac_objext conftest$ac_exeext
|
|
|
dc8c34 |
+if { (ac_try="$ac_link"
|
|
|
dc8c34 |
+case "(($ac_try" in
|
|
|
dc8c34 |
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
|
|
|
dc8c34 |
+ *) ac_try_echo=$ac_try;;
|
|
|
dc8c34 |
+esac
|
|
|
dc8c34 |
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
|
|
|
dc8c34 |
+$as_echo "$ac_try_echo") >&5
|
|
|
dc8c34 |
+ (eval "$ac_link") 2>conftest.er1
|
|
|
dc8c34 |
+ ac_status=$?
|
|
|
dc8c34 |
+ grep -v '^ *+' conftest.er1 >conftest.err
|
|
|
dc8c34 |
+ rm -f conftest.er1
|
|
|
dc8c34 |
+ cat conftest.err >&5
|
|
|
dc8c34 |
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
|
|
dc8c34 |
+ (exit $ac_status); } && {
|
|
|
dc8c34 |
+ test -z "$ac_c_werror_flag" ||
|
|
|
dc8c34 |
+ test ! -s conftest.err
|
|
|
dc8c34 |
+ } && test -s conftest$ac_exeext && {
|
|
|
dc8c34 |
+ test "$cross_compiling" = yes ||
|
|
|
dc8c34 |
+ $as_test_x conftest$ac_exeext
|
|
|
dc8c34 |
+ }; then
|
|
|
dc8c34 |
+ ac_cv_lib_ldif__init=yes
|
|
|
dc8c34 |
+else
|
|
|
dc8c34 |
+ $as_echo "$as_me: failed program was:" >&5
|
|
|
dc8c34 |
+sed 's/^/| /' conftest.$ac_ext >&5
|
|
|
dc8c34 |
+
|
|
|
dc8c34 |
+ ac_cv_lib_ldif__init=no
|
|
|
dc8c34 |
fi
|
|
|
dc8c34 |
|
|
|
dc8c34 |
+rm -rf conftest.dSYM
|
|
|
dc8c34 |
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
|
|
|
dc8c34 |
+ conftest$ac_exeext conftest.$ac_ext
|
|
|
dc8c34 |
+LIBS=$ac_check_lib_save_LIBS
|
|
|
dc8c34 |
+fi
|
|
|
dc8c34 |
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_ldif__init" >&5
|
|
|
dc8c34 |
+$as_echo "$ac_cv_lib_ldif__init" >&6; }
|
|
|
dc8c34 |
+if test "x$ac_cv_lib_ldif__init" = x""yes; then
|
|
|
dc8c34 |
+ ldap_lib_ldif=-lldif
|
|
|
dc8c34 |
+else
|
|
|
dc8c34 |
+ ldap_lib_ldif=
|
|
|
dc8c34 |
+fi
|
|
|
dc8c34 |
+
|
|
|
dc8c34 |
+ fi
|
|
|
dc8c34 |
|
|
|
dc8c34 |
LDFLAGS="$save_ldflags"
|
|
|
dc8c34 |
CPPFLAGS="$save_cppflags"
|
|
|
dc8c34 |
--
|
|
|
dc8c34 |
1.8.1.4
|
|
|
dc8c34 |
|