Changeset 8923 for lang/perl/Alien-MeCab

Timestamp:

04/05/08 21:17:06 (8 months ago)

Author:

daisuke

Message:

lang/perl/Alien-MeCab?; fix minor problems for Win32, and I think I don't need to detect iconv for windows

Files:

• lang/perl/Alien-MeCab/trunk/Makefile.PL (modified) (5 diffs)

lang/perl/Alien-MeCab/trunk/Makefile.PL

@@ -9 +9 @@
 
 # Here's the file that we're going to use to extract some data
-my $SPEC_FILE     = 'lib/Alien/MeCab.pm';
+my $SPEC_FILE       = 'lib/Alien/MeCab.pm';
+my $RUNNING_IN_HELL = $^O eq 'MSWin32';
 
 # Get the version 
@@ -21 +22 @@
 my $MECAB_BASENAME   = "mecab-$MECAB_VERSION.tar.gz";
 my $MECAB_SOURCE     = File::Spec->catfile("src", $MECAB_BASENAME);
-my $MECAB_EXE        = File::Spec->catfile("src", "mecab-$MECAB_VERSION.exe") if $^O eq 'MSWin32';
-
-eval {
-    Devel::CheckLib::assert_lib(lib => "iconv", libpath => $ENV{LIBDIR});
-};
-if ($@) {
-    print <<EOM;
+my $MECAB_EXE        = File::Spec->catfile("src", "mecab-$MECAB_VERSION.exe");
+
+if (! $RUNNING_IN_HELL) {
+    eval {
+        Devel::CheckLib::assert_lib(lib => "iconv", libpath => $ENV{LIBDIR});
+    };
+    if ($@) {
+        print <<EOM;
 
 *** Whoa! libiconv was not detected! ***
@@ -42 +44 @@
 #  (2) install libiconv by yourself by other means.
 #before proceeding.
-    exit 0;
+        exit 0;
+    }
 }
 
@@ -69 +72 @@
 
 # Ask if we want to download the source.
-my $sourcefile;
-my $test;
-$sourcefile = ($^O eq 'MSWin32') ? $MECAB_EXE
-                                 : $MECAB_SOURCE;
-$test = ($^O eq 'MSWin32') ? "win\n"
-                           : "other\n";
+my $sourcefile = $RUNNING_IN_HELL ? $MECAB_EXE : $MECAB_SOURCE;
 if (! -f $sourcefile) {
     my $yn = prompt("mecab source file $sourcefile does not exist. Download it now?", "y");
@@ -184 +182 @@
     my $make_str;
 
-        if ($^O eq 'MSWin32') {
+        if ($RUNNING_IN_HELL) {
         $make_str = <<MAKE_FRAG;
 libmecab: