configure | 73 --------------------------------------------------------- m4/openldap.m4 | 4 --- 2 files changed, 77 deletions(-)
New commits: commit dd7c125b499a3c6b36651f5d2a00c2ed45df6d41 Author: Noriko Hosoi nhosoi@redhat.com Date: Thu Sep 4 17:38:50 2014 -0400
Ticket #47875 - dirsrv not running with old openldap
Description: removed unnecessary checking for -lldif from openldap.m4.
diff --git a/configure b/configure index 702f691..13ab36f 100755 --- a/configure +++ b/configure @@ -22581,79 +22581,6 @@ 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 - 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" 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"