pyrox.dev
lol
1This patch configures Getopt::Long to pass options
2so they will be available at the second GetOptions call.
3
4Also an option to specify the search path for libfontconfig
5is added.
6diff -Naur GD-2.45/Makefile.PL GD-2.45-patched/Makefile.PL
7--- GD-2.45/Makefile.PL 2009-07-10 13:40:07.000000000 -0430
8+++ GD-2.45-patched/Makefile.PL 2010-11-26 22:48:52.372992578 -0430
9@@ -16,9 +16,9 @@
10 my (@INC,@LIBPATH,@LIBS);
11 my $AUTOCONFIG = 0; # global set by try_to_autoconfigure() below
12
13-my ($options,$lib_gd_path,$lib_ft_path,$lib_png_path,$lib_jpeg_path,$lib_xpm_path,$lib_zlib_path,$force);
14+my ($options,$lib_gd_path,$lib_ft_path,$lib_png_path,$lib_jpeg_path,$lib_xpm_path,$lib_zlib_path,$lib_fontconfig_path,$force);
15
16-use Getopt::Long;
17+use Getopt::Long qw(:config pass_through);
18 GetOptions("ignore_missing_gd" => \$force);
19
20 unless (try_to_autoconfigure(\$options,\$lib_gd_path,\@INC,\@LIBPATH,\@LIBS) || $force) {
21@@ -49,6 +49,7 @@
22 "lib_jpeg_path=s" => \$lib_jpeg_path,
23 "lib_xpm_path=s" => \$lib_xpm_path,
24 "lib_zlib_path=s" => \$lib_zlib_path,
25+ "lib_fontconfig_path=s" => \$lib_fontconfig_path,
26 );
27 unless ($result) {
28 print STDERR <<END;
29@@ -64,6 +65,7 @@
30 -lib_jpeg_path path path to libjpeg
31 -lib_xpm_path path path to libxpm
32 -lib_zlib_path path path to libpng
33+ -lib_fontconfig_path path path to libfontconfig
34 -ignore_missing_gd Ignore missing or old libgd installations and try to compile anyway
35
36 If no options are passed on the command line. The program will
37@@ -111,6 +113,12 @@
38 @INC = ("-I$lib_zlib_path/include", @INC);
39 @LIBPATH = ("-L$lib_zlib_path/lib", @LIBPATH);
40 }
41+if( defined($lib_fontconfig_path) )
42+{
43+ print "Fontconfig library used from: $lib_fontconfig_path\n";
44+ @INC = ("-I$lib_fontconfig_path/include", @INC);
45+ @LIBPATH = ("-L$lib_fontconfig_path/lib", @LIBPATH);
46+}
47 #############################################################################################
48
49 if ($^O eq 'VMS'){