2014-07-18 15:43:37 +02:00
|
|
|
let @INC and @LIBPATH empty when ignore_missing_gd
|
|
|
|
|
|
|
|
|
|
Signed-off-by: Francois Perrad <francois.perrad@gadz.org>
|
|
|
|
|
see https://github.com/lstein/Perl-GD/pull/7
|
|
|
|
|
|
|
|
|
|
Index: b/Makefile.PL
|
|
|
|
|
===================================================================
|
|
|
|
|
--- a/Makefile.PL
|
|
|
|
|
+++ b/Makefile.PL
|
|
|
|
|
@@ -35,13 +35,15 @@
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
push @LIBS, "-lgd";
|
|
|
|
|
-@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;
|
|
|
|
|
-
|
|
|
|
|
-# support for AMD64 libraries
|
|
|
|
|
-if (-d '/usr/lib64') {
|
|
|
|
|
- my @libs64 = map {my $a = $_; $a=~ s/lib$/lib64/; $a} @LIBPATH;
|
|
|
|
|
- @LIBPATH = (@LIBPATH,@libs64);
|
|
|
|
|
+unless ($force) {
|
|
|
|
|
+ @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;
|
|
|
|
|
+
|
|
|
|
|
+ # support for AMD64 libraries
|
|
|
|
|
+ if (-d '/usr/lib64') {
|
|
|
|
|
+ my @libs64 = map {my $a = $_; $a=~ s/lib$/lib64/; $a} @LIBPATH;
|
|
|
|
|
+ @LIBPATH = (@LIBPATH,@libs64);
|
|
|
|
|
+ }
|
2014-07-19 16:16:48 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
#############################################################################################
|
