SOURCES: GraphicsMagick-libpath.patch (NEW), GraphicsMagick-system...

[qboosh]

Author: qboosh                       Date: Sat Jan 28 23:35:58 2006 GMT
Module: SOURCES                       Tag: HEAD
---- Log message:
- based on ImageMagick patch

---- Files affected:
SOURCES:
   GraphicsMagick-libpath.patch (NONE -> 1.1)  (NEW), GraphicsMagick-system-libltdl.patch (NONE -> 1.1)  (NEW)

---- Diffs:

================================================================
Index: SOURCES/GraphicsMagick-libpath.patch
diff -u /dev/null SOURCES/GraphicsMagick-libpath.patch:1.1
--- /dev/null	Sun Jan 29 00:35:58 2006
+++ SOURCES/GraphicsMagick-libpath.patch	Sun Jan 29 00:35:53 2006
@@ -0,0 +1,28 @@
+--- GraphicsMagick-1.1.7/configure.ac.orig	2005-03-19 01:35:06.000000000 +0100
++++ GraphicsMagick-1.1.7/configure.ac	2006-01-28 19:25:30.383390250 +0100
+@@ -2581,7 +2581,7 @@
+ # Determine path to pick up GraphicsMagick library from for use with building PerlMagick
+ MAGICKLIBDIR="${LIB_DIR}"
+ MAGICKLIB="-L${MAGICKLIBDIR} -lGraphicsMagick"
+-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)
+   libtool_objdir=$objdir
+--- GraphicsMagick-1.1.7/Makefile.am.orig	2004-09-12 19:25:25.000000000 +0200
++++ GraphicsMagick-1.1.7/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/libGraphicsMagick.la
++	cd $(PERLMAGICK) && $(MAKE) CC='@CC@'
+ 
+ uninstall-exec-perl: $(PERLMAKEFILE)
+ 	echo "Uninstall not supported for PerlMagick"

================================================================
Index: SOURCES/GraphicsMagick-system-libltdl.patch
diff -u /dev/null SOURCES/GraphicsMagick-system-libltdl.patch:1.1
--- /dev/null	Sun Jan 29 00:35:58 2006
+++ SOURCES/GraphicsMagick-system-libltdl.patch	Sun Jan 29 00:35:53 2006
@@ -0,0 +1,22 @@
+--- GraphicsMagick-1.1.7/configure.ac.orig	2005-09-28 17:05:32.000000000 +0000
++++ GraphicsMagick-1.1.7/configure.ac	2005-09-28 17:06:18.000000000 +0000
+@@ -293,7 +293,7 @@
+ 
+ # Configure libltdl
+ #AC_CONFIG_SUBDIRS(ltdl)
+-AC_LIBLTDL_CONVENIENCE(ltdl)
++AC_LIBLTDL_INSTALLABLE(ltdl)
+ AC_LIB_LTDL
+ # Substitute INCLTDL and LIBLTDL in the Makefiles
+ #AC_SUBST(INCLTDL)
+--- GraphicsMagick-1.1.7/utilities/Makefile.am.orig	2005-04-28 21:54:38.000000000 +0200
++++ GraphicsMagick-1.1.7/utilities/Makefile.am	2006-01-28 22:13:21.676806750 +0100
+@@ -26,7 +26,7 @@
+ 
+ # Libtool libraries, dependencies, and linker flags used by most executables
+ if WITH_LTDL
+-COMMONLDADD	= $(MAGICK_LIB) $(top_builddir)/ltdl/libltdlc.la
++COMMONLDADD	= $(MAGICK_LIB) $(LIBLTDL)
+ COMMONLDFLAGS	= @LDFLAGS@ @DLLDFLAGS@
+ else
+ COMMONLDADD	= $(MAGICK_LIB)
================================================================