[6961] bypass locale -a check for ms-windows

[Gavin D. Smith]

Revision: 6961
          http://svn.sv.gnu.org/viewvc/?view=rev&root=texinfo&revision=6961
Author:   gavin
Date:     2016-01-23 16:14:52 +0000 (Sat, 23 Jan 2016)
Log Message:
-----------
bypass locale -a check for ms-windows

Modified Paths:
--------------
    trunk/ChangeLog
    trunk/tp/Texinfo/Convert/Paragraph.pm

Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog     2016-01-23 15:25:46 UTC (rev 6960)
+++ trunk/ChangeLog     2016-01-23 16:14:52 UTC (rev 6961)
@@ -1,3 +1,8 @@
+2016-01-23  Gavin Smith  <address@hidden>
+
+       * tp/Texinfo/Convert/Paragraph.pm: Check if using Windows, and 
+       if so, bypass 'locale -a' check for a UTF-8 locale.
+
 2016-01-23  Karl Berry  <address@hidden>
 
        * contrib/perldoc-all/GNUmakefile (install): no need for grep,

Modified: trunk/tp/Texinfo/Convert/Paragraph.pm
===================================================================
--- trunk/tp/Texinfo/Convert/Paragraph.pm       2016-01-23 15:25:46 UTC (rev 
6960)
+++ trunk/tp/Texinfo/Convert/Paragraph.pm       2016-01-23 16:14:52 UTC (rev 
6961)
@@ -118,7 +118,10 @@
 
 # Check for a UTF-8 locale.  Skip the check if the 'locale' command doesn't
 # work.
-my $a = `locale -a 2>/dev/null`;
+my $a;
+if ($^O ne 'MSWin32') {
+  $a = `locale -a 2>/dev/null`;
+}
 if ($a and $a !~ /UTF-8/ and $a !~ /utf8/) {
   _fatal "couldn't find a UTF-8 locale";
   goto FALLBACK;