Use ExtUtils::MakeMaker::Locale

Use bundled local module to determine windows codepage instead.

Author: hakonhagland

lib/ExtUtils/MakeMaker.pm

@@ -216,17 +216,12 @@ sub prompt ($;$) {  ## no critic
         print "$def\n";
     }
     else {
-        my $codepage;
-        if ($Is_Win32) {
-            require Win32::Console;
-            require Encode;
-            $codepage = Win32::GetConsoleCP();  # get the input code page
-        }
         $ans = <STDIN>;
         if( defined $ans ) {
             $ans =~ s{\015?\012$}{};
-            if ($Is_Win32 and defined $codepage and length $codepage) {
-                $ans = Encode::decode("cp". $codepage, $ans);
+            if ($Is_Win32 and $CAN_DECODE) {
+                my $codepage = $ExtUtils::MakeMaker::Locale::ENCODING_CONSOLE_IN;
+                $ans = Encode::decode($codepage, $ans);
             }
         }
         else { # user hit ctrl-D

t/prompt.t

@@ -44,3 +44,16 @@ ok( !-t STDIN,      'STDIN not a tty' );
 
 is( prompt("Foo?", 'Bar!'), 'From STDIN',     'from STDIN' );
 like( $stdout->read,  qr/^Foo\? \[Bar!\]\s*$/,      '  question' );
+
+{
+    my $CAN_DECODE = eval { require ExtUtils::MakeMaker::Locale; };
+    SKIP: {
+        skip 'Encode not available', 1 unless $CAN_DECODE;
+        skip 'Not MSWin32', 1 unless $^O eq 'MSWin32';
+        local $ExtUtils::MakeMaker::Locale::ENCODING_CONSOLE_IN = "cp850";
+        $ENV{PERL_MM_USE_DEFAULT} = 0;
+        $stdin->write("\x{86}\x{91}"); # åæ in cp850
+        is( prompt("Foo?", 'Bar!'), "\x{e5}\x{e6}",
+              'read cp850 encoded letters from STDIN' );
+    }
+}