Makefile.PL (GD-2.72) | : | Makefile.PL (GD-2.73) | ||
---|---|---|---|---|
skipping to change at line 490 | skipping to change at line 490 | |||
if ($libdir) { | if ($libdir) { | |||
if ($config) { | if ($config) { | |||
@LIBPATH = map {s/^-L// && "-L$_"} split /\s+/,$ldflags; | @LIBPATH = map {s/^-L// && "-L$_"} split /\s+/,$ldflags; | |||
($lib_gd_path = $libdir) =~ s!/[^/]+$!!; | ($lib_gd_path = $libdir) =~ s!/[^/]+$!!; | |||
} else { | } else { | |||
$lib_gd_path = $libdir; | $lib_gd_path = $libdir; | |||
} | } | |||
push @LIBPATH,"-L$libdir"; | push @LIBPATH,"-L$libdir"; | |||
} | } | |||
push @LIBS,"-lgd" unless $libs =~ /-lgd/; | push @LIBS,"-lgd" unless $libs =~ /-lgd/; | |||
$options = $features; | if (!$options) { | |||
$options = $features; | ||||
my ($release, $major, $minor) = $version =~ /^(\d+)\.(\d+)\.(\d+)/; | my ($release, $major, $minor) = $version =~ /^(\d+)\.(\d+)\.(\d+)/; | |||
$options .= " GD_UNCLOSEDPOLY GD_ANIMGIF GD_FTCIRCLE VERSION_33" | $options .= " GD_UNCLOSEDPOLY GD_ANIMGIF GD_FTCIRCLE VERSION_33" | |||
if defined($minor) | if defined($minor) | |||
&& ($release > 2 | && ($release > 2 | |||
|| ($release == 2 && $major > 0) | || ($release == 2 && $major > 0) | |||
|| ($release == 2 && $major == 0 && $minor >= 33)); | || ($release == 2 && $major == 0 && $minor >= 33)); | |||
} | ||||
if ($config) { | if ($config) { | |||
my @correct_inc = map {s/^-I// && $_} split /\s+/,$cflags; | my @correct_inc = map {s/^-I// && $_} split /\s+/,$cflags; | |||
check_for_stray_headers($includedir,@correct_inc); | check_for_stray_headers($includedir,@correct_inc); | |||
} | } | |||
return 1; | return 1; | |||
} | } | |||
sub check_for_stray_headers { | sub check_for_stray_headers { | |||
my @official_libraries = @_; | my @official_libraries = @_; | |||
End of changes. 2 change blocks. | ||||
7 lines changed or deleted | 9 lines changed or added |