[Guile-commits] GNU Guile branch, master, updated. release_1-9-7-73-g2bfa4d5

[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=2bfa4d5ccd3294988c0e64ec464493a4e9facd1d

The branch, master has been updated
       via  2bfa4d5ccd3294988c0e64ec464493a4e9facd1d (commit)
       via  56d288b8445be2d3b2e23a95d4943a11b291e724 (commit)
       via  2b386ab09f8b583ba0547bf06ebc57c78c3bea51 (commit)
      from  8a8da78d97ffe779a1baa1098ed9497c5021759e (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 2bfa4d5ccd3294988c0e64ec464493a4e9facd1d
Author: Ludovic Courtès <address@hidden>
Date:   Tue Feb 16 20:50:27 2010 +0100

    Add missing $(LTLIBINTL), suggested by Gnulib.
    
    * libguile/Makefile.am (libguile_la_LIBADD): Add $(LTLIBINTL).

commit 56d288b8445be2d3b2e23a95d4943a11b291e724
Author: Ludovic Courtès <address@hidden>
Date:   Tue Feb 16 20:46:49 2010 +0100

    i18n: Define `nl_item' when it's not available (needed for Cygwin).
    
    * configure.ac: Add check for `nl_item'.
    
    * libguile/i18n.c: Separate check for `HAVE_LANGINFO_H' and
      `HAVE_NL_TYPES_H'.
      [!HAVE_NL_ITEM]: Define `nl_item'.

commit 2b386ab09f8b583ba0547bf06ebc57c78c3bea51
Author: Ludovic Courtès <address@hidden>
Date:   Tue Feb 16 19:13:56 2010 +0100

    Skip "wrong service name" `getaddrinfo' test on Darwin 9.2.
    
    * test-suite/tests/net-db.test ("getaddrinfo")["wrong service name"]:
      Skip test on Darwin 9.2.

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

Summary of changes:
 configure.ac                 |   10 ++++++++++
 libguile/Makefile.am         |    2 +-
 libguile/i18n.c              |   13 +++++++++++--
 test-suite/tests/net-db.test |   10 +++++++++-
 4 files changed, 31 insertions(+), 4 deletions(-)

diff --git a/configure.ac b/configure.ac
index 35e902c..9397882 100644
--- a/configure.ac
+++ b/configure.ac
@@ -671,6 +671,16 @@ sys/time.h sys/timeb.h sys/times.h sys/stdtypes.h 
sys/types.h \
 sys/utime.h time.h unistd.h utime.h pwd.h grp.h sys/utsname.h \
 direct.h langinfo.h nl_types.h machine/fpu.h])
 
+# Reasons for testing:
+#   nl_item - lacking on Cygwin
+AC_CHECK_TYPES([nl_item], [], [],
+  [[#ifdef HAVE_LANGINFO_H
+    # include <langinfo.h>
+    #endif
+    #ifdef HAVE_NL_TYPES_H
+    # include <nl_types.h>
+    #endif]])
+
 # "complex double" is new in C99, and "complex" is only a keyword if
 # <complex.h> is included
 AC_CHECK_TYPES(complex double,,,
diff --git a/libguile/Makefile.am b/libguile/Makefile.am
index 206c4f4..5ffb6f6 100644
--- a/libguile/Makefile.am
+++ b/libguile/Makefile.am
@@ -443,7 +443,7 @@ noinst_HEADERS += vm-engine.c vm-i-system.c vm-i-scheme.c 
vm-i-loader.c
 libguile_la_DEPENDENCIES = @LIBLOBJS@
 libguile_la_LIBADD =                           \
   @LIBLOBJS@ $(gnulib_library) $(LTLIBGMP)     \
-  $(LTLIBUNISTRING) $(LTLIBICONV)
+  $(LTLIBUNISTRING) $(LTLIBICONV) $(LTLIBINTL)
 libguile_la_LDFLAGS =                                                          
                        \
   @LTLIBINTL@ $(LIBFFI_LIBS) $(INET_NTOP_LIB) $(INET_PTON_LIB)                 
                        \
   $(GETADDRINFO_LIB) $(HOSTENT_LIB) $(SERVENT_LIB)                             
                        \
diff --git a/libguile/i18n.c b/libguile/i18n.c
index b381b05..d8e2c3c 100644
--- a/libguile/i18n.c
+++ b/libguile/i18n.c
@@ -59,10 +59,16 @@
 
 #include "libguile/posix.h"  /* for `scm_i_locale_mutex' */
 
-#if (defined HAVE_LANGINFO_H) && (defined HAVE_NL_TYPES_H)
+#ifdef HAVE_LANGINFO_H
 # include <langinfo.h>
+#endif
+#ifdef HAVE_NL_TYPES_H
 # include <nl_types.h>
 #endif
+#ifndef HAVE_NL_ITEM
+/* Cygwin has <langinfo.h> but lacks <nl_types.h> and `nl_item'.  */
+typedef int nl_item;
+#endif
 
 #ifndef HAVE_SETLOCALE
 static inline char *
@@ -1459,7 +1465,10 @@ SCM_DEFINE (scm_locale_string_to_inexact, 
"locale-string->inexact",
       setting of the current locale.  If nl_langinfo supports CODESET,
       we can convert the string properly using scm_from_stringn.  If
       CODESET is not supported, we won't be able to make much sense of
-      the returned string. */
+      the returned string.
+
+   Note: We don't use Gnulib's `nl_langinfo' module because it's currently not
+   as complete as the compatibility hacks in `i18n.scm'.  */
 
 
 SCM_DEFINE (scm_nl_langinfo, "nl-langinfo", 1, 1, 0,
diff --git a/test-suite/tests/net-db.test b/test-suite/tests/net-db.test
index 4033053..47d12a9 100644
--- a/test-suite/tests/net-db.test
+++ b/test-suite/tests/net-db.test
@@ -81,7 +81,15 @@
         (catch 'getaddrinfo-error
           (lambda ()
             (getaddrinfo "127.0.0.1" "does-not-exist" AI_NUMERICHOST)
-            #f)
+
+            ;; XXX: The call above unexpectedly suceeds on
+            ;; `i386-apple-darwin9.2.2', but not on `i386-apple-darwin9.6.0'.
+            ;; For now we just skip it until a better solution is found.  See
+            ;; 
http://lists.gnu.org/archive/html/bug-gnulib/2010-02/msg00061.html
+            ;; for details.
+            (if (string-contains %host-type "darwin9.2")
+                (throw 'unresolved)
+                #f))
           (lambda (key errcode)
             ;; According to POSIX, both error codes are valid (glibc 2.11
             ;; chooses `EAI_SERVICE'; Darwin chooses `EAI_NONAME'.)


hooks/post-receive
-- 
GNU Guile