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

[Noriko Hosoi]

 configure      |    2 +-
 m4/openldap.m4 |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 3612ac6ab98e08a4fceec3bfcf85fe857d772185
Author: Noriko Hosoi <nhosoi at redhat.com>
Date:   Thu Sep 4 13:53:52 2014 -0700

    Ticket #47875 - dirsrv not running with old openldap
    
    Description: To check libldif, -lldap$ol_libver needs to be added
    to LDFLAGS to compile test conftest.c.
    
    (cherry picked from commit 8c7ac72659758ef1ea96794552e584fdbe803778)
    (cherry picked from commit 84f91ddac5020295cbc0a3f84f14ab24f539ed00)
    (cherry picked from commit a690f70780e658c331ffdb3a2e7ff335a801c257)

diff --git a/configure b/configure
index 8f2cfcc..702f691 100755
--- a/configure
+++ b/configure
@@ -22504,7 +22504,7 @@ _ACEOF
 fi
 
       ldap_lib_ldif=""
-  LDFLAGS="$LDFLAGS"
+  LDFLAGS="$LDFLAGS -lldap$ol_libver"
   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; }
diff --git a/m4/openldap.m4 b/m4/openldap.m4
index 1e297c4..70312c7 100644
--- a/m4/openldap.m4
+++ b/m4/openldap.m4
@@ -145,7 +145,7 @@ if test "$with_openldap" = yes ; then
   dnl look for separate libldif - newer versions of openldap have moved the
   dnl ldif functionality into libldap
   ldap_lib_ldif=""
-  LDFLAGS="$LDFLAGS"
+  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