[oe-commits] Fahad Usman : readline: add missing macros in acinclude.m4

[git at git.openembedded.org]

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

Author: Fahad Usman <fahad_usman at mentor.com>
Date:   Wed Jul 25 13:21:33 2012 +0500

readline: add missing macros in acinclude.m4

some bash macros are missing from acinclude.m4 which are added up-stream. This
wasn't actually breaking anything but but it was causing the configure script
to not run all the tests it's intended to run.

move the acinclude.m4 from "files" folder to version specific folders so that
readline-5.2 continue to use the older acinclude.m4 only readline-6.2 use the
updated one

Signed-off-by: Fahad Usman <fahad_usman at mentor.com>
Signed-off-by: Saul Wold <sgw at linux.intel.com>

---

 .../readline/{files => readline-5.2}/acinclude.m4  |    0
 .../readline/{files => readline-6.2}/acinclude.m4  |   56 ++++++++++++++++++++
 meta/recipes-core/readline/readline_6.2.bb         |    2 +-
 3 files changed, 57 insertions(+), 1 deletions(-)

diff --git a/meta/recipes-core/readline/files/acinclude.m4 b/meta/recipes-core/readline/readline-5.2/acinclude.m4
similarity index 100%
copy from meta/recipes-core/readline/files/acinclude.m4
copy to meta/recipes-core/readline/readline-5.2/acinclude.m4
diff --git a/meta/recipes-core/readline/files/acinclude.m4 b/meta/recipes-core/readline/readline-6.2/acinclude.m4
similarity index 97%
rename from meta/recipes-core/readline/files/acinclude.m4
rename to meta/recipes-core/readline/readline-6.2/acinclude.m4
index 8a45f99..c30a7d3 100644
--- a/meta/recipes-core/readline/files/acinclude.m4
+++ b/meta/recipes-core/readline/readline-6.2/acinclude.m4
@@ -1813,3 +1813,59 @@ AC_MSG_RESULT($ac_cv_rl_version)
 
 fi
 ])
+
+AC_DEFUN(BASH_FUNC_CTYPE_NONASCII,
+[
+AC_MSG_CHECKING(whether the ctype macros accept non-ascii characters)
+AC_CACHE_VAL(bash_cv_func_ctype_nonascii,
+[AC_TRY_RUN([
+#ifdef HAVE_LOCALE_H
+#include <locale.h>
+#endif
+#include <stdio.h>
+#include <ctype.h>
+
+main(c, v)
+int	c;
+char	*v[];
+{
+	char	*deflocale;
+	unsigned char x;
+	int	r1, r2;
+
+#ifdef HAVE_SETLOCALE
+	/* We take a shot here.  If that locale is not known, try the
+	   system default.  We try this one because '\342' (226) is
+	   known to be a printable character in that locale. */
+	deflocale = setlocale(LC_ALL, "en_US.ISO8859-1");
+	if (deflocale == 0)
+		deflocale = setlocale(LC_ALL, "");
+#endif
+
+	x = '\342';
+	r1 = isprint(x);
+	x -= 128;
+	r2 = isprint(x);
+	exit (r1 == 0 || r2 == 0);
+}
+], bash_cv_func_ctype_nonascii=yes, bash_cv_func_ctype_nonascii=no,
+   [AC_MSG_WARN(cannot check ctype macros if cross compiling -- defaulting to no)
+    bash_cv_func_ctype_nonascii=no]
+)])
+AC_MSG_RESULT($bash_cv_func_ctype_nonascii)
+if test $bash_cv_func_ctype_nonascii = yes; then
+AC_DEFINE(CTYPE_NON_ASCII)
+fi
+])
+
+AC_DEFUN(BASH_TYPE_SIG_ATOMIC_T,
+[AC_CACHE_CHECK([for sig_atomic_t in signal.h], ac_cv_have_sig_atomic_t,
+[AC_TRY_LINK([
+#include <signal.h>
+],[ sig_atomic_t x; ],
+ac_cv_have_sig_atomic_t=yes, ac_cv_have_sig_atomic_t=no)])
+if test "$ac_cv_have_sig_atomic_t" = "no"
+then
+    AC_CHECK_TYPE(sig_atomic_t,int)
+fi
+])
diff --git a/meta/recipes-core/readline/readline_6.2.bb b/meta/recipes-core/readline/readline_6.2.bb
index fda01a4..09c4908 100644
--- a/meta/recipes-core/readline/readline_6.2.bb
+++ b/meta/recipes-core/readline/readline_6.2.bb
@@ -1,6 +1,6 @@
 require readline.inc
 
-PR = "r2"
+PR = "r3"
 
 SRC_URI[md5sum] = "67948acb2ca081f23359d0256e9a271c"
 SRC_URI[sha256sum] = "79a696070a058c233c72dd6ac697021cc64abd5ed51e59db867d66d196a89381"