- up to 7.0.8.24

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

diff --git a/ImageMagick-libpath.patch b/ImageMagick-libpath.patch
index a503137425743efcc3907738058821d1186347ff..ea36d0008e679b4961845b669f936595e50c5f9f 100644 (file)
--- a/ImageMagick-libpath.patch
+++ b/ImageMagick-libpath.patch
@@ -1,11 +1,11 @@
---- ImageMagick-5.3.4/PerlMagick/Makefile.PL.in.orig   Tue May 15 23:04:15 2001
-+++ ImageMagick-5.3.4/PerlMagick/Makefile.PL.in        Sat Jun  2 19:44:42 2001
-@@ -6,7 +6,7 @@
- WriteMakefile(
-     'NAME'    => 'Image::Magick',
-     'VERSION_FROM' => 'Magick.pm', # finds $VERSION
--    'LIBS'    => ['@LDFLAGS@ @MAGICKLIB@ @LIB_JBIG@ @LIB_HDF@ @LIB_LCMS@ @LIB_TIFF@ @LIB_TTF@ @LIB_JPEG@ @LIB_GS@ @LIB_PNG@ @LIB_FPX@ @LIB_DPS@ @LIB_XEXT@ @LIB_XT@ @LIB_X11@ @LIB_BZLIB@ @LIB_XML@ @LIB_ZLIB@ @LIB_THREAD@ @LIB_LF@ @LIB_MATH@'],
-+    'LIBS'    => ['-L@top_srcdir@/magick/.libs @LDFLAGS@ @MAGICKLIB@ @LIB_JBIG@ @LIB_HDF@ @LIB_LCMS@ @LIB_TIFF@ @LIB_TTF@ @LIB_JPEG@ @LIB_GS@ @LIB_PNG@ @LIB_FPX@ @LIB_DPS@ @LIB_XEXT@ @LIB_XT@ @LIB_X11@ @LIB_BZLIB@ @LIB_XML@ @LIB_ZLIB@ @LIB_THREAD@ @LIB_LF@ @LIB_MATH@'],
-     'DEFINE'  => '@DEFS@',     # e.g., '-DHAVE_SOMETHING' 
-     'INC'     => '-I../ -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
+