(no commit message)

diff --git a/Magick++/bin/Magick++-config b/Magick++/bin/Magick++-config
index 5e1a7efdbddd8b56f1756052bf9a3e5cdfdbc104..ff445b6a9e07d02be812f5b1e47cb2660280e4a9 100755 (executable)
--- a/Magick++/bin/Magick++-config
+++ b/Magick++/bin/Magick++-config
@@ -55,7 +55,7 @@ while test $# -gt 0; do
       echo '-L/usr/local/lib '
       ;;
     --libs)
-      echo "-L${libdir} -lMagick++ -lMagickWand -lMagickCore -llcms -ltiff -lfreetype -ljasper -ljpeg -lpng -lfontconfig -lXext -lXt -lSM -lICE -lX11 -lbz2 -lxml2 -lz -lm -lgomp -lpthread -lltdl"
+      echo "-L${libdir} -lMagick++ -lMagickWand -lMagickCore -llcms -ltiff -lfreetype -ljasper -ljpeg -lpng -lfontconfig -lXext -lXt -lSM -lICE -lX11 -llzma -lbz2 -lxml2 -lz -lm -lgomp -lpthread -lltdl"
       ;;
     *)
       echo "${usage}" 1>&2

diff --git a/Makefile.in b/Makefile.in
index 57a9d35199264c6ade6e3972113a434923b37fb0..2e40fab03b5355a4ac0a14d69c39cf50c1a77063 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -2358,7 +2358,6 @@ LTLIBOBJS = @LTLIBOBJS@
 LT_CONFIG_H = @LT_CONFIG_H@
 LT_DLLOADERS = @LT_DLLOADERS@
 LT_DLPREOPEN = @LT_DLPREOPEN@
-LZMA_CFLAGS = @LZMA_CFLAGS@
 LZMA_LIBS = @LZMA_LIBS@
 LZWDecodeDelegate = @LZWDecodeDelegate@
 LZWEncodeDelegate = @LZWEncodeDelegate@

diff --git a/coders/miff.c b/coders/miff.c
index 7e77dba588d4dd5ddcef59e51cd35cba7c8ec430..f4d03233606a9596ca5f7416e4aa6609ce507139 100644 (file)
--- a/coders/miff.c
+++ b/coders/miff.c
@@ -81,6 +81,13 @@
 #include "zlib.h"
 #endif
 \f
+/*
+  Define declarations.
+*/
+#if !defined(LZMA_OK)
+#define LZMA_OK  0
+#endif
+\f
 /*
   Forward declarations.
 */

diff --git a/config/config.h.in b/config/config.h.in
index 526318a1cbcd407135bee95e31f20090cd4decc1..6043460300a6a8a55a71e429908ed2011e4351c3 100644 (file)
--- a/config/config.h.in
+++ b/config/config.h.in
@@ -745,7 +745,7 @@
    */
 #undef LT_OBJDIR
 
-/* Define if you have LZMA library */
+/* Define if you have lzma compression library */
 #undef LZMA_DELEGATE
 
 /* Define to prepend to default font search path. */

diff --git a/config/configure.xml b/config/configure.xml
index 9713339aac0334ba39de4d4a78bad5d365b3eeb5..2a4ee01fdaea0d66ebc4d5ca3ca0480952c100ea 100644 (file)
--- a/config/configure.xml
+++ b/config/configure.xml
@@ -20,13 +20,13 @@
   <configure name="PCFLAGS" value="-fopenmp"/>
   <configure name="DEFS" value="-DHAVE_CONFIG_H"/>
   <configure name="LDFLAGS" value="-L/usr/local/lib "/>
-  <configure name="LIBS" value="-lMagickCore -llcms -ltiff -lfreetype -ljasper -ljpeg -lpng -lfontconfig -lXext -lXt -lSM -lICE -lX11 -lbz2 -lxml2 -lz -lm -lgomp -lpthread -lltdl"/>
+  <configure name="LIBS" value="-lMagickCore -llcms -ltiff -lfreetype -ljasper -ljpeg -lpng -lfontconfig -lXext -lXt -lSM -lICE -lX11 -llzma -lbz2 -lxml2 -lz -lm -lgomp -lpthread -lltdl"/>
   <configure name="CXX" value="g++"/>
   <configure name="CXXFLAGS" value="-g -O2 -pthread"/>
   <configure name="DISTCHECK_CONFIG_FLAGS" value="--disable-deprecated --with-quantum-depth=16 --with-umem=no --with-autotrace=no --with-gslib=no --with-fontpath= --with-perl=no"/>
   <configure name="HOST" value="x86_64-unknown-linux-gnu"/>
   <configure name="FEATURES" value="OpenMP "/>
-  <configure name="DELEGATES" value="bzlib fontconfig freetype jpeg jng jp2 lcms png tiff x11 xml zlib"/>
+  <configure name="DELEGATES" value="bzlib fontconfig freetype jpeg jng jp2 lcms lzma png tiff x11 xml zlib"/>
   <configure name="COPYRIGHT" value="Copyright (C) 1999-2011 ImageMagick Studio LLC"/>
   <configure name="WEBSITE" value="http://www.imagemagick.org"/>
   <configure name="QuantumDepth" value="16"/>

diff --git a/libtool b/libtool
index 99c77f018600e059b2780d436ff7dc769c6bdebd..8856368aaa16f1d39d7c75f040b73e789d07e359 100755 (executable)
--- a/libtool
+++ b/libtool
@@ -246,7 +246,7 @@ hardcode_into_libs=yes
 sys_lib_search_path_spec="/usr/lib/gcc/x86_64-redhat-linux/4.5.1 /usr/lib64 /lib64 "
 
 # Run-time system search path for libraries.
-sys_lib_dlsearch_path_spec="/lib64 /usr/lib64 /lib /usr/lib /usr/lib64/atlas /usr/lib64/mysql /usr/lib64/qt-3.3/lib /usr/lib/wine/ /usr/lib64/wine/ /usr/lib64/xulrunner-1.9.2 "
+sys_lib_dlsearch_path_spec="/lib64 /usr/lib64 /lib /usr/lib /usr/lib64/atlas /usr/lib64/mysql /usr/lib64/qt-3.3/lib /usr/lib/wine/ /usr/lib64/wine/ "
 
 # Whether dlopen is supported.
 dlopen_support=yes

diff --git a/magick/Magick-config b/magick/Magick-config
index 72df5abe9676fe8d8c489e4b912160a87cbba916..36b3743240096b2836a7f7caaaaf40efd429552e 100755 (executable)
--- a/magick/Magick-config
+++ b/magick/Magick-config
@@ -52,7 +52,7 @@ while test $# -gt 0; do
       echo '-L/usr/local/lib '
       ;;
     --libs)
-      echo "-L${libdir} -lMagickCore -llcms -ltiff -lfreetype -ljasper -ljpeg -lpng -lfontconfig -lXext -lXt -lSM -lICE -lX11 -lbz2 -lxml2 -lz -lm -lgomp -lpthread -lltdl"
+      echo "-L${libdir} -lMagickCore -llcms -ltiff -lfreetype -ljasper -ljpeg -lpng -lfontconfig -lXext -lXt -lSM -lICE -lX11 -llzma -lbz2 -lxml2 -lz -lm -lgomp -lpthread -lltdl"
       ;;
     *)
       echo "${usage}" 1>&2

diff --git a/magick/magick-config.h b/magick/magick-config.h
index 7e887305e9d02192caf638afebd654755409ccd1..d5c334e3f5fdb917a31a8120b4e2c73e83895cfb 100644 (file)
--- a/magick/magick-config.h
+++ b/magick/magick-config.h
@@ -1125,7 +1125,9 @@
 #endif
 
 /* Define if you have lzma compression library */
-/* #undef LZMA_DELEGATE */
+#ifndef MAGICKCORE_LZMA_DELEGATE
+#define MAGICKCORE_LZMA_DELEGATE 1
+#endif
 
 /* Define to prepend to default font search path. */
 /* #undef MAGICK_FONT_PATH */

diff --git a/wand/Wand-config b/wand/Wand-config
index 05a13b5e6721dd70407805370c2f2136d782bfdf..879e982036d6bfbcb277c5530e9527fa6676ff06 100755 (executable)
--- a/wand/Wand-config
+++ b/wand/Wand-config
@@ -52,7 +52,7 @@ while test $# -gt 0; do
       echo '-L/usr/local/lib '
       ;;
     --libs)
-      echo "-L${libdir} -lMagickWand -lMagickCore -llcms -ltiff -lfreetype -ljasper -ljpeg -lpng -lfontconfig -lXext -lXt -lSM -lICE -lX11 -lbz2 -lxml2 -lz -lm -lgomp -lpthread -lltdl"
+      echo "-L${libdir} -lMagickWand -lMagickCore -llcms -ltiff -lfreetype -ljasper -ljpeg -lpng -lfontconfig -lXext -lXt -lSM -lICE -lX11 -llzma -lbz2 -lxml2 -lz -lm -lgomp -lpthread -lltdl"
       ;;
     *)
       echo "${usage}" 1>&2