- updated to 6.5.7-1

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

diff --git a/ImageMagick-libpath.patch b/ImageMagick-libpath.patch
index 131ca907c41f9498948cd8a36e796925e72e7d93..ea36d0008e679b4961845b669f936595e50c5f9f 100644 (file)
--- a/ImageMagick-libpath.patch
+++ b/ImageMagick-libpath.patch
@@ -1,28 +1,11 @@
---- ImageMagick-5.5.7/configure.ac.orig        2003-05-31 16:41:34.000000000 +0200
-+++ ImageMagick-5.5.7/configure.ac     2003-07-18 08:27:51.000000000 +0200
-@@ -2194,7 +2194,7 @@
- # Determine path to pick up ImageMagick library from for use with building PerlMagick
- MAGICKLIBDIR="${LIB_DIR}"
- MAGICKLIB="-L${MAGICKLIBDIR} -lMagick"
--if test $with_perl_static = 'yes'
-+if test $with_perl_static = 'yes' -o $with_perl_dynamic = 'yes'
- then
-   # Find out where libtool hides its uninstalled libraries (as libtool_objdir)
-   eval `./libtool --config|grep '^objdir='|sed -e 's/^objdir/libtool_objdir/'`
---- ImageMagick-5.5.7/Makefile.am.orig 2003-05-15 17:24:39.000000000 +0200
-+++ ImageMagick-5.5.7/Makefile.am      2003-07-18 08:27:25.000000000 +0200
-@@ -97,11 +97,12 @@
-       cd $(PERLMAGICK) && @PERL@ Makefile.PL $(PERL_MAKE_OPTIONS)
+--- 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 @@
  
- install-exec-perl: $(PERLMAKEFILE)
--      ( cd $(PERLMAGICK) && $(MAKE) CC='@CC@' && \
-+      ( cd $(PERLMAGICK) && \
-       $(MAKE) CC='@CC@' install && \
-       $(MAKE) clean && rm -f  Makefile.old )
+ # 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
  
--all-perl:
-+all-perl: $(PERLMAKEFILE) magick/libMagick.la
-+      cd $(PERLMAGICK) && $(MAKE) CC='@CC@'
- 
- uninstall-exec-perl: $(PERLMAKEFILE)
-       echo "Uninstall not supported for PerlMagick"