Makefile.PL (GD-2.71) | : | Makefile.PL (GD-2.72) | ||
---|---|---|---|---|
skipping to change at line 41 | skipping to change at line 41 | |||
"lib_fontconfig_path=s" => \$lib_fontconfig_path, | "lib_fontconfig_path=s" => \$lib_fontconfig_path, | |||
"gdlib_config_path=s" => \$gdlib_config_path, | "gdlib_config_path=s" => \$gdlib_config_path, | |||
"fcgi" => \$FCGI, | "fcgi" => \$FCGI, | |||
); | ); | |||
unless (try_to_autoconfigure() || $force) { | unless (try_to_autoconfigure() || $force) { | |||
die <<END; | die <<END; | |||
**UNRECOVERABLE ERROR** | **UNRECOVERABLE ERROR** | |||
Could not find gdlib-config nor pkgconfig/gdlib.pc. Please install libgd 2.0.28 or higher. | Could not find gdlib-config nor pkgconfig/gdlib.pc. Please install libgd 2.0.28 or higher. | |||
In Debian and its derivatives (e.g. Ubuntu), it is provided by the libgd-dev or | In Debian and its derivatives (e.g. Ubuntu), it is provided by the libgd-dev or | |||
libgd2-xpm-dev package. Their libgd3 is the latest 2.2.4 | libgd2-xpm-dev package. Their libgd3 is the latest 2.2.5 (which has a severe sec urity bug). | |||
On Redhat and derivatives or OpenSUSE you need gd-devel. | On Redhat and derivatives or OpenSUSE you need gd-devel. | |||
On FreeBSD it is installed by the graphics/gd port. | On FreeBSD it is installed by the graphics/gd port. | |||
Mandriva has libgd2-devel, libgd-devel or lib64gd-devel. | Mandriva has libgd2-devel, libgd-devel or lib64gd-devel. | |||
If you want to try to compile anyway, please rerun this script with the option - -ignore_missing_gd. | If you want to try to compile anyway, please rerun this script with the option - -ignore_missing_gd. | |||
END | END | |||
} | } | |||
@INC = qw(-I/usr/include -I/usr/include/gd) unless @INC; | @INC = qw(-I/usr/include -I/usr/include/gd) unless @INC; | |||
@LIBPATH = qw(-L/usr/lib/X11 -L/usr/X11R6/lib -L/usr/X11/lib -L/usr/lib) unless @LIBPATH; | @LIBPATH = qw(-L/usr/lib/X11 -L/usr/X11R6/lib -L/usr/X11/lib -L/usr/lib) unless @LIBPATH; | |||
@LIBS = qw(-lgd) unless @LIBS; | @LIBS = qw(-lgd) unless @LIBS; | |||
skipping to change at line 195 | skipping to change at line 195 | |||
} | } | |||
# FEATURE FLAGS | # FEATURE FLAGS | |||
################################################################################ ################################## | ################################################################################ ################################## | |||
# If build options have not been passed in then prompt for settings | # If build options have not been passed in then prompt for settings | |||
################################################################################ ################################## | ################################################################################ ################################## | |||
my ($JPEG, $FT, $XPM, $GIF,$ANIMGIF,$UNCLOSEDPOLY,$FONTCONFIG,$PNG,$FTCIRCLE,$VE RSION_33); | my ($JPEG, $FT, $XPM, $GIF,$ANIMGIF,$UNCLOSEDPOLY,$FONTCONFIG,$PNG,$FTCIRCLE,$VE RSION_33); | |||
if( defined($options) ) | if( defined($options) ) | |||
{ | { | |||
# WBMP is builtin since at least 1.8.0 | ||||
$JPEG = $options =~ m/JPEG/i; | $JPEG = $options =~ m/JPEG/i; | |||
$FT = $options =~ m/FT|FREETYPE/i; | $FT = $options =~ m/FT|FREETYPE/i; | |||
$XPM = $options =~ m/XPM/i; | $XPM = $options =~ m/XPM/i; | |||
$GIF = $options =~ m/GIF/i; | $GIF = $options =~ m/GIF/i; | |||
$PNG = $options =~ m/PNG/i; | $PNG = $options =~ m/PNG/i; | |||
$ANIMGIF = $GIF && $options =~ m/ANIMGIF/i; | $ANIMGIF = $GIF && $options =~ m/ANIMGIF/i; | |||
$VERSION_33= $options =~ m/VERSION_33/i; # i.e. 2.0.33 or higher | $VERSION_33= $options =~ m/VERSION_33/i; # i.e. 2.0.33 or higher | |||
$UNCLOSEDPOLY = $options =~ m/UNCLOSEDPOLY/i; | $UNCLOSEDPOLY = $options =~ m/UNCLOSEDPOLY/i; | |||
$FONTCONFIG = $options =~ m/FONTCONFIG/i; | $FONTCONFIG = $options =~ m/FONTCONFIG/i; | |||
$FTCIRCLE = $options =~ m/FTCIRCLE/i; | $FTCIRCLE = $options =~ m/FTCIRCLE/i; | |||
skipping to change at line 288 | skipping to change at line 289 | |||
'Test::Fork' => 0.02, | 'Test::Fork' => 0.02, | |||
}, | }, | |||
'PL_FILES' => {'bdf_scripts/bdf2gdfont_pl.PL' => 'bdf_scripts/bdf2gdfont.pl ', | 'PL_FILES' => {'bdf_scripts/bdf2gdfont_pl.PL' => 'bdf_scripts/bdf2gdfont.pl ', | |||
'lib/GD/Image_pm.PL' => 'lib/GD/Image.pm'}, | 'lib/GD/Image_pm.PL' => 'lib/GD/Image.pm'}, | |||
'LIBS' => [join(' ',$ENV{'GD_LIBS'},@LIBPATH,@LIBS)], | 'LIBS' => [join(' ',$ENV{'GD_LIBS'},@LIBPATH,@LIBS)], | |||
'INC' => join(' ',$ENV{'GD_INC'},@INC), | 'INC' => join(' ',$ENV{'GD_INC'},@INC), | |||
'CCFLAGS' => $CCFLAGS, | 'CCFLAGS' => $CCFLAGS, | |||
'EXE_FILES' => ['bdf_scripts/bdf2gdfont.pl'], | 'EXE_FILES' => ['bdf_scripts/bdf2gdfont.pl'], | |||
'AUTHOR' => 'Lincoln Stein <lincoln.stein@gmail.com>', | 'AUTHOR' => 'Lincoln Stein <lincoln.stein@gmail.com>', | |||
# Maintained by Reini Urban now | ||||
$CAPI ? ('CAPI' => 'TRUE') : (), | $CAPI ? ('CAPI' => 'TRUE') : (), | |||
'DEFINE' => $DEFINES, | 'DEFINE' => $DEFINES, | |||
'clean' => { | 'clean' => { | |||
FILES => '.config.cache cover_db MANIFEST.git *.gcov GD.gcda GD.gcno' | FILES => '.config.cache cover_db MANIFEST.git *.gcov GD.gcda GD.gcno' | |||
.' META.yml META.json' | .' META.yml META.json' | |||
}, | }, | |||
'LICENSE' => 'perl_5', | 'LICENSE' => 'perl_5', | |||
'META_MERGE' => { | 'META_MERGE' => { | |||
recommends => { | recommends => { | |||
skipping to change at line 455 | skipping to change at line 457 | |||
my %config; | my %config; | |||
require ExtUtils::PkgConfig; | require ExtUtils::PkgConfig; | |||
%config = ExtUtils::PkgConfig->find ("$prefix/lib/pkgconfig/gdlib.pc") if $prefix; | %config = ExtUtils::PkgConfig->find ("$prefix/lib/pkgconfig/gdlib.pc") if $prefix; | |||
%config = ExtUtils::PkgConfig->find ("gdlib") unless %config; | %config = ExtUtils::PkgConfig->find ("gdlib") unless %config; | |||
return unless %config; | return unless %config; | |||
$version = $config{modversion}; | $version = $config{modversion}; | |||
warn "Configuring for libgd version $version.\n"; | warn "Configuring for libgd version $version.\n"; | |||
$cflags = $config{cflags}; | $cflags = $config{cflags}; | |||
$libs = $config{libs}; | $libs = $config{libs}; | |||
($libdir, $libs) = $libs =~ m/-L(.*) (-lgd.*)/; | ($libdir, $libs) = $libs =~ m/-L(.*) (-lgd.*)/; | |||
# Requires.private: zlib libpng freetype2 >= 9.8.3 fontconfig libjpe g xpm libtiff-4 | ||||
# Libs.private: -L/opt/local/lib -lz -L/opt/local/lib -lpng16 -L/opt/l ocal/lib -lfreetype -L/opt/local/lib -lfontconfig -lfreetype -ljpeg -L/opt/l ocal/lib -lXpm -lX11 -L/opt/local/lib -ltiff -lwebp | # Libs.private: -L/opt/local/lib -lz -L/opt/local/lib -lpng16 -L/opt/l ocal/lib -lfreetype -L/opt/local/lib -lfontconfig -lfreetype -ljpeg -L/opt/l ocal/lib -lXpm -lX11 -L/opt/local/lib -ltiff -lwebp | |||
# not in the hash! | # not in the hash! | |||
$features = 'GD_GIF GD_OPENPOLYGON GD_ZLIB GD_PNG GD_FREETYPE GD_FONTCONFI G GD_JPEG GD_XPM GD_TIFF GD_WEBP'; | $features = 'GD_GIF GD_OPENPOLYGON GD_ZLIB GD_PNG GD_FREETYPE GD_FONTCONFI G GD_JPEG GD_XPM GD_TIFF GD_WEBP'; | |||
$AUTOCONFIG++; | $AUTOCONFIG++; | |||
} else { | } else { | |||
$AUTOCONFIG++; | $AUTOCONFIG++; | |||
($version) = $config =~ /^GD library\s+(\S+)/m; | ($version) = $config =~ /^GD library\s+(\S+)/m; | |||
warn "Configuring for libgd version $version.\n"; | warn "Configuring for libgd version $version.\n"; | |||
End of changes. 4 change blocks. | ||||
1 lines changed or deleted | 4 lines changed or added |