- R: pkgconfig for -c++-devel

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

diff --git a/ImageMagick-libpath.patch b/ImageMagick-libpath.patch
index 066298b034a761ae36a619d9ab704d284712c0dd..6f3fbbfc026dcd88ba764aac7a3cb516739d1d89 100644 (file)
--- a/ImageMagick-libpath.patch
+++ b/ImageMagick-libpath.patch
@@ -1,11 +1,28 @@
---- PerlMagick/Makefile.PL.in.org      Mon Oct 30 17:36:54 2000
-+++ PerlMagick/Makefile.PL.in  Mon Oct 30 17:37:51 2000
-@@ -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_PNG@ @LIB_FPX@ @LIB_DPS@ @LIB_XEXT@ @LIB_XT@ @LIB_X11@ @LIB_BZLIB@ @LIB_XML@ @LIB_ZLIB@ @LIB_SFIO@ @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_PNG@ @LIB_FPX@ @LIB_DPS@ @LIB_XEXT@ @LIB_XT@ @LIB_X11@ @LIB_BZLIB@ @LIB_XML@ @LIB_ZLIB@ @LIB_SFIO@ @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-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-6.0.8/PerlMagick/Makefile.am.orig      2004-09-12 19:25:25.000000000 +0200
++++ ImageMagick-6.0.8/PerlMagick/Makefile.am   2004-09-19 12:25:10.924398496 +0200
+@@ -45,11 +45,12 @@
+       cd $(PERLMAGICK) && @PERL@ Makefile.PL $(PERL_MAKE_OPTIONS)
+ 
+ install-exec-perl: $(PERLMAKEFILE)
+-      ( cd $(PERLMAGICK) && $(MAKE) CC='@CC@' && \
++      ( cd $(PERLMAGICK) && \
+       $(MAKE) CC='@CC@' install && \
+       $(MAKE) clean && rm -f  Makefile.old )
+ 
+-all-perl:
++all-perl: $(PERLMAKEFILE) magick/libMagick.la
++      cd $(PERLMAGICK) && $(MAKE) CC='@CC@'
+ 
+ uninstall-exec-perl: $(PERLMAKEFILE)
+       echo "Uninstall not supported for PerlMagick"