--- /home/gentoo/portage/net-nds/openldap/openldap-2.2.28-r3.ebuild.orig	2005-12-06 17:24:04.000000000 -0500
+++ /home/gentoo/portage/net-nds/openldap/openldap-2.2.28-r3.ebuild	2005-12-06 17:21:37.000000000 -0500
@@ -171,6 +171,9 @@
         EPATCH_OPTS="-p0 -d ${WORKDIR}/${OLD_P}" epatch ${FILESDIR}/${PN}-2.1.30-autoconf25.patch
         EPATCH_OPTS="-p0 -d ${S}" epatch ${FILESDIR}/${PN}-2.1.30-autoconf25.patch
 
+	EPATCH_OPTS="-p0 -d ${WORKDIR}/${OLD_P}/build" epatch ${FILESDIR}/openldap_m4_underquoted.diff
+	EPATCH_OPTS="-p0 -d ${S}/build" epatch ${FILESDIR}/openldap_m4_underquoted.diff
+
         # reconf compat and current for RPATH solve
         cd ${WORKDIR}/${OLD_P}
         einfo "Running libtoolize on ${OLD_P}"