- up to 7.0.8.24

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

diff --git a/ImageMagick-libpath.patch b/ImageMagick-libpath.patch
index bc38a0561fcd147691a6e450cc7139e5ba06018e..ea36d0008e679b4961845b669f936595e50c5f9f 100644 (file)
--- a/ImageMagick-libpath.patch
+++ b/ImageMagick-libpath.patch
@@ -1,11 +1,11 @@
---- ImageMagick-5.4.3/PerlMagick/Makefile.PL.in~       Sat Nov 10 16:24:59 2001
-+++ ImageMagick-5.4.3/PerlMagick/Makefile.PL.in        Tue Mar  5 17:48:44 2002
-@@ -58,7 +58,7 @@
-    'INSTALLBIN'       => '@bindir@',
+--- 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 @@
  
-    # Library specification
--   'LIBS'     => ['@LDFLAGS@ @MAGICKLIB@ @MAGICK_DEP_LIBS@'],
-+   'LIBS'     => ['-L@top_srcdir@/magick/.libs @LDFLAGS@ @MAGICKLIB@ @MAGICK_DEP_LIBS@'],
+ # 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
  
-    # Perl binary name (if a Perl binary is built)
-    'MAP_TARGET'       => 'PerlMagick',