[389-commits] Branch '389-ds-base-1.3.2' - configure m4/openldap.m4

[Noriko Hosoi]

 configure      |   44 --------------------------------------------
 m4/openldap.m4 |    4 ----
 2 files changed, 48 deletions(-)

New commits:
commit eb6d5a31c79746cf5ffd47d103a56ece2970f68e
Author: Noriko Hosoi <nhosoi at redhat.com>
Date:   Thu Sep 4 14:26:17 2014 -0700

    Ticket #47875 - dirsrv not running with old openldap
    
    Description: removed unnecessary checking for -lldif from openldap.m4.
    (cherry picked from commit 0172a730686eaa054dd5b7b0a8921a6638af63aa)
    (cherry picked from commit 48b3153aee7cb2b1f65554b9da432004d23f10e7)

diff --git a/configure b/configure
index 61922f2..7073a5d 100755
--- a/configure
+++ b/configure
@@ -19332,50 +19332,6 @@ 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
-  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"
diff --git a/m4/openldap.m4 b/m4/openldap.m4
index 70312c7..5d09ff5 100644
--- a/m4/openldap.m4
+++ b/m4/openldap.m4
@@ -148,10 +148,6 @@ if test "$with_openldap" = yes ; then
   LDFLAGS="$LDFLAGS -lldap$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"