Merge pull request #12 from sauoq/master

Fixes libgd ver check in Makefile.PL and Build.PL
lstein · Apr 2, 2015 · 8da19c8 · 8da19c8
2 parents 7fe04cb + 58eceb8
commit 8da19c8
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 4 deletions.
diff --git a/Build.PL b/Build.PL
@@ -280,8 +280,10 @@ sub try_to_autoconfigure {
   ($$lib_gd_path = $libdir) =~ s!/[^/]+$!!;
   $$options      = $features;
 
-  my ($minor)    = $version =~ /^2\.\d+\.(\d+)$/;
-  $$options     .= " GD_UNCLOSEDPOLY GD_ANIMGIF GD_FTCIRCLE VERSION_33" if defined($minor) && $minor >= 33;
+  my ($minor, $patch)    = $version =~ /^2\.(\d+)\.(\d+)$/;
+  if ((defined($minor) && $minor > 0) or (defined($patch) && $patch >=33)) { 
+	  $$options     .= " GD_UNCLOSEDPOLY GD_ANIMGIF GD_FTCIRCLE VERSION_33";
+  }
 
   my @correct_inc = map {s/^-I// && $_} split /\s+/,$cflags;
   check_for_stray_headers($includedir,@correct_inc);

diff --git a/Makefile.PL b/Makefile.PL
@@ -301,8 +301,10 @@ sub try_to_autoconfigure {
   ($$lib_gd_path = $libdir) =~ s!/[^/]+$!!;
   $$options      = $features;
 
-  my ($minor)    = $version =~ /^2\.\d+\.(\d+)$/;
-  $$options     .= " GD_UNCLOSEDPOLY GD_ANIMGIF GD_FTCIRCLE VERSION_33" if defined($minor) && $minor >= 33;
+  my ($minor, $patch)    = $version =~ /^2\.(\d+)\.(\d+)$/;
+  if ((defined($minor) && $minor > 0) or (defined($patch) && $patch >= 33)) { 
+    $$options     .= " GD_UNCLOSEDPOLY GD_ANIMGIF GD_FTCIRCLE VERSION_33";
+  }
 
   my @correct_inc = map {s/^-I// && $_} split /\s+/,$cflags;
   check_for_stray_headers($includedir,@correct_inc);