X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=ext%2FDigest%2FMD5%2FMakefile.PL;h=ceae9493f003a1477204e5f492c69c7cf3931839;hb=9a03235d71a6ebc5a1eb9cdd3a23e531d8645e9c;hp=3a6450ccaf34176f27a8209207a942218a136d88;hpb=581883cdf264875c9c1f1fd2c8d45ef942f553c1;p=p5sagit%2Fp5-mst-13.2.git

diff --git a/ext/Digest/MD5/Makefile.PL b/ext/Digest/MD5/Makefile.PL
index 3a6450c..ceae949 100644
--- a/ext/Digest/MD5/Makefile.PL
+++ b/ext/Digest/MD5/Makefile.PL
@@ -4,29 +4,32 @@ use Config qw(%Config);
 use ExtUtils::MakeMaker;
 
 my @extra;
+@extra = (DEFINE => "-DU32_ALIGNMENT_REQUIRED") unless free_u32_alignment();
 
-unless ($Config{d_u32align}) {
-    @extra = (DEFINE => "-DU32_ALIGNMENT_REQUIRED")
-	if !($Config{'byteorder'} eq '1234' ||
-	     $Config{'byteorder'} eq '4321');
-}
-my @optimize = ();
 if ($^O eq 'VMS') {
     if (defined($Config{ccname})) {
         if (grep(/VMS_VAX/, @INC) && ($Config{ccname} eq 'DEC')) {
             # VAX compiler optimizer even as late as v6.4 gets stuck
-            @optimize = ("OPTIMIZE","/Optimize=(NODISJOINT)");
+            push(@extra, OPTIMIZE => "/Optimize=(NODISJOINT)");
         }
     }
 }
 
+
 WriteMakefile(
     'NAME'	   => 'Digest::MD5',
     'VERSION_FROM' => 'MD5.pm',
     MAN3PODS    => {},  # Pods will be built by installman.
     @extra,
     'dist'         => { COMPRESS => 'gzip -9f', SUFFIX => 'gz', },
-    @optimize
 );
 exit;
 
+
+
+sub free_u32_alignment
+{
+    return 0 if $Config{d_u32align};
+    return 1 if $Config{'byteorder'} eq '1234' || $Config{'byteorder'} eq '4321';
+    return 0;
+}