Subject: bug#18898: Two portability patches

From: Thomas Klausner <[email-masked]>
Date: Thu, 30 Oct 2014 00:36:08 +0100

Hi!

The attached patches against git as of right-now fix two issues:

1.

test does not generally support '==' as comparison operator.
    
It's a bash(1) feature; not even GNU coreutils test(1) supports it.
Use '=' instead.

2.

NetBSD provides newlocale and strcoll_l, but not uselocale.

Please merge them.

Thanks,
 Thomas
>From e984213342d68ab81932baff9c8896bcee2ea704 Mon Sep 17 00:00:00 2001
From: Thomas Klausner <[email-masked]>
Date: Thu, 30 Oct 2014 00:33:39 +0100
Subject: [PATCH 2/2] test does not generally support '==' as comparison
 operator.

It's a bash(1) feature; not even GNU coreutils test(1) supports it.
Use '=' instead.
---
 meta/guile.m4 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/meta/guile.m4 b/meta/guile.m4
index 441dcd4..dd3c212 100644
--- a/meta/guile.m4
+++ b/meta/guile.m4
@@ -231,7 +231,7 @@ AC_DEFUN([GUILE_PROGS],
           AC_MSG_ERROR([Guile $_guile_required_version required, but $_guile_prog_version found])
         fi
       fi
-    elif test "$GUILE_EFFECTIVE_VERSION" == "$_major_version.$_minor_version" -a -z "$_micro_version"; then
+    elif test "$GUILE_EFFECTIVE_VERSION" = "$_major_version.$_minor_version" -a -z "$_micro_version"; then
       # Allow prereleases that have the right effective version.
       true
     else
-- 
2.1.2

>From 479533676f8a57dca645f02eeafb5de537a2251b Mon Sep 17 00:00:00 2001
From: Thomas Klausner <[email-masked]>
Date: Thu, 30 Oct 2014 00:33:18 +0100
Subject: [PATCH 1/2] NetBSD provides newlocale and strcoll_l, but not
 uselocale.

Adapt ifdefs to handle this case correctly.
---
 libguile/i18n.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/libguile/i18n.c b/libguile/i18n.c
index c6b9b84..6fa99fe 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:
 
-- 
2.1.2