[Guile-commits] GNU Guile branch, stable-2.0, updated. v2.0.0-205-g969bb92

[Ludovic Courtès]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GNU Guile".

http://git.savannah.gnu.org/cgit/guile.git/commit/?id=969bb92e9b13068abadb22eb7ab13c7f6616d266

The branch, stable-2.0 has been updated
       via  969bb92e9b13068abadb22eb7ab13c7f6616d266 (commit)
       via  a508fbdb01373aed4aed5378806454672e8e702c (commit)
       via  ed756f7817005317eba674cd9b4bb3153e2d5e2e (commit)
      from  514ff6ea075f436795ee121b4abeac8a5affe866 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 969bb92e9b13068abadb22eb7ab13c7f6616d266
Author: Ludovic Courtès <address@hidden>
Date:   Fri Apr 22 16:58:18 2011 +0200

    Turn the libunistring/iconv configure check into a macro.
    
    * acinclude.m4 (GUILE_LIBUNISTRING_WITH_ICONV_SUPPORT): New macro.
    
    * configure.ac: Use it.

commit a508fbdb01373aed4aed5378806454672e8e702c
Author: Ludovic Courtès <address@hidden>
Date:   Fri Apr 22 16:40:58 2011 +0200

    Fix typo in `configure.ac'.
    
    * configure.ac: Add missing comma in `AC_RUN_IFELSE' invocation.

commit ed756f7817005317eba674cd9b4bb3153e2d5e2e
Author: Ludovic Courtès <address@hidden>
Date:   Fri Apr 22 16:18:14 2011 +0200

    Increase the timeout of timing-sensitive thread tests.
    
    * test-suite/tests/threads.test ("timed locking succeeds if mutex
      unlocked within timeout", "timed unlocking returns #t if condition
      signaled", "timed joining succeeds if thread exits within timeout"):
      Increase the timeout.  Reported by Dale P. Smith <address@hidden>.

-----------------------------------------------------------------------

Summary of changes:
 acinclude.m4                  |   29 +++++++++++++++++++++++++++++
 configure.ac                  |   24 ++++--------------------
 test-suite/tests/threads.test |    8 ++++----
 3 files changed, 37 insertions(+), 24 deletions(-)

diff --git a/acinclude.m4 b/acinclude.m4
index 3dbea2a..0938671 100644
--- a/acinclude.m4
+++ b/acinclude.m4
@@ -470,6 +470,35 @@ AC_DEFUN([GUILE_READLINE], [
   AC_SUBST(LIBGUILEREADLINE_INTERFACE)
 ])
 
+dnl GUILE_LIBUNISTRING_WITH_ICONV_SUPPORT
+dnl
+dnl Check whether libunistring has iconv support.  When it lacks iconv
+dnl support, `mem_iconveh' returns -1 (ENOSYS) and conversions from one
+dnl codeset to another do not work.
+AC_DEFUN([GUILE_LIBUNISTRING_WITH_ICONV_SUPPORT], [
+  AC_CACHE_CHECK([whether libunistring was built with iconv support],
+    [ac_cv_libunistring_with_iconv_support], [
+     save_LIBS=$LIBS
+     LIBS="$LIBS $LIBUNISTRING"
+     AC_RUN_IFELSE([AC_LANG_SOURCE([[
+       #include <uniconv.h>
+       #include <unistring/iconveh.h>
+       int
+       main (int argc, char *argv[])
+       {
+        size_t result_size;
+        return (NULL == u32_conv_from_encoding ("ASCII", iconveh_question_mark,
+                                                "a", 1,
+                                                NULL, NULL, &result_size));
+       }
+     ]])],
+        [ac_cv_libunistring_with_iconv_support=yes],
+        [ac_cv_libunistring_with_iconv_support=no],
+        [ac_cv_libunistring_with_iconv_support=yes])
+     LIBS=$save_LIBS
+   ])
+])
+
 dnl Declare file $1 to be a script that needs configuring,
 dnl and arrange to make it executable in the process.
 AC_DEFUN([GUILE_CONFIG_SCRIPT],[AC_CONFIG_FILES([$1],[chmod +x $1])])
diff --git a/configure.ac b/configure.ac
index 1e85b57..685f9c1 100644
--- a/configure.ac
+++ b/configure.ac
@@ -874,26 +874,10 @@ if test "x$LTLIBUNISTRING" = "x"; then
   AC_MSG_ERROR([GNU libunistring is required, please install it.])
 fi
 
-AC_MSG_CHECKING([that libunistring was built with iconv support])
-save_LIBS=$LIBS
-LIBS="$LIBS $LIBUNISTRING"
-AC_RUN_IFELSE([AC_LANG_SOURCE([[
-#include <uniconv.h>
-#include <unistring/iconveh.h>
-int
-main (int argc, char *argv[])
-{
-  size_t result_size;
-  return (NULL == u32_conv_from_encoding ("ASCII", iconveh_question_mark,
-                                         "a", 1,
-                                         NULL, NULL, &result_size));
-}
-]])],
-    [AC_MSG_RESULT([yes])],
-    [AC_MSG_RESULT([no])
-     AC_MSG_ERROR([No iconv support.  Please recompile libunistring with iconv 
enabled.])]
-    [AC_MSG_RESULT([yes, hopefully (cross-compiling)])])
-LIBS=$save_LIBS
+GUILE_LIBUNISTRING_WITH_ICONV_SUPPORT
+if test "x$ac_cv_libunistring_with_iconv_support" != "xyes"; then
+  AC_MSG_ERROR([No iconv support.  Please recompile libunistring with iconv 
enabled.])
+fi
 
 dnl Libffi is needed to compile Guile's foreign function interface, but its
 dnl interface isn't exposed in Guile's API.
diff --git a/test-suite/tests/threads.test b/test-suite/tests/threads.test
index 2ffffb5..1166247 100644
--- a/test-suite/tests/threads.test
+++ b/test-suite/tests/threads.test
@@ -1,6 +1,6 @@
 ;;;; threads.test --- Tests for Guile threading.    -*- scheme -*-
 ;;;;
-;;;; Copyright 2003, 2006, 2007, 2009, 2010 Free Software Foundation, Inc.
+;;;; Copyright 2003, 2006, 2007, 2009, 2010, 2011 Free Software Foundation, 
Inc.
 ;;;;
 ;;;; This library is free software; you can redistribute it and/or
 ;;;; modify it under the terms of the GNU Lesser General Public
@@ -213,7 +213,7 @@
                                          (signal-condition-variable c)
                                          (unlock-mutex cm)
                                          (lock-mutex m
-                                                     (+ (current-time) 2))))))
+                                                     (+ (current-time) 5))))))
              (lock-mutex m)
              (wait-condition-variable c cm)
              (unlock-mutex cm)
@@ -257,7 +257,7 @@
                                          (unlock-mutex m2
                                                        c2
                                                        (+ (current-time)
-                                                          2))))))
+                                                          5))))))
              (wait-condition-variable c1 m1)
              (unlock-mutex m1)
              (lock-mutex m2)
@@ -292,7 +292,7 @@
 
        (pass-if "timed joining succeeds if thread exits within timeout"
           (let ((t (begin-thread (begin (sleep 1) #t))))
-           (join-thread t (+ (current-time) 2))))
+           (join-thread t (+ (current-time) 5))))
 
        (pass-if "asyncs are still working 1"
          (asyncs-still-working?))


hooks/post-receive
-- 
GNU Guile