[Guile-commits] GNU Guile branch, stable-2.0, updated. v2.0.11-84-g30c5982

[Mark H Weaver]

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=30c5982a9548a0ca0ea46111beb490f06d74a40a

The branch, stable-2.0 has been updated
       via  30c5982a9548a0ca0ea46111beb490f06d74a40a (commit)
      from  b9ace68613395fda26f3f3d7dc2ac9bc52cd7f2a (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 30c5982a9548a0ca0ea46111beb490f06d74a40a
Author: Mark H Weaver <address@hidden>
Date:   Tue Oct 14 20:36:11 2014 -0400

    i18n: Add HAVE_USELOCALE as a requirement for USE_GNU_LOCALE_API.
    
    * configure.ac: Check for uselocale.
    * libguile/i18n.c: Add HAVE_USELOCALE to the list of requirements
      before defining USE_GNU_LOCALE_API.

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

Summary of changes:
 configure.ac    |    5 ++---
 libguile/i18n.c |    2 +-
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/configure.ac b/configure.ac
index a323f70..4f40736 100644
--- a/configure.ac
+++ b/configure.ac
@@ -751,9 +751,8 @@ AC_CHECK_HEADERS([assert.h crt_externs.h])
 #   truncate - not in mingw
 #   isblank - available as a GNU extension or in C99
 #   _NSGetEnviron - Darwin specific
-#   strcoll_l, newlocale - GNU extensions (glibc), also available on Darwin
+#   strcoll_l, newlocale, uselocale, utimensat - POSIX.1-2008
 #   fork - unavailable on Windows
-#   utimensat - posix.1-2008
 #   sched_getaffinity, sched_setaffinity - GNU extensions (glibc)
 #   sendfile - non-POSIX, found in glibc
 #
@@ -766,7 +765,7 @@ AC_CHECK_FUNCS([DINFINITY DQNAN cexp chsize clog clog10 
ctermid             \
   strdup system usleep atexit on_exit chown link fcntl ttyname getpwent        
\
   getgrent kill getppid getpgrp fork setitimer getitimer strchr strcmp \
   index bcopy memcpy rindex truncate unsetenv isblank _NSGetEnviron    \
-  strcoll strcoll_l newlocale utimensat sched_getaffinity              \
+  strcoll strcoll_l newlocale uselocale utimensat sched_getaffinity    \
   sched_setaffinity sendfile])
 
 # Reasons for testing:
diff --git a/libguile/i18n.c b/libguile/i18n.c
index c6b9b84..f0e3443 100644
--- a/libguile/i18n.c
+++ b/libguile/i18n.c
@@ -40,7 +40,7 @@
 #include <unicase.h>
 #include <unistr.h>
 
-#if (defined HAVE_NEWLOCALE) && (defined HAVE_STRCOLL_L)
+#if defined HAVE_NEWLOCALE && defined HAVE_STRCOLL_L && defined HAVE_USELOCALE
 /* The GNU thread-aware locale API is documented in ``Thread-Aware Locale
    Model, a Proposal'', by Ulrich Drepper:
 


hooks/post-receive
-- 
GNU Guile