[oe-commits] Peter Kjellerstedt : libgcrypt: Do not remove m4 files so aggressively

[git at git.openembedded.org]

Module: openembedded-core.git
Branch: master-next
Commit: e0dc8f24c0310bd3859e3ad4c4b7ab32943b5f42
URL:    http://git.openembedded.org/?p=openembedded-core.git&a=commit;h=e0dc8f24c0310bd3859e3ad4c4b7ab32943b5f42

Author: Peter Kjellerstedt <peter.kjellerstedt at axis.com>
Date:   Wed Aug 13 19:46:22 2014 +0200

libgcrypt: Do not remove m4 files so aggressively

Removing all m4 files in the m4 directory led to a number of non-fatal
errors while running configure when the expected m4 macros could not
be found.

Signed-off-by: Peter Kjellerstedt <peter.kjellerstedt at axis.com>
Signed-off-by: Richard Purdie <richard.purdie at linuxfoundation.org>

---

 meta/recipes-support/libgcrypt/libgcrypt.inc | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/meta/recipes-support/libgcrypt/libgcrypt.inc b/meta/recipes-support/libgcrypt/libgcrypt.inc
index fa2bc38..43e0291 100644
--- a/meta/recipes-support/libgcrypt/libgcrypt.inc
+++ b/meta/recipes-support/libgcrypt/libgcrypt.inc
@@ -23,8 +23,8 @@ inherit autotools-brokensep texinfo binconfig-disabled pkgconfig
 EXTRA_OECONF = "--disable-asm --with-capabilities"
 
 do_configure_prepend () {
-	# Else these could be used in prefernce to those in aclocal-copy
-	rm -f ${S}/m4/*.m4
+	# Else this could be used in preference to the one in aclocal-copy
+	rm -f ${S}/m4/gpg-error.m4
 }
 
 # libgcrypt.pc is added locally and thus installed here