# --- T2-COPYRIGHT-NOTE-BEGIN --- # This copyright note is auto-generated by ./scripts/Create-CopyPatch. # # T2 SDE: package/.../imagemagick/no-ltdl-install.patch # Copyright (C) 2004 - 2005 The T2 SDE Project # # More information can be found in the files COPYING and README. # # This patch file is dual-licensed. It is available under the license the # patched project is licensed under, as long as it is an OpenSource license # as defined at http://www.opensource.org/ (e.g. BSD, X11) or under the terms # of the GNU General Public License as published by the Free Software # Foundation; either version 2 of the License, or (at your option) any later # version. # --- T2-COPYRIGHT-NOTE-END --- See http://www.mail-archive.com/pld-devel-en@pld-linux.org/msg00836.html -> Thanks to Jakub Bogusz --jsaw diff -ur ImageMagick-6.1.3/Makefile.am ImageMagick-6.1.3-t2/Makefile.am --- ImageMagick-6.1.3/Makefile.am 2004-11-01 05:12:22.000000000 +0100 +++ ImageMagick-6.1.3-t2/Makefile.am 2004-11-12 20:52:42.717511616 +0100 @@ -113,7 +113,7 @@ $(UTILITIES_EXTRA_DIST) \ $(WAND_EXTRA_DIST) -lib_LTLIBRARIES = $(LIBLTDL) $(LIBMAGICK) $(LIBWAND) $(LIBMAGICKPP) +lib_LTLIBRARIES = $(LIBMAGICK) $(LIBWAND) $(LIBMAGICKPP) check_PROGRAMS = \ $(TESTS_CHECK_PGRMS) \ diff -ur ImageMagick-6.1.3/configure ImageMagick-6.1.3-t2/configure --- ImageMagick-6.1.3/configure 2004-11-08 22:22:16.000000000 +0100 +++ ImageMagick-6.1.3-t2/configure 2004-11-12 15:32:04.614147872 +0100 @@ -7573,13 +7573,13 @@ -if test x"${enable_ltdl_install-no}" != xno; then - INSTALL_LTDL_TRUE= - INSTALL_LTDL_FALSE='#' -else +#if test x"${enable_ltdl_install-no}" != xno; then +# INSTALL_LTDL_TRUE= +# INSTALL_LTDL_FALSE='#' +#else INSTALL_LTDL_TRUE='#' INSTALL_LTDL_FALSE= -fi +#fi diff -ur ImageMagick-6.1.3/configure.ac ImageMagick-6.1.3-t2/configure.ac --- ImageMagick-6.1.3/configure.ac 2004-11-07 20:35:17.000000000 +0100 +++ ImageMagick-6.1.3-t2/configure.ac 2004-11-12 20:52:53.886813624 +0100 @@ -260,7 +260,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) Only in ImageMagick-6.1.3-t2/: configure.orig diff -ur ImageMagick-6.1.3/ltdl/Makefile.am ImageMagick-6.1.3-t2/ltdl/Makefile.am --- ImageMagick-6.1.3/ltdl/Makefile.am 2004-09-11 22:00:34.000000000 +0200 +++ ImageMagick-6.1.3-t2/ltdl/Makefile.am 2004-11-12 20:52:21.803691000 +0100 @@ -28,14 +28,8 @@ #endif if WITH_LTDL - LIBLTDL=ltdl/libltdl.la -if INSTALL_LTDL - LTDL_INSTALLHEADERS = $(LTDL_HDRS) -else LTDL_NOINST_HDRS = $(LTDL_HDRS) -endif # INSTALL_LTDL -else - LIBLTDL= + LIBLTDL=-lltdl endif # WITH_LTDL LTDL_CLEANFILES = \