From: Khem Raj <raj.khem@gmail.com>
Date: Sun, 17 Oct 2010 21:04:58 +0000 (-0700)
Subject: openldap_2.4.23.bb: Fix build when using libtool 2.4
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=980a1ea8d5bbe2c0c6e4b8f79883b0f294de979b;p=openembedded.git

openldap_2.4.23.bb: Fix build when using libtool 2.4

* It uses a prebuilt version of libtool which does not know
  about sysroot and worse it does not use automake and autoconf in such
  a way that one could use autoreconf to regenerate stuff. So we
  regenerate the things needed for libtool macros. It should work
  with any version of libtool now.

Signed-off-by: Khem Raj <raj.khem@gmail.com>
---

diff --git a/recipes/openldap/openldap_2.4.23.bb b/recipes/openldap/openldap_2.4.23.bb
index c7248fd49f..94ed5eb65c 100644
--- a/recipes/openldap/openldap_2.4.23.bb
+++ b/recipes/openldap/openldap_2.4.23.bb
@@ -12,7 +12,7 @@ LICENSE = "OpenLDAP"
 SECTION = "libs"
 
 LDAP_VER = "${@'.'.join(bb.data.getVar('PV',d,1).split('.')[0:2])}"
-PR = "r1"
+PR = "r2"
 
 SRC_URI = "ftp://ftp.openldap.org/pub/OpenLDAP/openldap-release/${P}.tgz"
 SRC_URI += "file://openldap-m4-pthread.patch"
@@ -188,7 +188,12 @@ DEPENDS      += "${OPENLDAP_DEPENDS}"
 CPPFLAGS_append = " -D_GNU_SOURCE"
 
 do_configure() {
+	cp ${STAGING_DATADIR}/libtool/ltmain.sh ${S}/build
+	rm -f ${S}/libtool
+	aclocal
+	libtoolize --force --copy
 	gnu-configize
+	autoconf
 	oe_runconf
 }