- up to 7.0.8.24

[packages/ImageMagick.git] / ImageMagick-libpath.patch

diff --git a/ImageMagick-libpath.patch b/ImageMagick-libpath.patch
index 1214bc44aa4647ff2d0f58bf913d40c1a6b6982a..ea36d0008e679b4961845b669f936595e50c5f9f 100644 (file)
--- a/ImageMagick-libpath.patch
+++ b/ImageMagick-libpath.patch
@@ -1,11 +1,11 @@
---- ImageMagick-4.2.8/PerlMagick/Makefile.PL.in.libpath        Wed Aug  4 19:54:38 1999
-+++ ImageMagick-4.2.8/PerlMagick/Makefile.PL.in        Tue Aug 17 17:36:01 1999
-@@ -6,7 +6,7 @@
- WriteMakefile(
-     'NAME'    => 'Image::Magick',
-     'VERSION_FROM' => 'Magick.pm', # finds $VERSION
--    'LIBS'    => ['@LDFLAGS@ @MAGICKLIB@ @LIBS@'],
-+    'LIBS'    => ['-L@top_srcdir@/magick/.libs @LDFLAGS@ @MAGICKLIB@ @LIBS@'],
-     'DEFINE'  => '@DEFS@',     # e.g., '-DHAVE_SOMETHING' 
-     'INC'     => '-I@top_srcdir@ @CPPFLAGS@',
-     ($Config{'archname'} =~ /-object$/i ? ('CAPI' => 'TRUE') : ()),
+--- ImageMagick-6.4.1/configure.ac.orig        2008-05-27 09:43:02.000000000 +0200
++++ ImageMagick-6.4.1/configure.ac     2008-05-27 09:43:54.000000000 +0200
+@@ -3050,7 +3050,7 @@
+ 
+ # Determine path to pick up MagickCore library from for use with building PerlMagick
+ MAGICKCORE_PATH="${LIB_DIR}"
+-if test $with_perl_static = 'yes'; then
++if test $with_perl_static = 'yes' -o '$with_perl_dynamic' = 'yes'; then
+     # Find out where libtool hides its uninstalled libraries (as libtool_objdir)
+     libtool_objdir=$objdir
+