Find Expat on Windows 32-bit too

1 files changed, 7 insertions, 1 deletions

diff --git a/Build.PL b/Build.PL
index b5010258c..18bc772f8 100644
--- a/Build.PL
+++ b/Build.PL
@@ -102,7 +102,13 @@ EOF
         my $version = $modules{$module};
         my @cmd = ($cpanm, "$module~$version");
         if ($module eq 'XML::SAX::ExpatXS' && $^O eq 'MSWin32') {
-            push @cmd, '--configure-args="EXPATLIBPATH=C:\dev\CitrusPerl\mingw64\lib EXPATINCPATH=C:\dev\CitrusPerl\mingw64\include"';
+            my $mingw = 'C:\dev\CitrusPerl\mingw64';
+            $mingw = 'C:\dev\CitrusPerl\mingw32' if !-d $mingw;
+            if (!-d $mingw) {
+                print "Could not find the MinGW directory at $mingw; skipping XML::SAX::ExpatXS (only needed for faster parsing of AMF files)\n";
+            } else {
+                push @cmd, sprintf('--configure-args="EXPATLIBPATH=%s\lib EXPATINCPATH=%s\include"', $mingw, $mingw);
+            }
         }
         my $res = system @cmd;
         if ($res != 0) {