commit ed7fd1726a8945f173c7791dfe5879c556223808
author Cristy <mikayla-grace@urban-warrior.org> Sat Dec 07 10:52:28 2019 -0500
committer Cristy <mikayla-grace@urban-warrior.org> Sat Dec 07 10:52:28 2019 -0500
tree 89497a3bb79f01c5ff20107480d8267e830bca58
parent 014110dbd07f0a6a9f36ce002c9c6bdf249bbe11

Build file clean-up @ https://github.com/ImageMagick/ImageMagick/pull/1798

ChangeLog

diff --git a/ChangeLog b/ChangeLog
index f32e9e3..53d93d3 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2019-12-07  7.0.9-8 Cristy  <quetzlzacatenango@image...>
+  * Release ImageMagick version 7.0.9-9, GIT revision 16...
+
+2019-12-07  7.0.9-9 Cristy  <quetzlzacatenango@image...>
+  * Build file clean-up (reference
+    https://github.com/ImageMagick/ImageMagick/pull/1798).
+
 2019-12-01  7.0.9-8 Cristy  <quetzlzacatenango@image...>
   * Release ImageMagick version 7.0.9-8, GIT revision 16474:0bc0e95:20191207.
 

Magick++/Makefile.am

diff --git a/Magick++/Makefile.am b/Magick++/Makefile.am
index 44c287b..e1c8d58 100644
--- a/Magick++/Makefile.am
+++ b/Magick++/Makefile.am
@@ -31,89 +31,89 @@
 endif
 
 MAGICKPP_SCRPTS_OPT = \
-	Magick++/bin/Magick++-config
+  Magick++/bin/Magick++-config
 
 MAGICKPP_MANS_OPT = \
-	Magick++/bin/Magick++-config.1
+  Magick++/bin/Magick++-config.1
 
 MAGICKPP_PKGCONFIG_OPT = \
-	Magick++/lib/Magick++.pc \
-	Magick++/lib/Magick++-@MAGICK_MAJOR_VERSION@.@MAGICK_ABI_SUFFIX@.pc
+  Magick++/lib/Magick++.pc \
+  Magick++/lib/Magick++-@MAGICK_MAJOR_VERSION@.@MAGICK_ABI_SUFFIX@.pc
 
 MAGICKPP_TEST_SCRPTS_OPT = \
-	Magick++/tests/tests.tap \
-	Magick++/demo/demos.tap
+  Magick++/tests/tests.tap \
+  Magick++/demo/demos.tap
 
 MAGICKPP_EXTRA_DIST = \
-	Magick++/AUTHORS \
-	Magick++/ChangeLog \
-	Magick++/INSTALL \
-	Magick++/LICENSE \
-	Magick++/NEWS \
-	Magick++/README \
-	Magick++/bin/Magick++-config.1 \
-	Magick++/bin/Magick++-config.in \
-	Magick++/lib/libMagick++.map \
-	Magick++/lib/Magick++.pc.in \
-	Magick++/demo/model.miff \
-	Magick++/demo/smile.miff \
-	Magick++/demo/smile_anim.miff \
-	Magick++/demo/tile.miff \
-	$(MAGICKPP_TEST_SCRPTS_OPT) \
-	Magick++/tests/test_image.miff \
-	Magick++/tests/test_image_anim.miff
+  Magick++/AUTHORS \
+  Magick++/ChangeLog \
+  Magick++/INSTALL \
+  Magick++/LICENSE \
+  Magick++/NEWS \
+  Magick++/README \
+  Magick++/bin/Magick++-config.1 \
+  Magick++/bin/Magick++-config.in \
+  Magick++/lib/libMagick++.map \
+  Magick++/lib/Magick++.pc.in \
+  Magick++/demo/model.miff \
+  Magick++/demo/smile.miff \
+  Magick++/demo/smile_anim.miff \
+  Magick++/demo/tile.miff \
+  $(MAGICKPP_TEST_SCRPTS_OPT) \
+  Magick++/tests/test_image.miff \
+  Magick++/tests/test_image_anim.miff
 
 MAGICKPP_CLEANFILES = \
-	Magick++/demo/*_out* \
-	Magick++/demo/ir.out \
-	Magick++/tests/colorHistogram.txt \
-	Magick++/tests/testmagick_anim_out.miff \
-	Magick++/tests/ir.out
+  Magick++/demo/*_out* \
+  Magick++/demo/ir.out \
+  Magick++/tests/colorHistogram.txt \
+  Magick++/tests/testmagick_anim_out.miff \
+  Magick++/tests/ir.out
 
 Magick___lib_libMagick___@MAGICK_MAJOR_VERSION@_@MAGICK_ABI_SUFFIX@_la_SOURCES = \
-	Magick++/lib/Blob.cpp \
-	Magick++/lib/BlobRef.cpp \
-	Magick++/lib/CoderInfo.cpp \
-	Magick++/lib/Color.cpp \
-	Magick++/lib/Drawable.cpp \
-	Magick++/lib/Exception.cpp \
-	Magick++/lib/Functions.cpp \
-	Magick++/lib/Geometry.cpp \
-	Magick++/lib/Image.cpp \
-	Magick++/lib/ImageRef.cpp \
-	Magick++/lib/Montage.cpp \
-	Magick++/lib/Options.cpp \
-	Magick++/lib/Pixels.cpp \
-	Magick++/lib/ResourceLimits.cpp \
-	Magick++/lib/SecurityPolicy.cpp \
-	Magick++/lib/Statistic.cpp \
-	Magick++/lib/STL.cpp \
-	Magick++/lib/Thread.cpp \
-	Magick++/lib/TypeMetric.cpp \
-	Magick++/lib/Magick++.h \
-	Magick++/lib/Magick++/Blob.h \
-	Magick++/lib/Magick++/BlobRef.h \
-	Magick++/lib/Magick++/CoderInfo.h \
-	Magick++/lib/Magick++/Color.h \
-	Magick++/lib/Magick++/Drawable.h \
-	Magick++/lib/Magick++/Exception.h \
-	Magick++/lib/Magick++/Functions.h \
-	Magick++/lib/Magick++/Geometry.h \
-	Magick++/lib/Magick++/Image.h \
-	Magick++/lib/Magick++/ImageRef.h \
-	Magick++/lib/Magick++/Include.h \
-	Magick++/lib/Magick++/Montage.h \
-	Magick++/lib/Magick++/Options.h \
-	Magick++/lib/Magick++/Pixels.h \
-	Magick++/lib/Magick++/ResourceLimits.h \
-	Magick++/lib/Magick++/SecurityPolicy.h \
-	Magick++/lib/Magick++/Statistic.h \
-	Magick++/lib/Magick++/STL.h \
-	Magick++/lib/Magick++/Thread.h \
-	Magick++/lib/Magick++/TypeMetric.h
+  Magick++/lib/Blob.cpp \
+  Magick++/lib/BlobRef.cpp \
+  Magick++/lib/CoderInfo.cpp \
+  Magick++/lib/Color.cpp \
+  Magick++/lib/Drawable.cpp \
+  Magick++/lib/Exception.cpp \
+  Magick++/lib/Functions.cpp \
+  Magick++/lib/Geometry.cpp \
+  Magick++/lib/Image.cpp \
+  Magick++/lib/ImageRef.cpp \
+  Magick++/lib/Montage.cpp \
+  Magick++/lib/Options.cpp \
+  Magick++/lib/Pixels.cpp \
+  Magick++/lib/ResourceLimits.cpp \
+  Magick++/lib/SecurityPolicy.cpp \
+  Magick++/lib/Statistic.cpp \
+  Magick++/lib/STL.cpp \
+  Magick++/lib/Thread.cpp \
+  Magick++/lib/TypeMetric.cpp \
+  Magick++/lib/Magick++.h \
+  Magick++/lib/Magick++/Blob.h \
+  Magick++/lib/Magick++/BlobRef.h \
+  Magick++/lib/Magick++/CoderInfo.h \
+  Magick++/lib/Magick++/Color.h \
+  Magick++/lib/Magick++/Drawable.h \
+  Magick++/lib/Magick++/Exception.h \
+  Magick++/lib/Magick++/Functions.h \
+  Magick++/lib/Magick++/Geometry.h \
+  Magick++/lib/Magick++/Image.h \
+  Magick++/lib/Magick++/ImageRef.h \
+  Magick++/lib/Magick++/Include.h \
+  Magick++/lib/Magick++/Montage.h \
+  Magick++/lib/Magick++/Options.h \
+  Magick++/lib/Magick++/Pixels.h \
+  Magick++/lib/Magick++/ResourceLimits.h \
+  Magick++/lib/Magick++/SecurityPolicy.h \
+  Magick++/lib/Magick++/Statistic.h \
+  Magick++/lib/Magick++/STL.h \
+  Magick++/lib/Magick++/Thread.h \
+  Magick++/lib/Magick++/TypeMetric.h
 
 Magick___lib_libMagick___@MAGICK_MAJOR_VERSION@_@MAGICK_ABI_SUFFIX@_la_CPPFLAGS = \
-	$(MAGICKPP_CPPFLAGS) $(LIBRARY_EXTRA_CPPFLAGS)
+  $(MAGICKPP_CPPFLAGS) $(LIBRARY_EXTRA_CPPFLAGS)
 
 magickpptopincdir = $(INCLUDE_PATH)
 
@@ -127,22 +127,22 @@
 magickppinc_HEADERS = $(MAGICKPP_INCHEADERS)
 
 MAGICKPP_INCHEADERS_OPT = \
-	Magick++/lib/Magick++/Blob.h \
-	Magick++/lib/Magick++/CoderInfo.h \
-	Magick++/lib/Magick++/Color.h \
-	Magick++/lib/Magick++/Drawable.h \
-	Magick++/lib/Magick++/Exception.h \
-	Magick++/lib/Magick++/Functions.h \
-	Magick++/lib/Magick++/Geometry.h \
-	Magick++/lib/Magick++/Image.h \
-	Magick++/lib/Magick++/Include.h \
-	Magick++/lib/Magick++/Montage.h \
-	Magick++/lib/Magick++/Pixels.h \
-	Magick++/lib/Magick++/ResourceLimits.h \
-	Magick++/lib/Magick++/SecurityPolicy.h \
-	Magick++/lib/Magick++/Statistic.h \
-	Magick++/lib/Magick++/STL.h \
-	Magick++/lib/Magick++/TypeMetric.h
+  Magick++/lib/Magick++/Blob.h \
+  Magick++/lib/Magick++/CoderInfo.h \
+  Magick++/lib/Magick++/Color.h \
+  Magick++/lib/Magick++/Drawable.h \
+  Magick++/lib/Magick++/Exception.h \
+  Magick++/lib/Magick++/Functions.h \
+  Magick++/lib/Magick++/Geometry.h \
+  Magick++/lib/Magick++/Image.h \
+  Magick++/lib/Magick++/Include.h \
+  Magick++/lib/Magick++/Montage.h \
+  Magick++/lib/Magick++/Pixels.h \
+  Magick++/lib/Magick++/ResourceLimits.h \
+  Magick++/lib/Magick++/SecurityPolicy.h \
+  Magick++/lib/Magick++/Statistic.h \
+  Magick++/lib/Magick++/STL.h \
+  Magick++/lib/Magick++/TypeMetric.h
 
 if HAVE_LD_VERSION_SCRIPT
 Magick___lib_libMagick___@MAGICK_MAJOR_VERSION@_@MAGICK_ABI_SUFFIX@_la_LDFLAGS_VERSION =  -Wl,--version-script=$(top_srcdir)/Magick++/lib/libMagick++.map
@@ -157,115 +157,115 @@
 Magick___lib_libMagick___@MAGICK_MAJOR_VERSION@_@MAGICK_ABI_SUFFIX@_la_LIBADD = $(MAGICKCORE_LIBS) $(MAGICKWAND_LIBS)
 
 MAGICKPP_CHECK_PGRMS_OPT = \
-	Magick++/demo/analyze \
-	Magick++/demo/button \
-	Magick++/demo/demo \
-	Magick++/demo/detrans \
-	Magick++/demo/flip \
-	Magick++/demo/gravity \
-	Magick++/demo/piddle \
-	Magick++/demo/shapes \
-	Magick++/demo/zoom \
-	Magick++/tests/appendImages \
-	Magick++/tests/attributes \
-	Magick++/tests/averageImages \
-	Magick++/tests/coalesceImages \
-	Magick++/tests/coderInfo \
-	Magick++/tests/color \
-	Magick++/tests/colorHistogram \
-	Magick++/tests/exceptions \
-	Magick++/tests/geometry \
-	Magick++/tests/montageImages \
-	Magick++/tests/morphImages \
-	Magick++/tests/readWriteBlob \
-	Magick++/tests/readWriteImages
+  Magick++/demo/analyze \
+  Magick++/demo/button \
+  Magick++/demo/demo \
+  Magick++/demo/detrans \
+  Magick++/demo/flip \
+  Magick++/demo/gravity \
+  Magick++/demo/piddle \
+  Magick++/demo/shapes \
+  Magick++/demo/zoom \
+  Magick++/tests/appendImages \
+  Magick++/tests/attributes \
+  Magick++/tests/averageImages \
+  Magick++/tests/coalesceImages \
+  Magick++/tests/coderInfo \
+  Magick++/tests/color \
+  Magick++/tests/colorHistogram \
+  Magick++/tests/exceptions \
+  Magick++/tests/geometry \
+  Magick++/tests/montageImages \
+  Magick++/tests/morphImages \
+  Magick++/tests/readWriteBlob \
+  Magick++/tests/readWriteImages
 
-Magick___demo_analyze_SOURCES		= Magick++/demo/analyze.cpp
-Magick___demo_analyze_LDADD		  = $(MAGICKPP_LDADD)
+Magick___demo_analyze_SOURCES   = Magick++/demo/analyze.cpp
+Magick___demo_analyze_LDADD     = $(MAGICKPP_LDADD)
 Magick___demo_analyze_CPPFLAGS  = $(MAGICKPP_CPPFLAGS)
 
-Magick___demo_button_SOURCES		= Magick++/demo/button.cpp
-Magick___demo_button_LDADD		  = $(MAGICKPP_LDADD)
+Magick___demo_button_SOURCES    = Magick++/demo/button.cpp
+Magick___demo_button_LDADD      = $(MAGICKPP_LDADD)
 Magick___demo_button_CPPFLAGS   = $(MAGICKPP_CPPFLAGS)
 
-Magick___demo_demo_SOURCES	   	= Magick++/demo/demo.cpp
-Magick___demo_demo_LDADD		    = $(MAGICKPP_LDADD)
+Magick___demo_demo_SOURCES      = Magick++/demo/demo.cpp
+Magick___demo_demo_LDADD        = $(MAGICKPP_LDADD)
 Magick___demo_demo_CPPFLAGS     = $(MAGICKPP_CPPFLAGS)
 
-Magick___demo_detrans_SOURCES		= Magick++/demo/detrans.cpp
-Magick___demo_detrans_LDADD		  = $(MAGICKPP_LDADD)
+Magick___demo_detrans_SOURCES   = Magick++/demo/detrans.cpp
+Magick___demo_detrans_LDADD     = $(MAGICKPP_LDADD)
 Magick___demo_detrans_CPPFLAGS  = $(MAGICKPP_CPPFLAGS)
 
-Magick___demo_flip_SOURCES		  = Magick++/demo/flip.cpp
-Magick___demo_flip_LDADD		    = $(MAGICKPP_LDADD)
+Magick___demo_flip_SOURCES      = Magick++/demo/flip.cpp
+Magick___demo_flip_LDADD        = $(MAGICKPP_LDADD)
 Magick___demo_flip_CPPFLAGS     = $(MAGICKPP_CPPFLAGS)
 
-Magick___demo_gravity_SOURCES		= Magick++/demo/gravity.cpp
-Magick___demo_gravity_LDADD		  = $(MAGICKPP_LDADD)
+Magick___demo_gravity_SOURCES   = Magick++/demo/gravity.cpp
+Magick___demo_gravity_LDADD     = $(MAGICKPP_LDADD)
 Magick___demo_gravity_CPPFLAGS  = $(MAGICKPP_CPPFLAGS)
 
-Magick___demo_piddle_SOURCES		= Magick++/demo/piddle.cpp
-Magick___demo_piddle_LDADD		  = $(MAGICKPP_LDADD)
+Magick___demo_piddle_SOURCES    = Magick++/demo/piddle.cpp
+Magick___demo_piddle_LDADD      = $(MAGICKPP_LDADD)
 Magick___demo_piddle_CPPFLAGS   = $(MAGICKPP_CPPFLAGS)
 
-Magick___demo_shapes_SOURCES		= Magick++/demo/shapes.cpp
-Magick___demo_shapes_LDADD		  = $(MAGICKPP_LDADD)
+Magick___demo_shapes_SOURCES    = Magick++/demo/shapes.cpp
+Magick___demo_shapes_LDADD      = $(MAGICKPP_LDADD)
 Magick___demo_shapes_CPPFLAGS   = $(MAGICKPP_CPPFLAGS)
 
-Magick___demo_zoom_SOURCES		= Magick++/demo/zoom.cpp
-Magick___demo_zoom_LDADD		  = $(MAGICKPP_LDADD)
+Magick___demo_zoom_SOURCES    = Magick++/demo/zoom.cpp
+Magick___demo_zoom_LDADD      = $(MAGICKPP_LDADD)
 Magick___demo_zoom_CPPFLAGS   = $(MAGICKPP_CPPFLAGS)
 
-Magick___tests_appendImages_SOURCES	  = Magick++/tests/appendImages.cpp
-Magick___tests_appendImages_LDADD	    = $(MAGICKPP_LDADD)
-Magick___tests_appendImages_CPPFLAGS	= $(MAGICKPP_CPPFLAGS)
+Magick___tests_appendImages_SOURCES   = Magick++/tests/appendImages.cpp
+Magick___tests_appendImages_LDADD     = $(MAGICKPP_LDADD)
+Magick___tests_appendImages_CPPFLAGS  = $(MAGICKPP_CPPFLAGS)
 
-Magick___tests_attributes_SOURCES	    = Magick++/tests/attributes.cpp
-Magick___tests_attributes_LDADD		    = $(MAGICKPP_LDADD)
-Magick___tests_attributes_CPPFLAGS	  = $(MAGICKPP_CPPFLAGS)
+Magick___tests_attributes_SOURCES     = Magick++/tests/attributes.cpp
+Magick___tests_attributes_LDADD       = $(MAGICKPP_LDADD)
+Magick___tests_attributes_CPPFLAGS    = $(MAGICKPP_CPPFLAGS)
 
-Magick___tests_averageImages_SOURCES	= Magick++/tests/averageImages.cpp
-Magick___tests_averageImages_LDADD	  = $(MAGICKPP_LDADD)
+Magick___tests_averageImages_SOURCES  = Magick++/tests/averageImages.cpp
+Magick___tests_averageImages_LDADD    = $(MAGICKPP_LDADD)
 Magick___tests_averageImages_CPPFLAGS = $(MAGICKPP_CPPFLAGS)
 
-Magick___tests_coalesceImages_SOURCES	= Magick++/tests/coalesceImages.cpp
-Magick___tests_coalesceImages_LDADD	  = $(MAGICKPP_LDADD)
+Magick___tests_coalesceImages_SOURCES = Magick++/tests/coalesceImages.cpp
+Magick___tests_coalesceImages_LDADD   = $(MAGICKPP_LDADD)
 Magick___tests_coalesceImages_CPPFLAGS= $(MAGICKPP_CPPFLAGS)
 
-Magick___tests_coderInfo_SOURCES	    = Magick++/tests/coderInfo.cpp
-Magick___tests_coderInfo_LDADD		    = $(MAGICKPP_LDADD)
+Magick___tests_coderInfo_SOURCES      = Magick++/tests/coderInfo.cpp
+Magick___tests_coderInfo_LDADD        = $(MAGICKPP_LDADD)
 Magick___tests_coderInfo_CPPFLAGS     = $(MAGICKPP_CPPFLAGS)
 
-Magick___tests_color_SOURCES		      = Magick++/tests/color.cpp
-Magick___tests_color_LDADD		        = $(MAGICKPP_LDADD)
+Magick___tests_color_SOURCES          = Magick++/tests/color.cpp
+Magick___tests_color_LDADD            = $(MAGICKPP_LDADD)
 Magick___tests_color_CPPFLAGS         = $(MAGICKPP_CPPFLAGS)
 
-Magick___tests_colorHistogram_SOURCES	= Magick++/tests/colorHistogram.cpp
-Magick___tests_colorHistogram_LDADD	  = $(MAGICKPP_LDADD)
+Magick___tests_colorHistogram_SOURCES = Magick++/tests/colorHistogram.cpp
+Magick___tests_colorHistogram_LDADD   = $(MAGICKPP_LDADD)
 Magick___tests_colorHistogram_CPPFLAGS= $(MAGICKPP_CPPFLAGS)
 
-Magick___tests_exceptions_SOURCES	    = Magick++/tests/exceptions.cpp
-Magick___tests_exceptions_LDADD		    = $(MAGICKPP_LDADD)
+Magick___tests_exceptions_SOURCES     = Magick++/tests/exceptions.cpp
+Magick___tests_exceptions_LDADD       = $(MAGICKPP_LDADD)
 Magick___tests_exceptions_CPPFLAGS    = $(MAGICKPP_CPPFLAGS)
 
-Magick___tests_geometry_SOURCES	    = Magick++/tests/geometry.cpp
-Magick___tests_geometry_LDADD		    = $(MAGICKPP_LDADD)
+Magick___tests_geometry_SOURCES     = Magick++/tests/geometry.cpp
+Magick___tests_geometry_LDADD       = $(MAGICKPP_LDADD)
 Magick___tests_geometry_CPPFLAGS    = $(MAGICKPP_CPPFLAGS)
 
-Magick___tests_montageImages_SOURCES	= Magick++/tests/montageImages.cpp
-Magick___tests_montageImages_LDADD	  = $(MAGICKPP_LDADD)
+Magick___tests_montageImages_SOURCES  = Magick++/tests/montageImages.cpp
+Magick___tests_montageImages_LDADD    = $(MAGICKPP_LDADD)
 Magick___tests_montageImages_CPPFLAGS = $(MAGICKPP_CPPFLAGS)
 
-Magick___tests_morphImages_SOURCES	  = Magick++/tests/morphImages.cpp
-Magick___tests_morphImages_LDADD	    = $(MAGICKPP_LDADD)
+Magick___tests_morphImages_SOURCES    = Magick++/tests/morphImages.cpp
+Magick___tests_morphImages_LDADD      = $(MAGICKPP_LDADD)
 Magick___tests_morphImages_CPPFLAGS   = $(MAGICKPP_CPPFLAGS)
 
-Magick___tests_readWriteBlob_SOURCES	= Magick++/tests/readWriteBlob.cpp
-Magick___tests_readWriteBlob_LDADD	  = $(MAGICKPP_LDADD)
+Magick___tests_readWriteBlob_SOURCES  = Magick++/tests/readWriteBlob.cpp
+Magick___tests_readWriteBlob_LDADD    = $(MAGICKPP_LDADD)
 Magick___tests_readWriteBlob_CPPFLAGS = $(MAGICKPP_CPPFLAGS)
 
-Magick___tests_readWriteImages_SOURCES	= Magick++/tests/readWriteImages.cpp
-Magick___tests_readWriteImages_LDADD	  = $(MAGICKPP_LDADD)
+Magick___tests_readWriteImages_SOURCES  = Magick++/tests/readWriteImages.cpp
+Magick___tests_readWriteImages_LDADD    = $(MAGICKPP_LDADD)
 Magick___tests_readWriteImages_CPPFLAGS = $(MAGICKPP_CPPFLAGS)
 
 MAGICKPP_LOCAL_TARGETS = www/Magick++/NEWS.html www/Magick++/ChangeLog.html

MagickCore/Makefile.am

diff --git a/MagickCore/Makefile.am b/MagickCore/Makefile.am
index a0db01b..ba52aac 100644
--- a/MagickCore/Makefile.am
+++ b/MagickCore/Makefile.am
@@ -13,25 +13,25 @@
 #  limitations under the License.
 #
 #  Makefile for building the MagickCore API.
-# 
+#
 
 MagickCoreincdir = $(INCLUDE_PATH)/MagickCore
 MagickCoreincarchdir = $(INCLUDEARCH_PATH)/MagickCore
 
 # Headers which are installed
 MagickCoreinc_HEADERS = \
-	$(MAGICKCORE_INCLUDE_HDRS)
+  $(MAGICKCORE_INCLUDE_HDRS)
 MagickCoreincarch_HEADERS = \
-	$(MAGICKCORE_INCLUDEARCH_HDRS)
+  $(MAGICKCORE_INCLUDEARCH_HDRS)
 
 MAGICKCORE_BIN_SCRPTS = \
   MagickCore/MagickCore-config
 
 MAGICKCORE_PKGCONFIG = \
   MagickCore/ImageMagick.pc \
-	MagickCore/MagickCore.pc \
-	MagickCore/ImageMagick-@MAGICK_MAJOR_VERSION@.@MAGICK_ABI_SUFFIX@.pc \
-	MagickCore/MagickCore-@MAGICK_MAJOR_VERSION@.@MAGICK_ABI_SUFFIX@.pc 
+  MagickCore/MagickCore.pc \
+  MagickCore/ImageMagick-@MAGICK_MAJOR_VERSION@.@MAGICK_ABI_SUFFIX@.pc \
+  MagickCore/MagickCore-@MAGICK_MAJOR_VERSION@.@MAGICK_ABI_SUFFIX@.pc
 
 OSX_GCOV_LDFLAG = @OSX_GCOV_LDFLAG@
 
@@ -47,6 +47,8 @@
 MagickCore_libMagickCore_@MAGICK_MAJOR_VERSION@_@MAGICK_ABI_SUFFIX@_la_SOURCES = $(MAGICKCORE_BASE_SRCS) $(MAGICKCORE_PLATFORM_SRCS) $(MAGICKCORE_CODER_SRCS) $(MAGICKCORE_FILTER_SRCS)
 MagickCore_libMagickCore_@MAGICK_MAJOR_VERSION@_@MAGICK_ABI_SUFFIX@_la_LIBADD = $(MAGICK_DEP_LIBS)
 endif # WITH_MODULES
+
+nodist_MagickCore_libMagickCore_@MAGICK_MAJOR_VERSION@_@MAGICK_ABI_SUFFIX@_la_SOURCES =
 MagickCore_libMagickCore_@MAGICK_MAJOR_VERSION@_@MAGICK_ABI_SUFFIX@_la_CPPFLAGS = $(AM_CPPFLAGS) $(LIBRARY_EXTRA_CPPFLAGS)
 
 if HAVE_LD_VERSION_SCRIPT
@@ -63,238 +65,238 @@
 
 # Library base sources
 MAGICKCORE_BASE_SRCS = \
-	MagickCore/MagickCore.h \
-	MagickCore/accelerate.c \
-	MagickCore/accelerate-private.h \
-	MagickCore/accelerate-kernels-private.h \
-	MagickCore/animate.c \
-	MagickCore/animate.h \
-	MagickCore/animate-private.h \
-	MagickCore/annotate.c \
-	MagickCore/annotate.h \
-	MagickCore/artifact.c \
-	MagickCore/artifact.h \
-	MagickCore/attribute.c \
-	MagickCore/attribute.h \
-	MagickCore/blob.c \
-	MagickCore/blob.h \
-	MagickCore/blob-private.h \
-	MagickCore/cache.c \
-	MagickCore/cache.h \
-	MagickCore/cache-private.h \
-	MagickCore/cache-view.c \
-	MagickCore/cache-view.h \
-	MagickCore/channel.c \
-	MagickCore/channel.h \
-	MagickCore/cipher.c \
-	MagickCore/cipher.h \
-	MagickCore/client.c \
-	MagickCore/client.h \
-	MagickCore/coder.c \
-	MagickCore/coder.h \
-	MagickCore/color.c \
-	MagickCore/color.h \
-	MagickCore/color-private.h \
-	MagickCore/colormap.c \
-	MagickCore/colormap.h \
-	MagickCore/colormap-private.h \
-	MagickCore/colorspace.c \
-	MagickCore/colorspace.h \
-	MagickCore/colorspace-private.h \
-	MagickCore/compare.c \
-	MagickCore/compare.h \
-	MagickCore/composite.c \
-	MagickCore/composite.h \
-	MagickCore/composite-private.h \
-	MagickCore/compress.c \
-	MagickCore/compress.h \
-	MagickCore/configure.c \
-	MagickCore/configure.h \
-	MagickCore/constitute.c \
-	MagickCore/constitute.h \
-	MagickCore/decorate.c \
-	MagickCore/decorate.h \
-	MagickCore/delegate.c \
-	MagickCore/delegate.h \
-	MagickCore/delegate-private.h \
-	MagickCore/deprecate.c \
-	MagickCore/deprecate.h \
-	MagickCore/display.c \
-	MagickCore/display.h \
-	MagickCore/display-private.h \
-	MagickCore/distort.c \
-	MagickCore/distort.h \
-	MagickCore/distribute-cache.c \
-	MagickCore/distribute-cache.h \
-	MagickCore/distribute-cache-private.h \
-	MagickCore/draw.c \
-	MagickCore/draw.h \
-	MagickCore/draw-private.h \
-	MagickCore/effect.c \
-	MagickCore/effect.h \
-	MagickCore/enhance.c \
-	MagickCore/enhance.h \
-	MagickCore/exception.c \
-	MagickCore/exception.h \
-	MagickCore/exception-private.h \
-	MagickCore/feature.c \
-	MagickCore/feature.h \
-	MagickCore/fourier.c \
-	MagickCore/fourier.h \
-	MagickCore/fx.c \
-	MagickCore/fx.h \
-	MagickCore/fx-private.h \
-	MagickCore/gem.c \
-	MagickCore/gem.h \
-	MagickCore/gem-private.h \
-	MagickCore/geometry.c \
-	MagickCore/geometry.h \
-	MagickCore/histogram.c \
-	MagickCore/histogram.h \
-	MagickCore/identify.c \
-	MagickCore/identify.h \
-	MagickCore/image.c \
-	MagickCore/image.h \
-	MagickCore/image-private.h \
-	MagickCore/image-view.c \
-	MagickCore/image-view.h \
-	MagickCore/layer.c \
-	MagickCore/layer.h \
-	MagickCore/linked-list.c \
-	MagickCore/linked-list.h \
-	MagickCore/list.c \
-	MagickCore/list.h \
-	MagickCore/locale.c \
-	MagickCore/locale_.h \
-	MagickCore/log.c \
-	MagickCore/log.h \
-	MagickCore/magic.c \
-	MagickCore/magic.h \
-	MagickCore/magick.c \
-	MagickCore/magick-baseconfig.h \
-	MagickCore/magick-config.h \
-	MagickCore/magick-type.h \
-	MagickCore/magick.h \
-	MagickCore/matrix.c \
-	MagickCore/matrix.h \
-	MagickCore/matrix-private.h \
-	MagickCore/memory.c \
-	MagickCore/memory_.h \
-	MagickCore/memory-private.h \
-	MagickCore/method-attribute.h \
-	MagickCore/methods.h \
-	MagickCore/mime.c \
-	MagickCore/mime.h \
-	MagickCore/module.c \
-	MagickCore/module.h \
-	MagickCore/monitor.c \
-	MagickCore/monitor.h \
-	MagickCore/monitor-private.h \
-	MagickCore/montage.c \
-	MagickCore/montage.h \
-	MagickCore/morphology.c \
-	MagickCore/morphology.h \
-	MagickCore/morphology-private.h \
-	MagickCore/nt-base.h \
+  MagickCore/MagickCore.h \
+  MagickCore/accelerate.c \
+  MagickCore/accelerate-private.h \
+  MagickCore/accelerate-kernels-private.h \
+  MagickCore/animate.c \
+  MagickCore/animate.h \
+  MagickCore/animate-private.h \
+  MagickCore/annotate.c \
+  MagickCore/annotate.h \
+  MagickCore/artifact.c \
+  MagickCore/artifact.h \
+  MagickCore/attribute.c \
+  MagickCore/attribute.h \
+  MagickCore/blob.c \
+  MagickCore/blob.h \
+  MagickCore/blob-private.h \
+  MagickCore/cache.c \
+  MagickCore/cache.h \
+  MagickCore/cache-private.h \
+  MagickCore/cache-view.c \
+  MagickCore/cache-view.h \
+  MagickCore/channel.c \
+  MagickCore/channel.h \
+  MagickCore/cipher.c \
+  MagickCore/cipher.h \
+  MagickCore/client.c \
+  MagickCore/client.h \
+  MagickCore/coder.c \
+  MagickCore/coder.h \
+  MagickCore/color.c \
+  MagickCore/color.h \
+  MagickCore/color-private.h \
+  MagickCore/colormap.c \
+  MagickCore/colormap.h \
+  MagickCore/colormap-private.h \
+  MagickCore/colorspace.c \
+  MagickCore/colorspace.h \
+  MagickCore/colorspace-private.h \
+  MagickCore/compare.c \
+  MagickCore/compare.h \
+  MagickCore/composite.c \
+  MagickCore/composite.h \
+  MagickCore/composite-private.h \
+  MagickCore/compress.c \
+  MagickCore/compress.h \
+  MagickCore/configure.c \
+  MagickCore/configure.h \
+  MagickCore/constitute.c \
+  MagickCore/constitute.h \
+  MagickCore/decorate.c \
+  MagickCore/decorate.h \
+  MagickCore/delegate.c \
+  MagickCore/delegate.h \
+  MagickCore/delegate-private.h \
+  MagickCore/deprecate.c \
+  MagickCore/deprecate.h \
+  MagickCore/display.c \
+  MagickCore/display.h \
+  MagickCore/display-private.h \
+  MagickCore/distort.c \
+  MagickCore/distort.h \
+  MagickCore/distribute-cache.c \
+  MagickCore/distribute-cache.h \
+  MagickCore/distribute-cache-private.h \
+  MagickCore/draw.c \
+  MagickCore/draw.h \
+  MagickCore/draw-private.h \
+  MagickCore/effect.c \
+  MagickCore/effect.h \
+  MagickCore/enhance.c \
+  MagickCore/enhance.h \
+  MagickCore/exception.c \
+  MagickCore/exception.h \
+  MagickCore/exception-private.h \
+  MagickCore/feature.c \
+  MagickCore/feature.h \
+  MagickCore/fourier.c \
+  MagickCore/fourier.h \
+  MagickCore/fx.c \
+  MagickCore/fx.h \
+  MagickCore/fx-private.h \
+  MagickCore/gem.c \
+  MagickCore/gem.h \
+  MagickCore/gem-private.h \
+  MagickCore/geometry.c \
+  MagickCore/geometry.h \
+  MagickCore/histogram.c \
+  MagickCore/histogram.h \
+  MagickCore/identify.c \
+  MagickCore/identify.h \
+  MagickCore/image.c \
+  MagickCore/image.h \
+  MagickCore/image-private.h \
+  MagickCore/image-view.c \
+  MagickCore/image-view.h \
+  MagickCore/layer.c \
+  MagickCore/layer.h \
+  MagickCore/linked-list.c \
+  MagickCore/linked-list.h \
+  MagickCore/list.c \
+  MagickCore/list.h \
+  MagickCore/locale.c \
+  MagickCore/locale_.h \
+  MagickCore/log.c \
+  MagickCore/log.h \
+  MagickCore/magic.c \
+  MagickCore/magic.h \
+  MagickCore/magick.c \
+  MagickCore/magick-baseconfig.h \
+  MagickCore/magick-config.h \
+  MagickCore/magick-type.h \
+  MagickCore/magick.h \
+  MagickCore/matrix.c \
+  MagickCore/matrix.h \
+  MagickCore/matrix-private.h \
+  MagickCore/memory.c \
+  MagickCore/memory_.h \
+  MagickCore/memory-private.h \
+  MagickCore/method-attribute.h \
+  MagickCore/methods.h \
+  MagickCore/mime.c \
+  MagickCore/mime.h \
+  MagickCore/module.c \
+  MagickCore/module.h \
+  MagickCore/monitor.c \
+  MagickCore/monitor.h \
+  MagickCore/monitor-private.h \
+  MagickCore/montage.c \
+  MagickCore/montage.h \
+  MagickCore/morphology.c \
+  MagickCore/morphology.h \
+  MagickCore/morphology-private.h \
+  MagickCore/nt-base.h \
   MagickCore/nt-base-private.h \
-	MagickCore/nt-feature.h \
-	MagickCore/opencl.c \
-	MagickCore/opencl.h \
-	MagickCore/opencl-private.h \
-	MagickCore/option.c \
-	MagickCore/option.h \
-	MagickCore/option-private.h \
-	MagickCore/paint.c \
-	MagickCore/paint.h \
-	MagickCore/pixel.c \
-	MagickCore/pixel.h \
-	MagickCore/pixel-accessor.h \
-	MagickCore/pixel-private.h \
-	MagickCore/policy.c \
-	MagickCore/policy.h \
-	MagickCore/policy-private.h \
-	MagickCore/prepress.c \
-	MagickCore/prepress.h \
-	MagickCore/property.c \
-	MagickCore/property.h \
-	MagickCore/profile.c \
-	MagickCore/profile.h \
-	MagickCore/profile-private.h \
-	MagickCore/quantize.c \
-	MagickCore/quantize.h \
-	MagickCore/quantum.c \
-	MagickCore/quantum.h \
-	MagickCore/quantum-export.c \
-	MagickCore/quantum-import.c \
-	MagickCore/quantum-private.h \
-	MagickCore/random.c \
-	MagickCore/random_.h \
-	MagickCore/random-private.h \
-	MagickCore/registry.c \
-	MagickCore/registry.h \
-	MagickCore/resample.c \
-	MagickCore/resample.h \
-	MagickCore/resample-private.h \
-	MagickCore/resize.c \
-	MagickCore/resize.h \
-	MagickCore/resize-private.h \
-	MagickCore/resource.c \
-	MagickCore/resource_.h \
-	MagickCore/resource-private.h \
-	MagickCore/segment.c \
-	MagickCore/segment.h \
-	MagickCore/semaphore.c \
-	MagickCore/semaphore.h \
-	MagickCore/semaphore-private.h \
-	MagickCore/shear.c \
-	MagickCore/shear.h \
-	MagickCore/signature.c \
-	MagickCore/signature.h \
-	MagickCore/signature-private.h \
-	MagickCore/splay-tree.c \
-	MagickCore/splay-tree.h \
-	MagickCore/static.c \
-	MagickCore/static.h \
-	MagickCore/statistic.c \
-	MagickCore/statistic.h \
-	MagickCore/stream.c \
-	MagickCore/stream.h \
-	MagickCore/stream-private.h \
-	MagickCore/string.c \
-	MagickCore/string_.h \
-	MagickCore/string-private.h \
-	MagickCore/studio.h \
-	MagickCore/thread.c \
-	MagickCore/thread_.h \
-	MagickCore/thread-private.h \
-	MagickCore/timer.c \
-	MagickCore/timer.h \
- 	MagickCore/timer-private.h \
-	MagickCore/token.c \
-	MagickCore/token.h \
-	MagickCore/token-private.h \
-	MagickCore/transform.c \
-	MagickCore/transform.h \
-	MagickCore/threshold.c \
-	MagickCore/threshold.h \
-	MagickCore/type.c \
-	MagickCore/type.h \
-	MagickCore/utility.c \
-	MagickCore/utility.h \
-	MagickCore/utility-private.h \
-	MagickCore/version.c \
-	MagickCore/version.h \
-	MagickCore/version-private.h \
-	MagickCore/vision.c \
-	MagickCore/vision.h \
-	MagickCore/widget.c \
-	MagickCore/widget.h \
-	MagickCore/widget-private.h \
-	MagickCore/xml-tree.c \
-	MagickCore/xml-tree.h \
-	MagickCore/xml-tree-private.h \
-	MagickCore/xwindow.c \
-	MagickCore/xwindow.h 
+  MagickCore/nt-feature.h \
+  MagickCore/opencl.c \
+  MagickCore/opencl.h \
+  MagickCore/opencl-private.h \
+  MagickCore/option.c \
+  MagickCore/option.h \
+  MagickCore/option-private.h \
+  MagickCore/paint.c \
+  MagickCore/paint.h \
+  MagickCore/pixel.c \
+  MagickCore/pixel.h \
+  MagickCore/pixel-accessor.h \
+  MagickCore/pixel-private.h \
+  MagickCore/policy.c \
+  MagickCore/policy.h \
+  MagickCore/policy-private.h \
+  MagickCore/prepress.c \
+  MagickCore/prepress.h \
+  MagickCore/property.c \
+  MagickCore/property.h \
+  MagickCore/profile.c \
+  MagickCore/profile.h \
+  MagickCore/profile-private.h \
+  MagickCore/quantize.c \
+  MagickCore/quantize.h \
+  MagickCore/quantum.c \
+  MagickCore/quantum.h \
+  MagickCore/quantum-export.c \
+  MagickCore/quantum-import.c \
+  MagickCore/quantum-private.h \
+  MagickCore/random.c \
+  MagickCore/random_.h \
+  MagickCore/random-private.h \
+  MagickCore/registry.c \
+  MagickCore/registry.h \
+  MagickCore/resample.c \
+  MagickCore/resample.h \
+  MagickCore/resample-private.h \
+  MagickCore/resize.c \
+  MagickCore/resize.h \
+  MagickCore/resize-private.h \
+  MagickCore/resource.c \
+  MagickCore/resource_.h \
+  MagickCore/resource-private.h \
+  MagickCore/segment.c \
+  MagickCore/segment.h \
+  MagickCore/semaphore.c \
+  MagickCore/semaphore.h \
+  MagickCore/semaphore-private.h \
+  MagickCore/shear.c \
+  MagickCore/shear.h \
+  MagickCore/signature.c \
+  MagickCore/signature.h \
+  MagickCore/signature-private.h \
+  MagickCore/splay-tree.c \
+  MagickCore/splay-tree.h \
+  MagickCore/static.c \
+  MagickCore/static.h \
+  MagickCore/statistic.c \
+  MagickCore/statistic.h \
+  MagickCore/stream.c \
+  MagickCore/stream.h \
+  MagickCore/stream-private.h \
+  MagickCore/string.c \
+  MagickCore/string_.h \
+  MagickCore/string-private.h \
+  MagickCore/studio.h \
+  MagickCore/thread.c \
+  MagickCore/thread_.h \
+  MagickCore/thread-private.h \
+  MagickCore/timer.c \
+  MagickCore/timer.h \
+  MagickCore/timer-private.h \
+  MagickCore/token.c \
+  MagickCore/token.h \
+  MagickCore/token-private.h \
+  MagickCore/transform.c \
+  MagickCore/transform.h \
+  MagickCore/threshold.c \
+  MagickCore/threshold.h \
+  MagickCore/type.c \
+  MagickCore/type.h \
+  MagickCore/utility.c \
+  MagickCore/utility.h \
+  MagickCore/utility-private.h \
+  MagickCore/version.c \
+  MagickCore/version.h \
+  MagickCore/version-private.h \
+  MagickCore/vision.c \
+  MagickCore/vision.h \
+  MagickCore/widget.c \
+  MagickCore/widget.h \
+  MagickCore/widget-private.h \
+  MagickCore/xml-tree.c \
+  MagickCore/xml-tree.h \
+  MagickCore/xml-tree-private.h \
+  MagickCore/xwindow.c \
+  MagickCore/xwindow.h
 
 if WIN32_NATIVE_BUILD
 MAGICKCORE_PLATFORM_SRCS = \
@@ -314,179 +316,188 @@
 endif # if WIN32_NATIVE_BUILD
 
 MAGICKCORE_INCLUDE_HDRS = \
-	MagickCore/MagickCore.h \
-	MagickCore/animate.h \
-	MagickCore/annotate.h \
-	MagickCore/artifact.h \
-	MagickCore/attribute.h \
-	MagickCore/blob.h \
-	MagickCore/cache.h \
-	MagickCore/cache-view.h \
-	MagickCore/channel.h \
-	MagickCore/cipher.h \
-	MagickCore/client.h \
-	MagickCore/coder.h \
-	MagickCore/color.h \
-	MagickCore/colormap.h \
-	MagickCore/colorspace.h \
-	MagickCore/compare.h \
-	MagickCore/composite.h \
-	MagickCore/compress.h \
-	MagickCore/configure.h \
-	MagickCore/constitute.h \
-	MagickCore/decorate.h \
-	MagickCore/delegate.h \
-	MagickCore/deprecate.h \
-	MagickCore/display.h \
-	MagickCore/distort.h \
-	MagickCore/distribute-cache.h \
-	MagickCore/draw.h \
-	MagickCore/effect.h \
-	MagickCore/enhance.h \
-	MagickCore/exception.h \
-	MagickCore/feature.h \
-	MagickCore/fourier.h \
-	MagickCore/fx.h \
-	MagickCore/gem.h \
-	MagickCore/geometry.h \
-	MagickCore/histogram.h \
-	MagickCore/identify.h \
-	MagickCore/image.h \
-	MagickCore/image-view.h \
-	MagickCore/layer.h \
-	MagickCore/linked-list.h \
-	MagickCore/list.h \
-	MagickCore/locale_.h \
-	MagickCore/log.h \
-	MagickCore/magic.h \
-	MagickCore/magick.h \
-	MagickCore/magick-config.h \
-	MagickCore/magick-type.h \
-	MagickCore/matrix.h \
-	MagickCore/memory_.h \
-	MagickCore/method-attribute.h \
-	MagickCore/methods.h \
-	MagickCore/mime.h \
-	MagickCore/module.h \
-	MagickCore/monitor.h \
-	MagickCore/montage.h \
-	MagickCore/morphology.h \
-	MagickCore/nt-base.h \
-	MagickCore/opencl.h \
-	MagickCore/option.h \
-	MagickCore/paint.h \
-	MagickCore/pixel.h \
-	MagickCore/pixel-accessor.h \
-	MagickCore/policy.h \
-	MagickCore/prepress.h \
-	MagickCore/profile.h \
-	MagickCore/property.h \
-	MagickCore/quantize.h \
-	MagickCore/quantum.h \
-	MagickCore/random_.h \
-	MagickCore/registry.h \
-	MagickCore/resample.h \
-	MagickCore/resize.h \
-	MagickCore/resource_.h \
-	MagickCore/segment.h \
-	MagickCore/semaphore.h \
-	MagickCore/shear.h \
-	MagickCore/signature.h \
-	MagickCore/splay-tree.h \
-	MagickCore/static.h \
-	MagickCore/statistic.h \
-	MagickCore/stream.h \
-	MagickCore/string_.h \
-	MagickCore/studio.h \
-	MagickCore/timer.h \
-	MagickCore/token.h \
-	MagickCore/transform.h \
-	MagickCore/threshold.h \
-	MagickCore/type.h \
-	MagickCore/utility.h \
-	MagickCore/version.h \
-	MagickCore/vision.h \
-	MagickCore/widget.h \
-	MagickCore/xml-tree.h \
-	MagickCore/xwindow.h
+  MagickCore/MagickCore.h \
+  MagickCore/animate.h \
+  MagickCore/annotate.h \
+  MagickCore/artifact.h \
+  MagickCore/attribute.h \
+  MagickCore/blob.h \
+  MagickCore/cache.h \
+  MagickCore/cache-view.h \
+  MagickCore/channel.h \
+  MagickCore/cipher.h \
+  MagickCore/client.h \
+  MagickCore/coder.h \
+  MagickCore/color.h \
+  MagickCore/colormap.h \
+  MagickCore/colorspace.h \
+  MagickCore/compare.h \
+  MagickCore/composite.h \
+  MagickCore/compress.h \
+  MagickCore/configure.h \
+  MagickCore/constitute.h \
+  MagickCore/decorate.h \
+  MagickCore/delegate.h \
+  MagickCore/deprecate.h \
+  MagickCore/display.h \
+  MagickCore/distort.h \
+  MagickCore/distribute-cache.h \
+  MagickCore/draw.h \
+  MagickCore/effect.h \
+  MagickCore/enhance.h \
+  MagickCore/exception.h \
+  MagickCore/feature.h \
+  MagickCore/fourier.h \
+  MagickCore/fx.h \
+  MagickCore/gem.h \
+  MagickCore/geometry.h \
+  MagickCore/histogram.h \
+  MagickCore/identify.h \
+  MagickCore/image.h \
+  MagickCore/image-view.h \
+  MagickCore/layer.h \
+  MagickCore/linked-list.h \
+  MagickCore/list.h \
+  MagickCore/locale_.h \
+  MagickCore/log.h \
+  MagickCore/magic.h \
+  MagickCore/magick.h \
+  MagickCore/magick-config.h \
+  MagickCore/magick-type.h \
+  MagickCore/matrix.h \
+  MagickCore/memory_.h \
+  MagickCore/method-attribute.h \
+  MagickCore/methods.h \
+  MagickCore/mime.h \
+  MagickCore/module.h \
+  MagickCore/monitor.h \
+  MagickCore/montage.h \
+  MagickCore/morphology.h \
+  MagickCore/nt-base.h \
+  MagickCore/opencl.h \
+  MagickCore/option.h \
+  MagickCore/paint.h \
+  MagickCore/pixel.h \
+  MagickCore/pixel-accessor.h \
+  MagickCore/policy.h \
+  MagickCore/prepress.h \
+  MagickCore/profile.h \
+  MagickCore/property.h \
+  MagickCore/quantize.h \
+  MagickCore/quantum.h \
+  MagickCore/random_.h \
+  MagickCore/registry.h \
+  MagickCore/resample.h \
+  MagickCore/resize.h \
+  MagickCore/resource_.h \
+  MagickCore/segment.h \
+  MagickCore/semaphore.h \
+  MagickCore/shear.h \
+  MagickCore/signature.h \
+  MagickCore/splay-tree.h \
+  MagickCore/static.h \
+  MagickCore/statistic.h \
+  MagickCore/stream.h \
+  MagickCore/string_.h \
+  MagickCore/studio.h \
+  MagickCore/timer.h \
+  MagickCore/token.h \
+  MagickCore/transform.h \
+  MagickCore/threshold.h \
+  MagickCore/type.h \
+  MagickCore/utility.h \
+  MagickCore/version.h \
+  MagickCore/vision.h \
+  MagickCore/widget.h \
+  MagickCore/xml-tree.h \
+  MagickCore/xwindow.h
 
 MAGICKCORE_NOINST_HDRS = \
-	MagickCore/accelerate-private.h \
-	MagickCore/accelerate-kernels-private.h \
-	MagickCore/animate-private.h \
-	MagickCore/annotate-private.h \
-	MagickCore/blob-private.h \
- 	MagickCore/cache-private.h \
-	MagickCore/cache-private.h \
- 	MagickCore/coder-private.h \
-	MagickCore/colormap-private.h \
- 	MagickCore/color-private.h \
-	MagickCore/color-private.h \
-	MagickCore/colorspace-private.h \
-	MagickCore/composite-private.h \
- 	MagickCore/configure-private.h \
- 	MagickCore/constitute-private.h \
- 	MagickCore/delegate-private.h \
-	MagickCore/delegate-private.h \
-	MagickCore/display-private.h \
-	MagickCore/distribute-cache-private.h \
-	MagickCore/draw-private.h \
-	MagickCore/exception-private.h \
-	MagickCore/fx-private.h \
-	MagickCore/gem-private.h \
-	MagickCore/image-private.h \
- 	MagickCore/locale-private.h \
- 	MagickCore/log-private.h \
- 	MagickCore/magick-private.h \
- 	MagickCore/magic-private.h \
-	MagickCore/matrix-private.h \
-	MagickCore/memory-private.h \
- 	MagickCore/methods-private.h \
- 	MagickCore/mime-private.h \
-	MagickCore/mime-private.h \
- 	MagickCore/module-private.h \
-	MagickCore/monitor-private.h \
-	MagickCore/morphology-private.h \
-	MagickCore/nt-base.h \
-	MagickCore/nt-feature.h \
-	MagickCore/opencl-private.h \
-	MagickCore/option-private.h \
- 	MagickCore/pixel-private.h \
- 	MagickCore/policy-private.h \
- 	MagickCore/profile-private.h \
-	MagickCore/quantum-private.h \
- 	MagickCore/random_-private.h \
-	MagickCore/random-private.h \
- 	MagickCore/registry-private.h \
-	MagickCore/resample-private.h \
-	MagickCore/resize-private.h \
- 	MagickCore/resource-private.h \
-	MagickCore/resource-private.h \
- 	MagickCore/semaphore-private.h \
-	MagickCore/semaphore-private.h \
-	MagickCore/signature-private.h \
-	MagickCore/stream-private.h \
-	MagickCore/string-private.h \
-	MagickCore/thread_.h \
-	MagickCore/thread-private.h \
- 	MagickCore/timer-private.h \
-	MagickCore/token-private.h \
-	MagickCore/transform-private.h \
- 	MagickCore/type-private.h \
-	MagickCore/utility-private.h \
-	MagickCore/version-private.h \
- 	MagickCore/widget-private.h \
-	MagickCore/xml-tree-private.h \
-	MagickCore/xwindow-private.h
+  MagickCore/accelerate-private.h \
+  MagickCore/accelerate-kernels-private.h \
+  MagickCore/animate-private.h \
+  MagickCore/annotate-private.h \
+  MagickCore/blob-private.h \
+  MagickCore/cache-private.h \
+  MagickCore/cache-private.h \
+  MagickCore/coder-private.h \
+  MagickCore/colormap-private.h \
+  MagickCore/color-private.h \
+  MagickCore/color-private.h \
+  MagickCore/colorspace-private.h \
+  MagickCore/composite-private.h \
+  MagickCore/configure-private.h \
+  MagickCore/constitute-private.h \
+  MagickCore/delegate-private.h \
+  MagickCore/delegate-private.h \
+  MagickCore/display-private.h \
+  MagickCore/distribute-cache-private.h \
+  MagickCore/draw-private.h \
+  MagickCore/exception-private.h \
+  MagickCore/fx-private.h \
+  MagickCore/gem-private.h \
+  MagickCore/image-private.h \
+  MagickCore/locale-private.h \
+  MagickCore/log-private.h \
+  MagickCore/magick-private.h \
+  MagickCore/magic-private.h \
+  MagickCore/matrix-private.h \
+  MagickCore/memory-private.h \
+  MagickCore/methods-private.h \
+  MagickCore/mime-private.h \
+  MagickCore/mime-private.h \
+  MagickCore/module-private.h \
+  MagickCore/monitor-private.h \
+  MagickCore/morphology-private.h \
+  MagickCore/nt-base.h \
+  MagickCore/nt-feature.h \
+  MagickCore/opencl-private.h \
+  MagickCore/option-private.h \
+  MagickCore/pixel-private.h \
+  MagickCore/policy-private.h \
+  MagickCore/profile-private.h \
+  MagickCore/quantum-private.h \
+  MagickCore/random_-private.h \
+  MagickCore/random-private.h \
+  MagickCore/registry-private.h \
+  MagickCore/resample-private.h \
+  MagickCore/resize-private.h \
+  MagickCore/resource-private.h \
+  MagickCore/resource-private.h \
+  MagickCore/semaphore-private.h \
+  MagickCore/semaphore-private.h \
+  MagickCore/signature-private.h \
+  MagickCore/stream-private.h \
+  MagickCore/string-private.h \
+  MagickCore/thread_.h \
+  MagickCore/thread-private.h \
+  MagickCore/timer-private.h \
+  MagickCore/token-private.h \
+  MagickCore/transform-private.h \
+  MagickCore/type-private.h \
+  MagickCore/utility-private.h \
+  MagickCore/version-private.h \
+  MagickCore/widget-private.h \
+  MagickCore/xml-tree-private.h \
+  MagickCore/xwindow-private.h
 
 MAGICKCORE_INCLUDEARCH_HDRS = \
-	MagickCore/magick-baseconfig.h
+  MagickCore/magick-baseconfig.h
 
 MAGICKCORE_EXTRA_DIST = \
-	MagickCore/MagickCore-config.in \
-	$(MAGICKCORE_MANS) \
-	MagickCore/ImageMagick.pc.in \
-	MagickCore/MagickCore.pc.in \
-	MagickCore/libMagickCore.map \
-	MagickCore/nt-base.c \
-	MagickCore/nt-feature.c
+  MagickCore/MagickCore-config.in \
+  $(MAGICKCORE_MANS) \
+  MagickCore/ImageMagick.pc.in \
+  MagickCore/MagickCore.pc.in \
+  MagickCore/libMagickCore.map \
+  MagickCore/nt-base.c \
+  MagickCore/nt-feature.c
+
+if MAGICKCORE_ZERO_CONFIGURATION_SUPPORT
+libMagickCore_threshold_target = MagickCore/libMagickCore_@MAGICK_MAJOR_VERSION@_@MAGICK_ABI_SUFFIX@_la-threshold.lo
+$(libMagickCore_threshold_target): MagickCore/threshold-map.h
+nodist_MagickCore_libMagickCore_@MAGICK_MAJOR_VERSION@_@MAGICK_ABI_SUFFIX@_la_SOURCES += MagickCore/threshold-map.h
+CLEANFILES += MagickCore/threshold-map.h
+MagickCore/threshold-map.h: config/thresholds.xml Makefile
+	$(AM_V_GEN){ printf '%s\n  %s=\n' 'static const char *const' BuiltinMap; sed -e 's/"/\\"/g; s/^.*$$/    "&\\n"/; $$s/$$/;/' $<; } >$@
+endif

MagickWand/Makefile.am

diff --git a/MagickWand/Makefile.am b/MagickWand/Makefile.am
index d25456b..fb75e96 100644
--- a/MagickWand/Makefile.am
+++ b/MagickWand/Makefile.am
@@ -20,112 +20,112 @@
 MAGICKWAND_CPPFLAGS = $(AM_CPPFLAGS)
 
 MAGICKWAND_SOURCES = \
-	MagickWand/MagickWand.h \
-	MagickWand/animate.c \
-	MagickWand/animate.h \
-	MagickWand/compare.c \
-	MagickWand/compare.h \
-	MagickWand/composite.c \
-	MagickWand/composite.h \
-	MagickWand/conjure.c \
-	MagickWand/conjure.h \
-	MagickWand/convert.c \
-	MagickWand/convert.h \
-	MagickWand/deprecate.h \
-	MagickWand/deprecate.c \
-	MagickWand/display.c \
-	MagickWand/display.h \
-	MagickWand/drawing-wand.c \
-	MagickWand/drawing-wand.h \
-	MagickWand/identify.c \
-	MagickWand/identify.h \
-	MagickWand/import.c \
-	MagickWand/import.h \
-	MagickWand/magick-cli.c \
-	MagickWand/magick-cli.h \
-	MagickWand/magick-image.c \
-	MagickWand/magick-image.h \
-	MagickWand/magick-property.c \
-	MagickWand/magick-property.h \
-	MagickWand/magick-wand.c \
-	MagickWand/magick-wand-private.h \
-	MagickWand/method-attribute.h \
-	MagickWand/mogrify.c \
-	MagickWand/mogrify.h \
-	MagickWand/mogrify-private.h \
-	MagickWand/montage.c \
-	MagickWand/montage.h \
-	MagickWand/operation.c \
-	MagickWand/operation.h \
-	MagickWand/operation-private.h \
-	MagickWand/pixel-iterator.c \
-	MagickWand/pixel-iterator.h \
-	MagickWand/pixel-wand.c \
-	MagickWand/pixel-wand.h \
-	MagickWand/pixel-wand-private.h \
-	MagickWand/script-token.c \
-	MagickWand/script-token.h \
-	MagickWand/stream.c \
-	MagickWand/stream.h \
-	MagickWand/studio.h \
-	MagickWand/wand.c \
-	MagickWand/wand.h \
-	MagickWand/wandcli.c \
-	MagickWand/wandcli.h \
-	MagickWand/wandcli-private.h \
-	MagickWand/wand-view.c \
-	MagickWand/wand-view.h 
+  MagickWand/MagickWand.h \
+  MagickWand/animate.c \
+  MagickWand/animate.h \
+  MagickWand/compare.c \
+  MagickWand/compare.h \
+  MagickWand/composite.c \
+  MagickWand/composite.h \
+  MagickWand/conjure.c \
+  MagickWand/conjure.h \
+  MagickWand/convert.c \
+  MagickWand/convert.h \
+  MagickWand/deprecate.h \
+  MagickWand/deprecate.c \
+  MagickWand/display.c \
+  MagickWand/display.h \
+  MagickWand/drawing-wand.c \
+  MagickWand/drawing-wand.h \
+  MagickWand/identify.c \
+  MagickWand/identify.h \
+  MagickWand/import.c \
+  MagickWand/import.h \
+  MagickWand/magick-cli.c \
+  MagickWand/magick-cli.h \
+  MagickWand/magick-image.c \
+  MagickWand/magick-image.h \
+  MagickWand/magick-property.c \
+  MagickWand/magick-property.h \
+  MagickWand/magick-wand.c \
+  MagickWand/magick-wand-private.h \
+  MagickWand/method-attribute.h \
+  MagickWand/mogrify.c \
+  MagickWand/mogrify.h \
+  MagickWand/mogrify-private.h \
+  MagickWand/montage.c \
+  MagickWand/montage.h \
+  MagickWand/operation.c \
+  MagickWand/operation.h \
+  MagickWand/operation-private.h \
+  MagickWand/pixel-iterator.c \
+  MagickWand/pixel-iterator.h \
+  MagickWand/pixel-wand.c \
+  MagickWand/pixel-wand.h \
+  MagickWand/pixel-wand-private.h \
+  MagickWand/script-token.c \
+  MagickWand/script-token.h \
+  MagickWand/stream.c \
+  MagickWand/stream.h \
+  MagickWand/studio.h \
+  MagickWand/wand.c \
+  MagickWand/wand.h \
+  MagickWand/wandcli.c \
+  MagickWand/wandcli.h \
+  MagickWand/wandcli-private.h \
+  MagickWand/wand-view.c \
+  MagickWand/wand-view.h
 
 MAGICKWAND_INCLUDE_HDRS = \
-	MagickWand/MagickWand.h \
-	MagickWand/animate.h \
-	MagickWand/compare.h \
-	MagickWand/composite.h \
-	MagickWand/conjure.h \
-	MagickWand/convert.h \
-	MagickWand/deprecate.h \
-	MagickWand/display.h \
-	MagickWand/drawing-wand.h \
-	MagickWand/identify.h \
-	MagickWand/import.h \
-	MagickWand/magick-cli.h \
-	MagickWand/magick-image.h \
-	MagickWand/magick-property.h \
-	MagickWand/method-attribute.h \
-	MagickWand/mogrify.h \
-	MagickWand/montage.h \
-	MagickWand/operation.h \
-	MagickWand/pixel-iterator.h \
-	MagickWand/pixel-wand.h \
-	MagickWand/stream.h \
-	MagickWand/wandcli.h \
-	MagickWand/wand-view.h
+  MagickWand/MagickWand.h \
+  MagickWand/animate.h \
+  MagickWand/compare.h \
+  MagickWand/composite.h \
+  MagickWand/conjure.h \
+  MagickWand/convert.h \
+  MagickWand/deprecate.h \
+  MagickWand/display.h \
+  MagickWand/drawing-wand.h \
+  MagickWand/identify.h \
+  MagickWand/import.h \
+  MagickWand/magick-cli.h \
+  MagickWand/magick-image.h \
+  MagickWand/magick-property.h \
+  MagickWand/method-attribute.h \
+  MagickWand/mogrify.h \
+  MagickWand/montage.h \
+  MagickWand/operation.h \
+  MagickWand/pixel-iterator.h \
+  MagickWand/pixel-wand.h \
+  MagickWand/stream.h \
+  MagickWand/wandcli.h \
+  MagickWand/wand-view.h
 
 MAGICKWAND_NOINST_HDRS = \
-	MagickWand/mogrify-private.h \
-	MagickWand/magick-wand-private.h \
-	MagickWand/operation-private.h \
-	MagickWand/pixel-wand-private.h \
-	MagickWand/script-token.h \
-	MagickWand/studio.h \
-	MagickWand/wand.h \
-	MagickWand/wandcli-private.h
+  MagickWand/mogrify-private.h \
+  MagickWand/magick-wand-private.h \
+  MagickWand/operation-private.h \
+  MagickWand/pixel-wand-private.h \
+  MagickWand/script-token.h \
+  MagickWand/studio.h \
+  MagickWand/wand.h \
+  MagickWand/wandcli-private.h
 
 # Headers which are installed
 MagickWandinc_HEADERS = \
-	$(MAGICKWAND_INCLUDE_HDRS)
+  $(MAGICKWAND_INCLUDE_HDRS)
 
 MAGICKWAND_BIN_SCRPTS = \
-	MagickWand/MagickWand-config
+  MagickWand/MagickWand-config
 
 MAGICKWAND_PKGCONFIG = \
-	MagickWand/MagickWand.pc \
-	MagickWand/MagickWand-@MAGICK_MAJOR_VERSION@.@MAGICK_ABI_SUFFIX@.pc
+  MagickWand/MagickWand.pc \
+  MagickWand/MagickWand-@MAGICK_MAJOR_VERSION@.@MAGICK_ABI_SUFFIX@.pc
 
 MAGICKWAND_MANS = \
-	MagickWand/MagickWand-config.1
+  MagickWand/MagickWand-config.1
 
-MAGICKWAND_BUILT_SRCS = 
+MAGICKWAND_BUILT_SRCS =
 
 MAGICKWAND_LIBS = MagickWand/libMagickWand-@MAGICK_MAJOR_VERSION@.@MAGICK_ABI_SUFFIX@.la
 
@@ -140,14 +140,14 @@
 
 MagickWand_libMagickWand_@MAGICK_MAJOR_VERSION@_@MAGICK_ABI_SUFFIX@_la_LDFLAGS = -no-undefined \
   $(MagickWand_libMagickWand_@MAGICK_MAJOR_VERSION@_@MAGICK_ABI_SUFFIX@_la_LDFLAGS_VERSION) $(MAGICK_LT_RELEASE_OPTS) \
-	-version-info \
-	$(MAGICK_LIBRARY_CURRENT):$(MAGICK_LIBRARY_REVISION):$(MAGICK_LIBRARY_AGE)
+  -version-info \
+  $(MAGICK_LIBRARY_CURRENT):$(MAGICK_LIBRARY_REVISION):$(MAGICK_LIBRARY_AGE)
 MagickWand_libMagickWand_@MAGICK_MAJOR_VERSION@_@MAGICK_ABI_SUFFIX@_la_LIBADD = $(MAGICKCORE_LIBS) $(X11_LIBS) $(GOMP_LIBS) $(MATH_LIBS)
 
 MAGICKWAND_EXTRA_DIST = \
-	MagickWand/ChangeLog \
-	MagickWand/libMagickWand.map \
-	MagickWand/MagickWand-config.1 \
-	MagickWand/MagickWand.pc.in
+  MagickWand/ChangeLog \
+  MagickWand/libMagickWand.map \
+  MagickWand/MagickWand-config.1 \
+  MagickWand/MagickWand.pc.in
 
 MAGICKWAND_CLEANFILES =

Makefile.am

diff --git a/Makefile.am b/Makefile.am
index a448c5e..0a79c7d 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -36,27 +36,27 @@
 
 ## Make sure these will be cleaned even when they're not built by default.
 CLEANFILES = \
-	$(MAGICKWAND_CLEANFILES) \
-	$(MAGICKPP_CLEANFILES) \
-	$(UTILITIES_CLEANFILES) \
-	$(TESTS_CLEANFILES)
+  $(MAGICKWAND_CLEANFILES) \
+  $(MAGICKPP_CLEANFILES) \
+  $(UTILITIES_CLEANFILES) \
+  $(TESTS_CLEANFILES)
 
 bin_PROGRAMS = \
-	$(UTILITIES_PGMS)
+  $(UTILITIES_PGMS)
 
 # Binary scripts
 bin_SCRIPTS = \
-	$(MAGICKCORE_BIN_SCRPTS) \
-	$(MAGICKWAND_BIN_SCRPTS) \
-	$(MAGICKPP_SCRPTS)
+  $(MAGICKCORE_BIN_SCRPTS) \
+  $(MAGICKWAND_BIN_SCRPTS) \
+  $(MAGICKPP_SCRPTS)
 
 include_HEADERS =
 
 # Headers which are not installed but which are distributed
 noinst_HEADERS = \
-	$(MAGICKCORE_NOINST_HDRS) \
-	$(MAGICKWAND_NOINST_HDRS) \
-	$(CODERS_NOINST_HDRS)
+  $(MAGICKCORE_NOINST_HDRS) \
+  $(MAGICKWAND_NOINST_HDRS) \
+  $(CODERS_NOINST_HDRS)
 
 if WIN32_NATIVE_BUILD
 SRCDIR='$(shell @WinPathScript@ $(srcdir)/)'
@@ -74,55 +74,54 @@
 TEST_EXTENSIONS = .sh .tap
 
 TAP_LOG_DRIVER = env AM_TAP_AWK='$(AWK)' $(SHELL) \
-	$(top_srcdir)/config/tap-driver.sh
+  $(top_srcdir)/config/tap-driver.sh
 
 # Environment parameters to be used during tests
 TESTS_ENVIRONMENT = \
-	MAKE="$(MAKE)" \
-	MAKEFLAGS="$(MAKEFLAGS)" \
-	MEMCHECK="$(MEMCHECK)"
+  MAKE="$(MAKE)" \
+  MAKEFLAGS="$(MAKEFLAGS)" \
+  MEMCHECK="$(MEMCHECK)"
 
 # Tests to run
 TESTS = \
-	$(TESTS_TESTS) \
-	$(MAGICKPP_TESTS) \
-	$(MAGICKWAND_TESTS) \
-	$(UTILITIES_TESTS)
+  $(TESTS_TESTS) \
+  $(MAGICKPP_TESTS) \
+  $(MAGICKWAND_TESTS) \
+  $(UTILITIES_TESTS)
 
 # Tests which are expected to fail
 XFAIL_TESTS = \
-	$(TESTS_XFAIL_TESTS) \
-	$(UTILITIES_XFAIL_TESTS)
+  $(TESTS_XFAIL_TESTS) \
+  $(UTILITIES_XFAIL_TESTS)
 
 TOP_EXTRA_DIST = \
   AUTHORS.txt \
-	ChangeLog \
-	LICENSE \
-	QuickStart.txt \
-	NOTICE \
-	Install-mac.txt \
-	Install-unix.txt \
-	Install-vms.txt \
-	Install-windows.txt \
-	magick.sh.in \
-	Magickshr.opt \
-	NEWS.txt \
-	Platforms.txt \
-	README.txt \
-	index.html \
-	gitversion.sh \
-	version.sh \
-	winpath.sh
+  ChangeLog \
+  LICENSE \
+  QuickStart.txt \
+  NOTICE \
+  Install-mac.txt \
+  Install-unix.txt \
+  Install-vms.txt \
+  Install-windows.txt \
+  magick.sh.in \
+  Magickshr.opt \
+  NEWS.txt \
+  Platforms.txt \
+  README.txt \
+  index.html \
+  version.sh \
+  winpath.sh
 
 # Additional files to distribute
 EXTRA_DIST = \
-	$(TOP_EXTRA_DIST) \
-	$(CONFIG_EXTRA_DIST) \
-	$(MAGICKCORE_EXTRA_DIST) \
-	$(MAGICKWAND_EXTRA_DIST) \
-	$(MAGICKPP_EXTRA_DIST) \
-	$(UTILITIES_EXTRA_DIST) \
-	$(TESTS_EXTRA_DIST)
+  $(TOP_EXTRA_DIST) \
+  $(CONFIG_EXTRA_DIST) \
+  $(MAGICKCORE_EXTRA_DIST) \
+  $(MAGICKWAND_EXTRA_DIST) \
+  $(MAGICKPP_EXTRA_DIST) \
+  $(UTILITIES_EXTRA_DIST) \
+  $(TESTS_EXTRA_DIST)
 
 lib_LTLIBRARIES = $(MAGICKCORE_LIBS) $(MAGICKWAND_LIBS) $(MAGICKPP_LIBS)
 AM_LDFLAGS =
@@ -132,9 +131,9 @@
 MOSTLYCLEANFILES =
 
 check_PROGRAMS = \
-	$(TESTS_CHECK_PGRMS) \
-	$(MAGICKPP_CHECK_PGRMS) \
-	$(MAGICKWAND_CHECK_PGRMS)
+  $(TESTS_CHECK_PGRMS) \
+  $(MAGICKPP_CHECK_PGRMS) \
+  $(MAGICKWAND_CHECK_PGRMS)
 
 include m4/Makefile.am
 include config/Makefile.am
@@ -152,9 +151,9 @@
 
 # Files to install in Pkgconfig directory
 pkgconfig_DATA = \
-	$(MAGICKCORE_PKGCONFIG) \
-	$(MAGICKWAND_PKGCONFIG) \
-	$(MAGICKPP_PKGCONFIG)
+  $(MAGICKCORE_PKGCONFIG) \
+  $(MAGICKWAND_PKGCONFIG) \
+  $(MAGICKPP_PKGCONFIG)
 
 # create a copy for pc file (ideally the non abi should be symlinked)
 %-@MAGICK_MAJOR_VERSION@.@MAGICK_ABI_SUFFIX@.pc: %.pc
@@ -166,20 +165,20 @@
 # Manual pages to install
 if INSTALL_DOC#
 man_MANS = \
-	$(MAGICKCORE_MANS) \
-	$(MAGICKWAND_MANS) \
-	$(MAGICKPP_MANS) \
-	$(UTILITIES_MANS)
+  $(MAGICKCORE_MANS) \
+  $(MAGICKWAND_MANS) \
+  $(MAGICKPP_MANS) \
+  $(UTILITIES_MANS)
 
 doc_DATA = \
-	LICENSE \
-	ChangeLog \
-	NEWS.txt
+  LICENSE \
+  ChangeLog \
+  NEWS.txt
 endif
 
 if MAINTAINER_MODE
 MAINTAINER_TARGETS = \
-	magick-version \
+  magick-version \
   ImageMagick.spec \
   $(PERLMAGICK_MAINTAINER_TARGETS)
 endif
@@ -255,9 +254,9 @@
 	@for dir in $(DOCDIRS) ; do \
 	  $(mkinstalldirs) $(DESTDIR)$(pkgdocdir)/$$dir && \
 	  if test -d $(builddir)/$$dir ; then \
-  		docsrcdir=$(builddir)/$$dir; \
+	    docsrcdir=$(builddir)/$$dir; \
 	  else \
-  		docsrcdir=$(srcdir)/$$dir; \
+	    docsrcdir=$(srcdir)/$$dir; \
 	  fi; \
 	  for file in $$docsrcdir/*.* ; do \
 	    echo "$(INSTALL_DATA) $$file $(DESTDIR)$(pkgdocdir)/$$dir" ; \
@@ -280,14 +279,14 @@
 	fi
 	@if test -n "$(VPATH)" ; then \
 	  cmp MagickCore/version.h $(srcdir)/MagickCore/version.h > /dev/null ; \
-          if test $$? -eq 1 ; then \
+	        if test $$? -eq 1 ; then \
 	    echo "Updating $(srcdir)/MagickCore/version.h ..."; \
 	    cp MagickCore/version.h $(srcdir)/MagickCore/version.h ; \
 	  fi ; \
 	fi ; \
 	touch magick-version
 
-${srcdir}/configure: ${srcdir}/version.sh ${srcdir}/gitversion.sh
+${srcdir}/configure: ${srcdir}/version.sh
 
 # Automagically reconfigure libtool
 LIBTOOL_DEPS = @LIBTOOL_DEPS@
@@ -363,14 +362,14 @@
 RPMARCH=$(MAGICK_TARGET_CPU)
 
 DIST_ARCHIVE_RPM= \
-	$(RPMDIR)/$(RPMARCH)/$(PACKAGE_NAME)-$(PACKAGE_VERSION)$(PACKAGE_VERSION_ADDENDUM)-$(PACKAGE_RELEASE).$(RPMARCH).rpm \
-	$(RPMDIR)/$(RPMARCH)/$(PACKAGE_NAME)-c++-$(PACKAGE_VERSION)$(PACKAGE_VERSION_ADDENDUM)-$(PACKAGE_RELEASE).$(RPMARCH).rpm \
-	$(RPMDIR)/$(RPMARCH)/$(PACKAGE_NAME)-c++-devel-$(PACKAGE_VERSION)$(PACKAGE_VERSION_ADDENDUM)-$(PACKAGE_RELEASE).$(RPMARCH).rpm \
-	$(RPMDIR)/$(RPMARCH)/$(PACKAGE_NAME)-devel-$(PACKAGE_VERSION)$(PACKAGE_VERSION_ADDENDUM)-$(PACKAGE_RELEASE).$(RPMARCH).rpm \
-	$(RPMDIR)/$(RPMARCH)/$(PACKAGE_NAME)-perl-$(PACKAGE_VERSION)$(PACKAGE_VERSION_ADDENDUM)-$(PACKAGE_RELEASE).$(RPMARCH).rpm
+  $(RPMDIR)/$(RPMARCH)/$(PACKAGE_NAME)-$(PACKAGE_VERSION)$(PACKAGE_VERSION_ADDENDUM)-$(PACKAGE_RELEASE).$(RPMARCH).rpm \
+  $(RPMDIR)/$(RPMARCH)/$(PACKAGE_NAME)-c++-$(PACKAGE_VERSION)$(PACKAGE_VERSION_ADDENDUM)-$(PACKAGE_RELEASE).$(RPMARCH).rpm \
+  $(RPMDIR)/$(RPMARCH)/$(PACKAGE_NAME)-c++-devel-$(PACKAGE_VERSION)$(PACKAGE_VERSION_ADDENDUM)-$(PACKAGE_RELEASE).$(RPMARCH).rpm \
+  $(RPMDIR)/$(RPMARCH)/$(PACKAGE_NAME)-devel-$(PACKAGE_VERSION)$(PACKAGE_VERSION_ADDENDUM)-$(PACKAGE_RELEASE).$(RPMARCH).rpm \
+  $(RPMDIR)/$(RPMARCH)/$(PACKAGE_NAME)-perl-$(PACKAGE_VERSION)$(PACKAGE_VERSION_ADDENDUM)-$(PACKAGE_RELEASE).$(RPMARCH).rpm
 
 .PHONY: rpm
-rpm:	dist
+rpm: dist
 	rm -rf $(RPMDIR)
 	$(mkinstalldirs) $(RPMDIR)
 	$(mkinstalldirs) $(RPMDIR)/BUILD

Makefile.in

diff --git a/Makefile.in b/Makefile.in
index eaa1cde..c836955 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -96,7 +96,7 @@
 #  limitations under the License.
 #
 #  Makefile for building the MagickCore API.
-# 
+#
 
 #  Copyright 1999-2020 ImageMagick Studio LLC, a non-profit organization
 #  dedicated to making software imaging solutions freely available.
@@ -256,6 +256,8 @@
 TESTS = $(TESTS_TESTS) $(am__EXEEXT_5)
 XFAIL_TESTS = $(am__EXEEXT_6) $(am__EXEEXT_6)
 check_PROGRAMS = $(am__EXEEXT_2) $(am__EXEEXT_4)
+@MAGICKCORE_ZERO_CONFIGURATION_SUPPORT_TRUE@am__append_1 = MagickCore/threshold-map.h
+@MAGICKCORE_ZERO_CONFIGURATION_SUPPORT_TRUE@am__append_2 = MagickCore/threshold-map.h
 subdir = .
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/m4/ac_func_fseeko.m4 \
@@ -826,7 +828,11 @@
 @WITH_MODULES_FALSE@	$(am__objects_19) $(am__objects_20)
 @WITH_MODULES_TRUE@am_MagickCore_libMagickCore_@MAGICK_MAJOR_VERSION@_@MAGICK_ABI_SUFFIX@_la_OBJECTS =  \
 @WITH_MODULES_TRUE@	$(am__objects_1) $(am__objects_2)
-MagickCore_libMagickCore_@MAGICK_MAJOR_VERSION@_@MAGICK_ABI_SUFFIX@_la_OBJECTS = $(am_MagickCore_libMagickCore_@MAGICK_MAJOR_VERSION@_@MAGICK_ABI_SUFFIX@_la_OBJECTS)
+am__objects_21 =
+nodist_MagickCore_libMagickCore_@MAGICK_MAJOR_VERSION@_@MAGICK_ABI_SUFFIX@_la_OBJECTS =  \
+	$(am__objects_21)
+MagickCore_libMagickCore_@MAGICK_MAJOR_VERSION@_@MAGICK_ABI_SUFFIX@_la_OBJECTS = $(am_MagickCore_libMagickCore_@MAGICK_MAJOR_VERSION@_@MAGICK_ABI_SUFFIX@_la_OBJECTS) \
+	$(nodist_MagickCore_libMagickCore_@MAGICK_MAJOR_VERSION@_@MAGICK_ABI_SUFFIX@_la_OBJECTS)
 MagickCore_libMagickCore_@MAGICK_MAJOR_VERSION@_@MAGICK_ABI_SUFFIX@_la_LINK =  \
 	$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
 	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
@@ -835,7 +841,7 @@
 MagickWand_libMagickWand_@MAGICK_MAJOR_VERSION@_@MAGICK_ABI_SUFFIX@_la_DEPENDENCIES =  \
 	$(MAGICKCORE_LIBS) $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
 	$(am__DEPENDENCIES_1)
-am__objects_21 = MagickWand/libMagickWand_@MAGICK_MAJOR_VERSION@_@MAGICK_ABI_SUFFIX@_la-animate.lo \
+am__objects_22 = MagickWand/libMagickWand_@MAGICK_MAJOR_VERSION@_@MAGICK_ABI_SUFFIX@_la-animate.lo \
 	MagickWand/libMagickWand_@MAGICK_MAJOR_VERSION@_@MAGICK_ABI_SUFFIX@_la-compare.lo \
 	MagickWand/libMagickWand_@MAGICK_MAJOR_VERSION@_@MAGICK_ABI_SUFFIX@_la-composite.lo \
 	MagickWand/libMagickWand_@MAGICK_MAJOR_VERSION@_@MAGICK_ABI_SUFFIX@_la-conjure.lo \
@@ -860,7 +866,7 @@
 	MagickWand/libMagickWand_@MAGICK_MAJOR_VERSION@_@MAGICK_ABI_SUFFIX@_la-wandcli.lo \
 	MagickWand/libMagickWand_@MAGICK_MAJOR_VERSION@_@MAGICK_ABI_SUFFIX@_la-wand-view.lo
 am_MagickWand_libMagickWand_@MAGICK_MAJOR_VERSION@_@MAGICK_ABI_SUFFIX@_la_OBJECTS =  \
-	$(am__objects_21)
+	$(am__objects_22)
 MagickWand_libMagickWand_@MAGICK_MAJOR_VERSION@_@MAGICK_ABI_SUFFIX@_la_OBJECTS = $(am_MagickWand_libMagickWand_@MAGICK_MAJOR_VERSION@_@MAGICK_ABI_SUFFIX@_la_OBJECTS)
 MagickWand_libMagickWand_@MAGICK_MAJOR_VERSION@_@MAGICK_ABI_SUFFIX@_la_LINK =  \
 	$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
@@ -2516,6 +2522,7 @@
 am__v_CXXLD_1 = 
 SOURCES = $(Magick___lib_libMagick___@MAGICK_MAJOR_VERSION@_@MAGICK_ABI_SUFFIX@_la_SOURCES) \
 	$(MagickCore_libMagickCore_@MAGICK_MAJOR_VERSION@_@MAGICK_ABI_SUFFIX@_la_SOURCES) \
+	$(nodist_MagickCore_libMagickCore_@MAGICK_MAJOR_VERSION@_@MAGICK_ABI_SUFFIX@_la_SOURCES) \
 	$(MagickWand_libMagickWand_@MAGICK_MAJOR_VERSION@_@MAGICK_ABI_SUFFIX@_la_SOURCES) \
 	$(coders_aai_la_SOURCES) $(coders_art_la_SOURCES) \
 	$(coders_avs_la_SOURCES) $(coders_bgr_la_SOURCES) \
@@ -3104,12 +3111,6 @@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
-INT16_T = @INT16_T@
-INT32_F = @INT32_F@
-INT32_T = @INT32_T@
-INT64_F = @INT64_F@
-INT64_T = @INT64_T@
-INT8_T = @INT8_T@
 JBIG_LIBS = @JBIG_LIBS@
 JEMALLOC_LIBS = @JEMALLOC_LIBS@
 JPEG_LIBS = @JPEG_LIBS@
@@ -3156,6 +3157,7 @@
 LZMA_CFLAGS = @LZMA_CFLAGS@
 LZMA_LIBS = @LZMA_LIBS@
 LaunchDelegate = @LaunchDelegate@
+MAGICKCORE_FREETYPE_DELEGATE = @MAGICKCORE_FREETYPE_DELEGATE@
 MAGICKCORE_PATH = @MAGICKCORE_PATH@
 MAGICKPP_LIBRARY_AGE = @MAGICKPP_LIBRARY_AGE@
 MAGICKPP_LIBRARY_CURRENT = @MAGICKPP_LIBRARY_CURRENT@
@@ -3299,16 +3301,6 @@
 THREAD_LIBS = @THREAD_LIBS@
 TIFF_LIBS = @TIFF_LIBS@
 TraceEncodeDelegate = @TraceEncodeDelegate@
-UINT16_T = @UINT16_T@
-UINT32_F = @UINT32_F@
-UINT32_T = @UINT32_T@
-UINT64_F = @UINT64_F@
-UINT64_T = @UINT64_T@
-UINT8_T = @UINT8_T@
-UINTMAX_F = @UINTMAX_F@
-UINTMAX_T = @UINTMAX_T@
-UINTPTR_F = @UINTPTR_F@
-UINTPTR_T = @UINTPTR_T@
 UMEM_LIBS = @UMEM_LIBS@
 UniconvertorDelegate = @UniconvertorDelegate@
 VERSION = @VERSION@
@@ -3427,26 +3419,22 @@
 # compiler, headers, and libraries are used as for a normal build.
 DISTCHECK_CONFIGURE_FLAGS = $(DISTCHECK_CONFIG_FLAGS)
 DISTCLEANFILES = _configs.sed MagickCore/magick-baseconfig.h
-CLEANFILES = \
-	$(MAGICKWAND_CLEANFILES) \
-	$(MAGICKPP_CLEANFILES) \
-	$(UTILITIES_CLEANFILES) \
-	$(TESTS_CLEANFILES)
-
+CLEANFILES = $(MAGICKWAND_CLEANFILES) $(MAGICKPP_CLEANFILES) \
+	$(UTILITIES_CLEANFILES) $(TESTS_CLEANFILES) $(am__append_2)
 
 # Binary scripts
 bin_SCRIPTS = \
-	$(MAGICKCORE_BIN_SCRPTS) \
-	$(MAGICKWAND_BIN_SCRPTS) \
-	$(MAGICKPP_SCRPTS)
+  $(MAGICKCORE_BIN_SCRPTS) \
+  $(MAGICKWAND_BIN_SCRPTS) \
+  $(MAGICKPP_SCRPTS)
 
 include_HEADERS = 
 
 # Headers which are not installed but which are distributed
 noinst_HEADERS = \
-	$(MAGICKCORE_NOINST_HDRS) \
-	$(MAGICKWAND_NOINST_HDRS) \
-	$(CODERS_NOINST_HDRS)
+  $(MAGICKCORE_NOINST_HDRS) \
+  $(MAGICKWAND_NOINST_HDRS) \
+  $(CODERS_NOINST_HDRS)
 
 @WIN32_NATIVE_BUILD_FALSE@SRCDIR = "$(srcdir)/"
 @WIN32_NATIVE_BUILD_TRUE@SRCDIR = '$(shell @WinPathScript@ $(srcdir)/)'
@@ -3459,45 +3447,44 @@
 # Test extensions
 TEST_EXTENSIONS = .sh .tap
 TAP_LOG_DRIVER = env AM_TAP_AWK='$(AWK)' $(SHELL) \
-	$(top_srcdir)/config/tap-driver.sh
+  $(top_srcdir)/config/tap-driver.sh
 
 
 # Environment parameters to be used during tests
 TESTS_ENVIRONMENT = \
-	MAKE="$(MAKE)" \
-	MAKEFLAGS="$(MAKEFLAGS)" \
-	MEMCHECK="$(MEMCHECK)"
+  MAKE="$(MAKE)" \
+  MAKEFLAGS="$(MAKEFLAGS)" \
+  MEMCHECK="$(MEMCHECK)"
 
 TOP_EXTRA_DIST = \
   AUTHORS.txt \
-	ChangeLog \
-	LICENSE \
-	QuickStart.txt \
-	NOTICE \
-	Install-mac.txt \
-	Install-unix.txt \
-	Install-vms.txt \
-	Install-windows.txt \
-	magick.sh.in \
-	Magickshr.opt \
-	NEWS.txt \
-	Platforms.txt \
-	README.txt \
-	index.html \
-	gitversion.sh \
-	version.sh \
-	winpath.sh
+  ChangeLog \
+  LICENSE \
+  QuickStart.txt \
+  NOTICE \
+  Install-mac.txt \
+  Install-unix.txt \
+  Install-vms.txt \
+  Install-windows.txt \
+  magick.sh.in \
+  Magickshr.opt \
+  NEWS.txt \
+  Platforms.txt \
+  README.txt \
+  index.html \
+  version.sh \
+  winpath.sh
 
 
 # Additional files to distribute
 EXTRA_DIST = \
-	$(TOP_EXTRA_DIST) \
-	$(CONFIG_EXTRA_DIST) \
-	$(MAGICKCORE_EXTRA_DIST) \
-	$(MAGICKWAND_EXTRA_DIST) \
-	$(MAGICKPP_EXTRA_DIST) \
-	$(UTILITIES_EXTRA_DIST) \
-	$(TESTS_EXTRA_DIST)
+  $(TOP_EXTRA_DIST) \
+  $(CONFIG_EXTRA_DIST) \
+  $(MAGICKCORE_EXTRA_DIST) \
+  $(MAGICKWAND_EXTRA_DIST) \
+  $(MAGICKPP_EXTRA_DIST) \
+  $(UTILITIES_EXTRA_DIST) \
+  $(TESTS_EXTRA_DIST)
 
 lib_LTLIBRARIES = $(MAGICKCORE_LIBS) $(MAGICKWAND_LIBS) $(MAGICKPP_LIBS)
 AM_LDFLAGS = 
@@ -3506,91 +3493,91 @@
 BUILT_SOURCES = 
 MOSTLYCLEANFILES = 
 M4_EXTRA_DIST = \
-	ac_func_fseeko.m4  \
-	ax_append_flag.m4  \
-	ax_c___attribute__.m4  \
-	ax_cflags_warn_all.m4  \
-	ax_compare_version.m4  \
-	ax_cxx_bool.m4  \
-	ax_cxx_namespaces.m4  \
-	ax_cxx_namespace_std.m4  \
-	ax_lang_compiler_ms.m4  \
-	ax_opencl.m4  \
-	ax_prefix_config_h.m4  \
-	ax_prog_perl_version.m4  \
-	ax_pthread.m4  \
-	ax_require_defined.m4  \
-	cxx_have_lstring.m4  \
-	cxx_have_std_libs.m4  \
-	framework.m4  \
-	libtool.m4  \
-	lt~obsolete.m4  \
-	ltoptions.m4  \
-	ltsugar.m4  \
-	ltversion.m4  \
-	magick_check_pthread_lib.m4  \
-	pkg.m4  
+  ac_func_fseeko.m4  \
+  ax_append_flag.m4  \
+  ax_c___attribute__.m4  \
+  ax_cflags_warn_all.m4  \
+  ax_compare_version.m4  \
+  ax_cxx_bool.m4  \
+  ax_cxx_namespaces.m4  \
+  ax_cxx_namespace_std.m4  \
+  ax_lang_compiler_ms.m4  \
+  ax_opencl.m4  \
+  ax_prefix_config_h.m4  \
+  ax_prog_perl_version.m4  \
+  ax_pthread.m4  \
+  ax_require_defined.m4  \
+  cxx_have_lstring.m4  \
+  cxx_have_std_libs.m4  \
+  framework.m4  \
+  libtool.m4  \
+  lt~obsolete.m4  \
+  ltoptions.m4  \
+  ltsugar.m4  \
+  ltversion.m4  \
+  magick_check_pthread_lib.m4  \
+  pkg.m4
 
 
 # Where architecture-independent configuration files get installed
 # (share/ImageMagick-version)
 configsharedir = $(SHARE_PATH)
 configshare_DATA = \
-	config/english.xml \
-	config/francais.xml \
-	config/locale.xml
+  config/english.xml \
+  config/francais.xml \
+  config/locale.xml
 
 
 # Where architecture-dependent configuration files get installed
 # (share/arch/ImageMagick-version)
 configsharearchdir = $(SHAREARCH_PATH)
 configsharearch_DATA = \
-	config/configure.xml
+  config/configure.xml
 
 
 # Where architecture-dependent configuration files get installed
 # (share/ImageMagick-version)
 configlibdir = $(CONFIGURE_PATH)
 configlib_DATA = \
-	config/colors.xml \
-	config/delegates.xml \
-	config/log.xml \
-	config/mime.xml \
-	config/policy.xml \
-	config/quantization-table.xml \
-	config/thresholds.xml \
-	config/type.xml \
-	config/type-apple.xml \
-	config/type-dejavu.xml \
-	config/type-ghostscript.xml \
-	config/type-urw-base35.xml \
-	config/type-windows.xml
+  config/colors.xml \
+  config/delegates.xml \
+  config/log.xml \
+  config/mime.xml \
+  config/policy.xml \
+  config/quantization-table.xml \
+  config/thresholds.xml \
+  config/type.xml \
+  config/type-apple.xml \
+  config/type-dejavu.xml \
+  config/type-ghostscript.xml \
+  config/type-urw-base35.xml \
+  config/type-windows.xml
 
 CONFIG_EXTRA_DIST = \
-	config/cmyk.icm \
-	config/colors.xml \
-	config/config.h.in \
-	config/delegates.xml.in \
-	config/english.xml \
-	config/francais.xml \
-	config/ImageMagick.rc \
-	config/ImageMagick.rdf.in \
-	config/install-sh \
-	config/lndir.sh \
-	config/locale.md \
-	config/locale.xml \
-	config/log.xml \
-	config/mime.xml \
-	config/policy.xml \
-	config/quantization-table.xml \
-	config/sRGB.icm \
-	config/thresholds.xml \
-	config/type-apple.xml.in \
-	config/type-dejavu.xml.in \
-	config/type-ghostscript.xml.in \
-	config/type-urw-base35.xml.in \
-	config/type-windows.xml.in \
-	config/type.xml.in
+  config/cmyk.icm \
+  config/colors.xml \
+  config/config.h.in \
+  config/delegates.xml.in \
+  config/english.xml \
+  config/francais.xml \
+  config/ImageMagick.rc \
+  config/ImageMagick.rdf.in \
+  config/install-sh \
+  config/lndir.sh \
+  config/locale.md \
+  config/locale.xml \
+  config/log.xml \
+  config/mime.xml \
+  config/policy.xml \
+  config/quantization-table.xml \
+  config/sRGB.icm \
+  config/thresholds.xml \
+  config/type-apple.xml.in \
+  config/type-dejavu.xml.in \
+  config/type-ghostscript.xml.in \
+  config/type-urw-base35.xml.in \
+  config/type-windows.xml.in \
+  config/type.xml.in
 
 
 # Where coder modules get installed
@@ -4953,19 +4940,19 @@
 
 # Headers which are installed
 MagickCoreinc_HEADERS = \
-	$(MAGICKCORE_INCLUDE_HDRS)
+  $(MAGICKCORE_INCLUDE_HDRS)
 
 MagickCoreincarch_HEADERS = \
-	$(MAGICKCORE_INCLUDEARCH_HDRS)
+  $(MAGICKCORE_INCLUDEARCH_HDRS)
 
 MAGICKCORE_BIN_SCRPTS = \
   MagickCore/MagickCore-config
 
 MAGICKCORE_PKGCONFIG = \
   MagickCore/ImageMagick.pc \
-	MagickCore/MagickCore.pc \
-	MagickCore/ImageMagick-@MAGICK_MAJOR_VERSION@.@MAGICK_ABI_SUFFIX@.pc \
-	MagickCore/MagickCore-@MAGICK_MAJOR_VERSION@.@MAGICK_ABI_SUFFIX@.pc 
+  MagickCore/MagickCore.pc \
+  MagickCore/ImageMagick-@MAGICK_MAJOR_VERSION@.@MAGICK_ABI_SUFFIX@.pc \
+  MagickCore/MagickCore-@MAGICK_MAJOR_VERSION@.@MAGICK_ABI_SUFFIX@.pc
 
 MAGICKCORE_MANS = \
   MagickCore/MagickCore-config.1
@@ -4975,6 +4962,8 @@
 @WITH_MODULES_TRUE@MagickCore_libMagickCore_@MAGICK_MAJOR_VERSION@_@MAGICK_ABI_SUFFIX@_la_SOURCES = $(MAGICKCORE_BASE_SRCS) $(MAGICKCORE_PLATFORM_SRCS)
 @WITH_MODULES_FALSE@MagickCore_libMagickCore_@MAGICK_MAJOR_VERSION@_@MAGICK_ABI_SUFFIX@_la_LIBADD = $(MAGICK_DEP_LIBS)
 @WITH_MODULES_TRUE@MagickCore_libMagickCore_@MAGICK_MAJOR_VERSION@_@MAGICK_ABI_SUFFIX@_la_LIBADD = $(MAGICK_DEP_LIBS)
+nodist_MagickCore_libMagickCore_@MAGICK_MAJOR_VERSION@_@MAGICK_ABI_SUFFIX@_la_SOURCES =  \
+	$(am__append_1)
 MagickCore_libMagickCore_@MAGICK_MAJOR_VERSION@_@MAGICK_ABI_SUFFIX@_la_CPPFLAGS = $(AM_CPPFLAGS) $(LIBRARY_EXTRA_CPPFLAGS)
 @HAVE_LD_VERSION_SCRIPT_FALSE@MagickCore_libMagickCore_@MAGICK_MAJOR_VERSION@_@MAGICK_ABI_SUFFIX@_la_LDFLAGS_VERSION = -export-symbols-regex ".*"
 @HAVE_LD_VERSION_SCRIPT_TRUE@MagickCore_libMagickCore_@MAGICK_MAJOR_VERSION@_@MAGICK_ABI_SUFFIX@_la_LDFLAGS_VERSION = -Wl,--version-script=$(top_srcdir)/MagickCore/libMagickCore.map
@@ -4987,238 +4976,238 @@
 
 # Library base sources
 MAGICKCORE_BASE_SRCS = \
-	MagickCore/MagickCore.h \
-	MagickCore/accelerate.c \
-	MagickCore/accelerate-private.h \
-	MagickCore/accelerate-kernels-private.h \
-	MagickCore/animate.c \
-	MagickCore/animate.h \
-	MagickCore/animate-private.h \
-	MagickCore/annotate.c \
-	MagickCore/annotate.h \
-	MagickCore/artifact.c \
-	MagickCore/artifact.h \
-	MagickCore/attribute.c \
-	MagickCore/attribute.h \
-	MagickCore/blob.c \
-	MagickCore/blob.h \
-	MagickCore/blob-private.h \
-	MagickCore/cache.c \
-	MagickCore/cache.h \
-	MagickCore/cache-private.h \
-	MagickCore/cache-view.c \
-	MagickCore/cache-view.h \
-	MagickCore/channel.c \
-	MagickCore/channel.h \
-	MagickCore/cipher.c \
-	MagickCore/cipher.h \
-	MagickCore/client.c \
-	MagickCore/client.h \
-	MagickCore/coder.c \
-	MagickCore/coder.h \
-	MagickCore/color.c \
-	MagickCore/color.h \
-	MagickCore/color-private.h \
-	MagickCore/colormap.c \
-	MagickCore/colormap.h \
-	MagickCore/colormap-private.h \
-	MagickCore/colorspace.c \
-	MagickCore/colorspace.h \
-	MagickCore/colorspace-private.h \
-	MagickCore/compare.c \
-	MagickCore/compare.h \
-	MagickCore/composite.c \
-	MagickCore/composite.h \
-	MagickCore/composite-private.h \
-	MagickCore/compress.c \
-	MagickCore/compress.h \
-	MagickCore/configure.c \
-	MagickCore/configure.h \
-	MagickCore/constitute.c \
-	MagickCore/constitute.h \
-	MagickCore/decorate.c \
-	MagickCore/decorate.h \
-	MagickCore/delegate.c \
-	MagickCore/delegate.h \
-	MagickCore/delegate-private.h \
-	MagickCore/deprecate.c \
-	MagickCore/deprecate.h \
-	MagickCore/display.c \
-	MagickCore/display.h \
-	MagickCore/display-private.h \
-	MagickCore/distort.c \
-	MagickCore/distort.h \
-	MagickCore/distribute-cache.c \
-	MagickCore/distribute-cache.h \
-	MagickCore/distribute-cache-private.h \
-	MagickCore/draw.c \
-	MagickCore/draw.h \
-	MagickCore/draw-private.h \
-	MagickCore/effect.c \
-	MagickCore/effect.h \
-	MagickCore/enhance.c \
-	MagickCore/enhance.h \
-	MagickCore/exception.c \
-	MagickCore/exception.h \
-	MagickCore/exception-private.h \
-	MagickCore/feature.c \
-	MagickCore/feature.h \
-	MagickCore/fourier.c \
-	MagickCore/fourier.h \
-	MagickCore/fx.c \
-	MagickCore/fx.h \
-	MagickCore/fx-private.h \
-	MagickCore/gem.c \
-	MagickCore/gem.h \
-	MagickCore/gem-private.h \
-	MagickCore/geometry.c \
-	MagickCore/geometry.h \
-	MagickCore/histogram.c \
-	MagickCore/histogram.h \
-	MagickCore/identify.c \
-	MagickCore/identify.h \
-	MagickCore/image.c \
-	MagickCore/image.h \
-	MagickCore/image-private.h \
-	MagickCore/image-view.c \
-	MagickCore/image-view.h \
-	MagickCore/layer.c \
-	MagickCore/layer.h \
-	MagickCore/linked-list.c \
-	MagickCore/linked-list.h \
-	MagickCore/list.c \
-	MagickCore/list.h \
-	MagickCore/locale.c \
-	MagickCore/locale_.h \
-	MagickCore/log.c \
-	MagickCore/log.h \
-	MagickCore/magic.c \
-	MagickCore/magic.h \
-	MagickCore/magick.c \
-	MagickCore/magick-baseconfig.h \
-	MagickCore/magick-config.h \
-	MagickCore/magick-type.h \
-	MagickCore/magick.h \
-	MagickCore/matrix.c \
-	MagickCore/matrix.h \
-	MagickCore/matrix-private.h \
-	MagickCore/memory.c \
-	MagickCore/memory_.h \
-	MagickCore/memory-private.h \
-	MagickCore/method-attribute.h \
-	MagickCore/methods.h \
-	MagickCore/mime.c \
-	MagickCore/mime.h \
-	MagickCore/module.c \
-	MagickCore/module.h \
-	MagickCore/monitor.c \
-	MagickCore/monitor.h \
-	MagickCore/monitor-private.h \
-	MagickCore/montage.c \
-	MagickCore/montage.h \
-	MagickCore/morphology.c \
-	MagickCore/morphology.h \
-	MagickCore/morphology-private.h \
-	MagickCore/nt-base.h \
+  MagickCore/MagickCore.h \
+  MagickCore/accelerate.c \
+  MagickCore/accelerate-private.h \
+  MagickCore/accelerate-kernels-private.h \
+  MagickCore/animate.c \
+  MagickCore/animate.h \
+  MagickCore/animate-private.h \
+  MagickCore/annotate.c \
+  MagickCore/annotate.h \
+  MagickCore/artifact.c \
+  MagickCore/artifact.h \
+  MagickCore/attribute.c \
+  MagickCore/attribute.h \
+  MagickCore/blob.c \
+  MagickCore/blob.h \
+  MagickCore/blob-private.h \
+  MagickCore/cache.c \
+  MagickCore/cache.h \
+  MagickCore/cache-private.h \
+  MagickCore/cache-view.c \
+  MagickCore/cache-view.h \
+  MagickCore/channel.c \
+  MagickCore/channel.h \
+  MagickCore/cipher.c \
+  MagickCore/cipher.h \
+  MagickCore/client.c \
+  MagickCore/client.h \
+  MagickCore/coder.c \
+  MagickCore/coder.h \
+  MagickCore/color.c \
+  MagickCore/color.h \
+  MagickCore/color-private.h \
+  MagickCore/colormap.c \
+  MagickCore/colormap.h \
+  MagickCore/colormap-private.h \
+  MagickCore/colorspace.c \
+  MagickCore/colorspace.h \
+  MagickCore/colorspace-private.h \
+  MagickCore/compare.c \
+  MagickCore/compare.h \
+  MagickCore/composite.c \
+  MagickCore/composite.h \
+  MagickCore/composite-private.h \
+  MagickCore/compress.c \
+  MagickCore/compress.h \
+  MagickCore/configure.c \
+  MagickCore/configure.h \
+  MagickCore/constitute.c \
+  MagickCore/constitute.h \
+  MagickCore/decorate.c \
+  MagickCore/decorate.h \
+  MagickCore/delegate.c \
+  MagickCore/delegate.h \
+  MagickCore/delegate-private.h \
+  MagickCore/deprecate.c \
+  MagickCore/deprecate.h \
+  MagickCore/display.c \
+  MagickCore/display.h \
+  MagickCore/display-private.h \
+  MagickCore/distort.c \
+  MagickCore/distort.h \
+  MagickCore/distribute-cache.c \
+  MagickCore/distribute-cache.h \
+  MagickCore/distribute-cache-private.h \
+  MagickCore/draw.c \
+  MagickCore/draw.h \
+  MagickCore/draw-private.h \
+  MagickCore/effect.c \
+  MagickCore/effect.h \
+  MagickCore/enhance.c \
+  MagickCore/enhance.h \
+  MagickCore/exception.c \
+  MagickCore/exception.h \
+  MagickCore/exception-private.h \
+  MagickCore/feature.c \
+  MagickCore/feature.h \
+  MagickCore/fourier.c \
+  MagickCore/fourier.h \
+  MagickCore/fx.c \
+  MagickCore/fx.h \
+  MagickCore/fx-private.h \
+  MagickCore/gem.c \
+  MagickCore/gem.h \
+  MagickCore/gem-private.h \
+  MagickCore/geometry.c \
+  MagickCore/geometry.h \
+  MagickCore/histogram.c \
+  MagickCore/histogram.h \
+  MagickCore/identify.c \
+  MagickCore/identify.h \
+  MagickCore/image.c \
+  MagickCore/image.h \
+  MagickCore/image-private.h \
+  MagickCore/image-view.c \
+  MagickCore/image-view.h \
+  MagickCore/layer.c \
+  MagickCore/layer.h \
+  MagickCore/linked-list.c \
+  MagickCore/linked-list.h \
+  MagickCore/list.c \
+  MagickCore/list.h \
+  MagickCore/locale.c \
+  MagickCore/locale_.h \
+  MagickCore/log.c \
+  MagickCore/log.h \
+  MagickCore/magic.c \
+  MagickCore/magic.h \
+  MagickCore/magick.c \
+  MagickCore/magick-baseconfig.h \
+  MagickCore/magick-config.h \
+  MagickCore/magick-type.h \
+  MagickCore/magick.h \
+  MagickCore/matrix.c \
+  MagickCore/matrix.h \
+  MagickCore/matrix-private.h \
+  MagickCore/memory.c \
+  MagickCore/memory_.h \
+  MagickCore/memory-private.h \
+  MagickCore/method-attribute.h \
+  MagickCore/methods.h \
+  MagickCore/mime.c \
+  MagickCore/mime.h \
+  MagickCore/module.c \
+  MagickCore/module.h \
+  MagickCore/monitor.c \
+  MagickCore/monitor.h \
+  MagickCore/monitor-private.h \
+  MagickCore/montage.c \
+  MagickCore/montage.h \
+  MagickCore/morphology.c \
+  MagickCore/morphology.h \
+  MagickCore/morphology-private.h \
+  MagickCore/nt-base.h \
   MagickCore/nt-base-private.h \
-	MagickCore/nt-feature.h \
-	MagickCore/opencl.c \
-	MagickCore/opencl.h \
-	MagickCore/opencl-private.h \
-	MagickCore/option.c \
-	MagickCore/option.h \
-	MagickCore/option-private.h \
-	MagickCore/paint.c \
-	MagickCore/paint.h \
-	MagickCore/pixel.c \
-	MagickCore/pixel.h \
-	MagickCore/pixel-accessor.h \
-	MagickCore/pixel-private.h \
-	MagickCore/policy.c \
-	MagickCore/policy.h \
-	MagickCore/policy-private.h \
-	MagickCore/prepress.c \
-	MagickCore/prepress.h \
-	MagickCore/property.c \
-	MagickCore/property.h \
-	MagickCore/profile.c \
-	MagickCore/profile.h \
-	MagickCore/profile-private.h \
-	MagickCore/quantize.c \
-	MagickCore/quantize.h \
-	MagickCore/quantum.c \
-	MagickCore/quantum.h \
-	MagickCore/quantum-export.c \
-	MagickCore/quantum-import.c \
-	MagickCore/quantum-private.h \
-	MagickCore/random.c \
-	MagickCore/random_.h \
-	MagickCore/random-private.h \
-	MagickCore/registry.c \
-	MagickCore/registry.h \
-	MagickCore/resample.c \
-	MagickCore/resample.h \
-	MagickCore/resample-private.h \
-	MagickCore/resize.c \
-	MagickCore/resize.h \
-	MagickCore/resize-private.h \
-	MagickCore/resource.c \
-	MagickCore/resource_.h \
-	MagickCore/resource-private.h \
-	MagickCore/segment.c \
-	MagickCore/segment.h \
-	MagickCore/semaphore.c \
-	MagickCore/semaphore.h \
-	MagickCore/semaphore-private.h \
-	MagickCore/shear.c \
-	MagickCore/shear.h \
-	MagickCore/signature.c \
-	MagickCore/signature.h \
-	MagickCore/signature-private.h \
-	MagickCore/splay-tree.c \
-	MagickCore/splay-tree.h \
-	MagickCore/static.c \
-	MagickCore/static.h \
-	MagickCore/statistic.c \
-	MagickCore/statistic.h \
-	MagickCore/stream.c \
-	MagickCore/stream.h \
-	MagickCore/stream-private.h \
-	MagickCore/string.c \
-	MagickCore/string_.h \
-	MagickCore/string-private.h \
-	MagickCore/studio.h \
-	MagickCore/thread.c \
-	MagickCore/thread_.h \
-	MagickCore/thread-private.h \
-	MagickCore/timer.c \
-	MagickCore/timer.h \
- 	MagickCore/timer-private.h \
-	MagickCore/token.c \
-	MagickCore/token.h \
-	MagickCore/token-private.h \
-	MagickCore/transform.c \
-	MagickCore/transform.h \
-	MagickCore/threshold.c \
-	MagickCore/threshold.h \
-	MagickCore/type.c \
-	MagickCore/type.h \
-	MagickCore/utility.c \
-	MagickCore/utility.h \
-	MagickCore/utility-private.h \
-	MagickCore/version.c \
-	MagickCore/version.h \
-	MagickCore/version-private.h \
-	MagickCore/vision.c \
-	MagickCore/vision.h \
-	MagickCore/widget.c \
-	MagickCore/widget.h \
-	MagickCore/widget-private.h \
-	MagickCore/xml-tree.c \
-	MagickCore/xml-tree.h \
-	MagickCore/xml-tree-private.h \
-	MagickCore/xwindow.c \
-	MagickCore/xwindow.h 
+  MagickCore/nt-feature.h \
+  MagickCore/opencl.c \
+  MagickCore/opencl.h \
+  MagickCore/opencl-private.h \
+  MagickCore/option.c \
+  MagickCore/option.h \
+  MagickCore/option-private.h \
+  MagickCore/paint.c \
+  MagickCore/paint.h \
+  MagickCore/pixel.c \
+  MagickCore/pixel.h \
+  MagickCore/pixel-accessor.h \
+  MagickCore/pixel-private.h \
+  MagickCore/policy.c \
+  MagickCore/policy.h \
+  MagickCore/policy-private.h \
+  MagickCore/prepress.c \
+  MagickCore/prepress.h \
+  MagickCore/property.c \
+  MagickCore/property.h \
+  MagickCore/profile.c \
+  MagickCore/profile.h \
+  MagickCore/profile-private.h \
+  MagickCore/quantize.c \
+  MagickCore/quantize.h \
+  MagickCore/quantum.c \
+  MagickCore/quantum.h \
+  MagickCore/quantum-export.c \
+  MagickCore/quantum-import.c \
+  MagickCore/quantum-private.h \
+  MagickCore/random.c \
+  MagickCore/random_.h \
+  MagickCore/random-private.h \
+  MagickCore/registry.c \
+  MagickCore/registry.h \
+  MagickCore/resample.c \
+  MagickCore/resample.h \
+  MagickCore/resample-private.h \
+  MagickCore/resize.c \
+  MagickCore/resize.h \
+  MagickCore/resize-private.h \
+  MagickCore/resource.c \
+  MagickCore/resource_.h \
+  MagickCore/resource-private.h \
+  MagickCore/segment.c \
+  MagickCore/segment.h \
+  MagickCore/semaphore.c \
+  MagickCore/semaphore.h \
+  MagickCore/semaphore-private.h \
+  MagickCore/shear.c \
+  MagickCore/shear.h \
+  MagickCore/signature.c \
+  MagickCore/signature.h \
+  MagickCore/signature-private.h \
+  MagickCore/splay-tree.c \
+  MagickCore/splay-tree.h \
+  MagickCore/static.c \
+  MagickCore/static.h \
+  MagickCore/statistic.c \
+  MagickCore/statistic.h \
+  MagickCore/stream.c \
+  MagickCore/stream.h \
+  MagickCore/stream-private.h \
+  MagickCore/string.c \
+  MagickCore/string_.h \
+  MagickCore/string-private.h \
+  MagickCore/studio.h \
+  MagickCore/thread.c \
+  MagickCore/thread_.h \
+  MagickCore/thread-private.h \
+  MagickCore/timer.c \
+  MagickCore/timer.h \
+  MagickCore/timer-private.h \
+  MagickCore/token.c \
+  MagickCore/token.h \
+  MagickCore/token-private.h \
+  MagickCore/transform.c \
+  MagickCore/transform.h \
+  MagickCore/threshold.c \
+  MagickCore/threshold.h \
+  MagickCore/type.c \
+  MagickCore/type.h \
+  MagickCore/utility.c \
+  MagickCore/utility.h \
+  MagickCore/utility-private.h \
+  MagickCore/version.c \
+  MagickCore/version.h \
+  MagickCore/version-private.h \
+  MagickCore/vision.c \
+  MagickCore/vision.h \
+  MagickCore/widget.c \
+  MagickCore/widget.h \
+  MagickCore/widget-private.h \
+  MagickCore/xml-tree.c \
+  MagickCore/xml-tree.h \
+  MagickCore/xml-tree-private.h \
+  MagickCore/xwindow.c \
+  MagickCore/xwindow.h
 
 @CYGWIN_BUILD_FALSE@@WIN32_NATIVE_BUILD_FALSE@MAGICKCORE_PLATFORM_SRCS = 
 @CYGWIN_BUILD_TRUE@@WIN32_NATIVE_BUILD_FALSE@MAGICKCORE_PLATFORM_SRCS = \
@@ -5233,291 +5222,292 @@
 @WIN32_NATIVE_BUILD_TRUE@  MagickCore/nt-feature.h
 
 MAGICKCORE_INCLUDE_HDRS = \
-	MagickCore/MagickCore.h \
-	MagickCore/animate.h \
-	MagickCore/annotate.h \
-	MagickCore/artifact.h \
-	MagickCore/attribute.h \
-	MagickCore/blob.h \
-	MagickCore/cache.h \
-	MagickCore/cache-view.h \
-	MagickCore/channel.h \
-	MagickCore/cipher.h \
-	MagickCore/client.h \
-	MagickCore/coder.h \
-	MagickCore/color.h \
-	MagickCore/colormap.h \
-	MagickCore/colorspace.h \
-	MagickCore/compare.h \
-	MagickCore/composite.h \
-	MagickCore/compress.h \
-	MagickCore/configure.h \
-	MagickCore/constitute.h \
-	MagickCore/decorate.h \
-	MagickCore/delegate.h \
-	MagickCore/deprecate.h \
-	MagickCore/display.h \
-	MagickCore/distort.h \
-	MagickCore/distribute-cache.h \
-	MagickCore/draw.h \
-	MagickCore/effect.h \
-	MagickCore/enhance.h \
-	MagickCore/exception.h \
-	MagickCore/feature.h \
-	MagickCore/fourier.h \
-	MagickCore/fx.h \
-	MagickCore/gem.h \
-	MagickCore/geometry.h \
-	MagickCore/histogram.h \
-	MagickCore/identify.h \
-	MagickCore/image.h \
-	MagickCore/image-view.h \
-	MagickCore/layer.h \
-	MagickCore/linked-list.h \
-	MagickCore/list.h \
-	MagickCore/locale_.h \
-	MagickCore/log.h \
-	MagickCore/magic.h \
-	MagickCore/magick.h \
-	MagickCore/magick-config.h \
-	MagickCore/magick-type.h \
-	MagickCore/matrix.h \
-	MagickCore/memory_.h \
-	MagickCore/method-attribute.h \
-	MagickCore/methods.h \
-	MagickCore/mime.h \
-	MagickCore/module.h \
-	MagickCore/monitor.h \
-	MagickCore/montage.h \
-	MagickCore/morphology.h \
-	MagickCore/nt-base.h \
-	MagickCore/opencl.h \
-	MagickCore/option.h \
-	MagickCore/paint.h \
-	MagickCore/pixel.h \
-	MagickCore/pixel-accessor.h \
-	MagickCore/policy.h \
-	MagickCore/prepress.h \
-	MagickCore/profile.h \
-	MagickCore/property.h \
-	MagickCore/quantize.h \
-	MagickCore/quantum.h \
-	MagickCore/random_.h \
-	MagickCore/registry.h \
-	MagickCore/resample.h \
-	MagickCore/resize.h \
-	MagickCore/resource_.h \
-	MagickCore/segment.h \
-	MagickCore/semaphore.h \
-	MagickCore/shear.h \
-	MagickCore/signature.h \
-	MagickCore/splay-tree.h \
-	MagickCore/static.h \
-	MagickCore/statistic.h \
-	MagickCore/stream.h \
-	MagickCore/string_.h \
-	MagickCore/studio.h \
-	MagickCore/timer.h \
-	MagickCore/token.h \
-	MagickCore/transform.h \
-	MagickCore/threshold.h \
-	MagickCore/type.h \
-	MagickCore/utility.h \
-	MagickCore/version.h \
-	MagickCore/vision.h \
-	MagickCore/widget.h \
-	MagickCore/xml-tree.h \
-	MagickCore/xwindow.h
+  MagickCore/MagickCore.h \
+  MagickCore/animate.h \
+  MagickCore/annotate.h \
+  MagickCore/artifact.h \
+  MagickCore/attribute.h \
+  MagickCore/blob.h \
+  MagickCore/cache.h \
+  MagickCore/cache-view.h \
+  MagickCore/channel.h \
+  MagickCore/cipher.h \
+  MagickCore/client.h \
+  MagickCore/coder.h \
+  MagickCore/color.h \
+  MagickCore/colormap.h \
+  MagickCore/colorspace.h \
+  MagickCore/compare.h \
+  MagickCore/composite.h \
+  MagickCore/compress.h \
+  MagickCore/configure.h \
+  MagickCore/constitute.h \
+  MagickCore/decorate.h \
+  MagickCore/delegate.h \
+  MagickCore/deprecate.h \
+  MagickCore/display.h \
+  MagickCore/distort.h \
+  MagickCore/distribute-cache.h \
+  MagickCore/draw.h \
+  MagickCore/effect.h \
+  MagickCore/enhance.h \
+  MagickCore/exception.h \
+  MagickCore/feature.h \
+  MagickCore/fourier.h \
+  MagickCore/fx.h \
+  MagickCore/gem.h \
+  MagickCore/geometry.h \
+  MagickCore/histogram.h \
+  MagickCore/identify.h \
+  MagickCore/image.h \
+  MagickCore/image-view.h \
+  MagickCore/layer.h \
+  MagickCore/linked-list.h \
+  MagickCore/list.h \
+  MagickCore/locale_.h \
+  MagickCore/log.h \
+  MagickCore/magic.h \
+  MagickCore/magick.h \
+  MagickCore/magick-config.h \
+  MagickCore/magick-type.h \
+  MagickCore/matrix.h \
+  MagickCore/memory_.h \
+  MagickCore/method-attribute.h \
+  MagickCore/methods.h \
+  MagickCore/mime.h \
+  MagickCore/module.h \
+  MagickCore/monitor.h \
+  MagickCore/montage.h \
+  MagickCore/morphology.h \
+  MagickCore/nt-base.h \
+  MagickCore/opencl.h \
+  MagickCore/option.h \
+  MagickCore/paint.h \
+  MagickCore/pixel.h \
+  MagickCore/pixel-accessor.h \
+  MagickCore/policy.h \
+  MagickCore/prepress.h \
+  MagickCore/profile.h \
+  MagickCore/property.h \
+  MagickCore/quantize.h \
+  MagickCore/quantum.h \
+  MagickCore/random_.h \
+  MagickCore/registry.h \
+  MagickCore/resample.h \
+  MagickCore/resize.h \
+  MagickCore/resource_.h \
+  MagickCore/segment.h \
+  MagickCore/semaphore.h \
+  MagickCore/shear.h \
+  MagickCore/signature.h \
+  MagickCore/splay-tree.h \
+  MagickCore/static.h \
+  MagickCore/statistic.h \
+  MagickCore/stream.h \
+  MagickCore/string_.h \
+  MagickCore/studio.h \
+  MagickCore/timer.h \
+  MagickCore/token.h \
+  MagickCore/transform.h \
+  MagickCore/threshold.h \
+  MagickCore/type.h \
+  MagickCore/utility.h \
+  MagickCore/version.h \
+  MagickCore/vision.h \
+  MagickCore/widget.h \
+  MagickCore/xml-tree.h \
+  MagickCore/xwindow.h
 
 MAGICKCORE_NOINST_HDRS = \
-	MagickCore/accelerate-private.h \
-	MagickCore/accelerate-kernels-private.h \
-	MagickCore/animate-private.h \
-	MagickCore/annotate-private.h \
-	MagickCore/blob-private.h \
- 	MagickCore/cache-private.h \
-	MagickCore/cache-private.h \
- 	MagickCore/coder-private.h \
-	MagickCore/colormap-private.h \
- 	MagickCore/color-private.h \
-	MagickCore/color-private.h \
-	MagickCore/colorspace-private.h \
-	MagickCore/composite-private.h \
- 	MagickCore/configure-private.h \
- 	MagickCore/constitute-private.h \
- 	MagickCore/delegate-private.h \
-	MagickCore/delegate-private.h \
-	MagickCore/display-private.h \
-	MagickCore/distribute-cache-private.h \
-	MagickCore/draw-private.h \
-	MagickCore/exception-private.h \
-	MagickCore/fx-private.h \
-	MagickCore/gem-private.h \
-	MagickCore/image-private.h \
- 	MagickCore/locale-private.h \
- 	MagickCore/log-private.h \
- 	MagickCore/magick-private.h \
- 	MagickCore/magic-private.h \
-	MagickCore/matrix-private.h \
-	MagickCore/memory-private.h \
- 	MagickCore/methods-private.h \
- 	MagickCore/mime-private.h \
-	MagickCore/mime-private.h \
- 	MagickCore/module-private.h \
-	MagickCore/monitor-private.h \
-	MagickCore/morphology-private.h \
-	MagickCore/nt-base.h \
-	MagickCore/nt-feature.h \
-	MagickCore/opencl-private.h \
-	MagickCore/option-private.h \
- 	MagickCore/pixel-private.h \
- 	MagickCore/policy-private.h \
- 	MagickCore/profile-private.h \
-	MagickCore/quantum-private.h \
- 	MagickCore/random_-private.h \
-	MagickCore/random-private.h \
- 	MagickCore/registry-private.h \
-	MagickCore/resample-private.h \
-	MagickCore/resize-private.h \
- 	MagickCore/resource-private.h \
-	MagickCore/resource-private.h \
- 	MagickCore/semaphore-private.h \
-	MagickCore/semaphore-private.h \
-	MagickCore/signature-private.h \
-	MagickCore/stream-private.h \
-	MagickCore/string-private.h \
-	MagickCore/thread_.h \
-	MagickCore/thread-private.h \
- 	MagickCore/timer-private.h \
-	MagickCore/token-private.h \
-	MagickCore/transform-private.h \
- 	MagickCore/type-private.h \
-	MagickCore/utility-private.h \
-	MagickCore/version-private.h \
- 	MagickCore/widget-private.h \
-	MagickCore/xml-tree-private.h \
-	MagickCore/xwindow-private.h
+  MagickCore/accelerate-private.h \
+  MagickCore/accelerate-kernels-private.h \
+  MagickCore/animate-private.h \
+  MagickCore/annotate-private.h \
+  MagickCore/blob-private.h \
+  MagickCore/cache-private.h \
+  MagickCore/cache-private.h \
+  MagickCore/coder-private.h \
+  MagickCore/colormap-private.h \
+  MagickCore/color-private.h \
+  MagickCore/color-private.h \
+  MagickCore/colorspace-private.h \
+  MagickCore/composite-private.h \
+  MagickCore/configure-private.h \
+  MagickCore/constitute-private.h \
+  MagickCore/delegate-private.h \
+  MagickCore/delegate-private.h \
+  MagickCore/display-private.h \
+  MagickCore/distribute-cache-private.h \
+  MagickCore/draw-private.h \
+  MagickCore/exception-private.h \
+  MagickCore/fx-private.h \
+  MagickCore/gem-private.h \
+  MagickCore/image-private.h \
+  MagickCore/locale-private.h \
+  MagickCore/log-private.h \
+  MagickCore/magick-private.h \
+  MagickCore/magic-private.h \
+  MagickCore/matrix-private.h \
+  MagickCore/memory-private.h \
+  MagickCore/methods-private.h \
+  MagickCore/mime-private.h \
+  MagickCore/mime-private.h \
+  MagickCore/module-private.h \
+  MagickCore/monitor-private.h \
+  MagickCore/morphology-private.h \
+  MagickCore/nt-base.h \
+  MagickCore/nt-feature.h \
+  MagickCore/opencl-private.h \
+  MagickCore/option-private.h \
+  MagickCore/pixel-private.h \
+  MagickCore/policy-private.h \
+  MagickCore/profile-private.h \
+  MagickCore/quantum-private.h \
+  MagickCore/random_-private.h \
+  MagickCore/random-private.h \
+  MagickCore/registry-private.h \
+  MagickCore/resample-private.h \
+  MagickCore/resize-private.h \
+  MagickCore/resource-private.h \
+  MagickCore/resource-private.h \
+  MagickCore/semaphore-private.h \
+  MagickCore/semaphore-private.h \
+  MagickCore/signature-private.h \
+  MagickCore/stream-private.h \
+  MagickCore/string-private.h \
+  MagickCore/thread_.h \
+  MagickCore/thread-private.h \
+  MagickCore/timer-private.h \
+  MagickCore/token-private.h \
+  MagickCore/transform-private.h \
+  MagickCore/type-private.h \
+  MagickCore/utility-private.h \
+  MagickCore/version-private.h \
+  MagickCore/widget-private.h \
+  MagickCore/xml-tree-private.h \
+  MagickCore/xwindow-private.h
 
 MAGICKCORE_INCLUDEARCH_HDRS = \
-	MagickCore/magick-baseconfig.h
+  MagickCore/magick-baseconfig.h
 
 MAGICKCORE_EXTRA_DIST = \
-	MagickCore/MagickCore-config.in \
-	$(MAGICKCORE_MANS) \
-	MagickCore/ImageMagick.pc.in \
-	MagickCore/MagickCore.pc.in \
-	MagickCore/libMagickCore.map \
-	MagickCore/nt-base.c \
-	MagickCore/nt-feature.c
+  MagickCore/MagickCore-config.in \
+  $(MAGICKCORE_MANS) \
+  MagickCore/ImageMagick.pc.in \
+  MagickCore/MagickCore.pc.in \
+  MagickCore/libMagickCore.map \
+  MagickCore/nt-base.c \
+  MagickCore/nt-feature.c
 
+@MAGICKCORE_ZERO_CONFIGURATION_SUPPORT_TRUE@libMagickCore_threshold_target = MagickCore/libMagickCore_@MAGICK_MAJOR_VERSION@_@MAGICK_ABI_SUFFIX@_la-threshold.lo
 MagickWandincdir = $(INCLUDE_PATH)/MagickWand
 MAGICKWAND_CPPFLAGS = $(AM_CPPFLAGS)
 MAGICKWAND_SOURCES = \
-	MagickWand/MagickWand.h \
-	MagickWand/animate.c \
-	MagickWand/animate.h \
-	MagickWand/compare.c \
-	MagickWand/compare.h \
-	MagickWand/composite.c \
-	MagickWand/composite.h \
-	MagickWand/conjure.c \
-	MagickWand/conjure.h \
-	MagickWand/convert.c \
-	MagickWand/convert.h \
-	MagickWand/deprecate.h \
-	MagickWand/deprecate.c \
-	MagickWand/display.c \
-	MagickWand/display.h \
-	MagickWand/drawing-wand.c \
-	MagickWand/drawing-wand.h \
-	MagickWand/identify.c \
-	MagickWand/identify.h \
-	MagickWand/import.c \
-	MagickWand/import.h \
-	MagickWand/magick-cli.c \
-	MagickWand/magick-cli.h \
-	MagickWand/magick-image.c \
-	MagickWand/magick-image.h \
-	MagickWand/magick-property.c \
-	MagickWand/magick-property.h \
-	MagickWand/magick-wand.c \
-	MagickWand/magick-wand-private.h \
-	MagickWand/method-attribute.h \
-	MagickWand/mogrify.c \
-	MagickWand/mogrify.h \
-	MagickWand/mogrify-private.h \
-	MagickWand/montage.c \
-	MagickWand/montage.h \
-	MagickWand/operation.c \
-	MagickWand/operation.h \
-	MagickWand/operation-private.h \
-	MagickWand/pixel-iterator.c \
-	MagickWand/pixel-iterator.h \
-	MagickWand/pixel-wand.c \
-	MagickWand/pixel-wand.h \
-	MagickWand/pixel-wand-private.h \
-	MagickWand/script-token.c \
-	MagickWand/script-token.h \
-	MagickWand/stream.c \
-	MagickWand/stream.h \
-	MagickWand/studio.h \
-	MagickWand/wand.c \
-	MagickWand/wand.h \
-	MagickWand/wandcli.c \
-	MagickWand/wandcli.h \
-	MagickWand/wandcli-private.h \
-	MagickWand/wand-view.c \
-	MagickWand/wand-view.h 
+  MagickWand/MagickWand.h \
+  MagickWand/animate.c \
+  MagickWand/animate.h \
+  MagickWand/compare.c \
+  MagickWand/compare.h \
+  MagickWand/composite.c \
+  MagickWand/composite.h \
+  MagickWand/conjure.c \
+  MagickWand/conjure.h \
+  MagickWand/convert.c \
+  MagickWand/convert.h \
+  MagickWand/deprecate.h \
+  MagickWand/deprecate.c \
+  MagickWand/display.c \
+  MagickWand/display.h \
+  MagickWand/drawing-wand.c \
+  MagickWand/drawing-wand.h \
+  MagickWand/identify.c \
+  MagickWand/identify.h \
+  MagickWand/import.c \
+  MagickWand/import.h \
+  MagickWand/magick-cli.c \
+  MagickWand/magick-cli.h \
+  MagickWand/magick-image.c \
+  MagickWand/magick-image.h \
+  MagickWand/magick-property.c \
+  MagickWand/magick-property.h \
+  MagickWand/magick-wand.c \
+  MagickWand/magick-wand-private.h \
+  MagickWand/method-attribute.h \
+  MagickWand/mogrify.c \
+  MagickWand/mogrify.h \
+  MagickWand/mogrify-private.h \
+  MagickWand/montage.c \
+  MagickWand/montage.h \
+  MagickWand/operation.c \
+  MagickWand/operation.h \
+  MagickWand/operation-private.h \
+  MagickWand/pixel-iterator.c \
+  MagickWand/pixel-iterator.h \
+  MagickWand/pixel-wand.c \
+  MagickWand/pixel-wand.h \
+  MagickWand/pixel-wand-private.h \
+  MagickWand/script-token.c \
+  MagickWand/script-token.h \
+  MagickWand/stream.c \
+  MagickWand/stream.h \
+  MagickWand/studio.h \
+  MagickWand/wand.c \
+  MagickWand/wand.h \
+  MagickWand/wandcli.c \
+  MagickWand/wandcli.h \
+  MagickWand/wandcli-private.h \
+  MagickWand/wand-view.c \
+  MagickWand/wand-view.h
 
 MAGICKWAND_INCLUDE_HDRS = \
-	MagickWand/MagickWand.h \
-	MagickWand/animate.h \
-	MagickWand/compare.h \
-	MagickWand/composite.h \
-	MagickWand/conjure.h \
-	MagickWand/convert.h \
-	MagickWand/deprecate.h \
-	MagickWand/display.h \
-	MagickWand/drawing-wand.h \
-	MagickWand/identify.h \
-	MagickWand/import.h \
-	MagickWand/magick-cli.h \
-	MagickWand/magick-image.h \
-	MagickWand/magick-property.h \
-	MagickWand/method-attribute.h \
-	MagickWand/mogrify.h \
-	MagickWand/montage.h \
-	MagickWand/operation.h \
-	MagickWand/pixel-iterator.h \
-	MagickWand/pixel-wand.h \
-	MagickWand/stream.h \
-	MagickWand/wandcli.h \
-	MagickWand/wand-view.h
+  MagickWand/MagickWand.h \
+  MagickWand/animate.h \
+  MagickWand/compare.h \
+  MagickWand/composite.h \
+  MagickWand/conjure.h \
+  MagickWand/convert.h \
+  MagickWand/deprecate.h \
+  MagickWand/display.h \
+  MagickWand/drawing-wand.h \
+  MagickWand/identify.h \
+  MagickWand/import.h \
+  MagickWand/magick-cli.h \
+  MagickWand/magick-image.h \
+  MagickWand/magick-property.h \
+  MagickWand/method-attribute.h \
+  MagickWand/mogrify.h \
+  MagickWand/montage.h \
+  MagickWand/operation.h \
+  MagickWand/pixel-iterator.h \
+  MagickWand/pixel-wand.h \
+  MagickWand/stream.h \
+  MagickWand/wandcli.h \
+  MagickWand/wand-view.h
 
 MAGICKWAND_NOINST_HDRS = \
-	MagickWand/mogrify-private.h \
-	MagickWand/magick-wand-private.h \
-	MagickWand/operation-private.h \
-	MagickWand/pixel-wand-private.h \
-	MagickWand/script-token.h \
-	MagickWand/studio.h \
-	MagickWand/wand.h \
-	MagickWand/wandcli-private.h
+  MagickWand/mogrify-private.h \
+  MagickWand/magick-wand-private.h \
+  MagickWand/operation-private.h \
+  MagickWand/pixel-wand-private.h \
+  MagickWand/script-token.h \
+  MagickWand/studio.h \
+  MagickWand/wand.h \
+  MagickWand/wandcli-private.h
 
 
 # Headers which are installed
 MagickWandinc_HEADERS = \
-	$(MAGICKWAND_INCLUDE_HDRS)
+  $(MAGICKWAND_INCLUDE_HDRS)
 
 MAGICKWAND_BIN_SCRPTS = \
-	MagickWand/MagickWand-config
+  MagickWand/MagickWand-config
 
 MAGICKWAND_PKGCONFIG = \
-	MagickWand/MagickWand.pc \
-	MagickWand/MagickWand-@MAGICK_MAJOR_VERSION@.@MAGICK_ABI_SUFFIX@.pc
+  MagickWand/MagickWand.pc \
+  MagickWand/MagickWand-@MAGICK_MAJOR_VERSION@.@MAGICK_ABI_SUFFIX@.pc
 
 MAGICKWAND_MANS = \
-	MagickWand/MagickWand-config.1
+  MagickWand/MagickWand-config.1
 
 MAGICKWAND_BUILT_SRCS = 
 MAGICKWAND_LIBS = MagickWand/libMagickWand-@MAGICK_MAJOR_VERSION@.@MAGICK_ABI_SUFFIX@.la
@@ -5527,15 +5517,15 @@
 @HAVE_LD_VERSION_SCRIPT_TRUE@MagickWand_libMagickWand_@MAGICK_MAJOR_VERSION@_@MAGICK_ABI_SUFFIX@_la_LDFLAGS_VERSION = -Wl,--version-script=$(top_srcdir)/MagickWand/libMagickWand.map
 MagickWand_libMagickWand_@MAGICK_MAJOR_VERSION@_@MAGICK_ABI_SUFFIX@_la_LDFLAGS = -no-undefined \
   $(MagickWand_libMagickWand_@MAGICK_MAJOR_VERSION@_@MAGICK_ABI_SUFFIX@_la_LDFLAGS_VERSION) $(MAGICK_LT_RELEASE_OPTS) \
-	-version-info \
-	$(MAGICK_LIBRARY_CURRENT):$(MAGICK_LIBRARY_REVISION):$(MAGICK_LIBRARY_AGE)
+  -version-info \
+  $(MAGICK_LIBRARY_CURRENT):$(MAGICK_LIBRARY_REVISION):$(MAGICK_LIBRARY_AGE)
 
 MagickWand_libMagickWand_@MAGICK_MAJOR_VERSION@_@MAGICK_ABI_SUFFIX@_la_LIBADD = $(MAGICKCORE_LIBS) $(X11_LIBS) $(GOMP_LIBS) $(MATH_LIBS)
 MAGICKWAND_EXTRA_DIST = \
-	MagickWand/ChangeLog \
-	MagickWand/libMagickWand.map \
-	MagickWand/MagickWand-config.1 \
-	MagickWand/MagickWand.pc.in
+  MagickWand/ChangeLog \
+  MagickWand/libMagickWand.map \
+  MagickWand/MagickWand-config.1 \
+  MagickWand/MagickWand.pc.in
 
 MAGICKWAND_CLEANFILES = 
 MAGICKPP_CPPFLAGS = $(AM_CPPFLAGS) -I$(top_srcdir)/Magick++/lib
@@ -5558,89 +5548,89 @@
 @WITH_MAGICK_PLUS_PLUS_FALSE@MAGICKPP_INCHEADERS = 
 @WITH_MAGICK_PLUS_PLUS_TRUE@MAGICKPP_INCHEADERS = $(MAGICKPP_INCHEADERS_OPT)
 MAGICKPP_SCRPTS_OPT = \
-	Magick++/bin/Magick++-config
+  Magick++/bin/Magick++-config
 
 MAGICKPP_MANS_OPT = \
-	Magick++/bin/Magick++-config.1
+  Magick++/bin/Magick++-config.1
 
 MAGICKPP_PKGCONFIG_OPT = \
-	Magick++/lib/Magick++.pc \
-	Magick++/lib/Magick++-@MAGICK_MAJOR_VERSION@.@MAGICK_ABI_SUFFIX@.pc
+  Magick++/lib/Magick++.pc \
+  Magick++/lib/Magick++-@MAGICK_MAJOR_VERSION@.@MAGICK_ABI_SUFFIX@.pc
 
 MAGICKPP_TEST_SCRPTS_OPT = \
-	Magick++/tests/tests.tap \
-	Magick++/demo/demos.tap
+  Magick++/tests/tests.tap \
+  Magick++/demo/demos.tap
 
 MAGICKPP_EXTRA_DIST = \
-	Magick++/AUTHORS \
-	Magick++/ChangeLog \
-	Magick++/INSTALL \
-	Magick++/LICENSE \
-	Magick++/NEWS \
-	Magick++/README \
-	Magick++/bin/Magick++-config.1 \
-	Magick++/bin/Magick++-config.in \
-	Magick++/lib/libMagick++.map \
-	Magick++/lib/Magick++.pc.in \
-	Magick++/demo/model.miff \
-	Magick++/demo/smile.miff \
-	Magick++/demo/smile_anim.miff \
-	Magick++/demo/tile.miff \
-	$(MAGICKPP_TEST_SCRPTS_OPT) \
-	Magick++/tests/test_image.miff \
-	Magick++/tests/test_image_anim.miff
+  Magick++/AUTHORS \
+  Magick++/ChangeLog \
+  Magick++/INSTALL \
+  Magick++/LICENSE \
+  Magick++/NEWS \
+  Magick++/README \
+  Magick++/bin/Magick++-config.1 \
+  Magick++/bin/Magick++-config.in \
+  Magick++/lib/libMagick++.map \
+  Magick++/lib/Magick++.pc.in \
+  Magick++/demo/model.miff \
+  Magick++/demo/smile.miff \
+  Magick++/demo/smile_anim.miff \
+  Magick++/demo/tile.miff \
+  $(MAGICKPP_TEST_SCRPTS_OPT) \
+  Magick++/tests/test_image.miff \
+  Magick++/tests/test_image_anim.miff
 
 MAGICKPP_CLEANFILES = \
-	Magick++/demo/*_out* \
-	Magick++/demo/ir.out \
-	Magick++/tests/colorHistogram.txt \
-	Magick++/tests/testmagick_anim_out.miff \
-	Magick++/tests/ir.out
+  Magick++/demo/*_out* \
+  Magick++/demo/ir.out \
+  Magick++/tests/colorHistogram.txt \
+  Magick++/tests/testmagick_anim_out.miff \
+  Magick++/tests/ir.out
 
 Magick___lib_libMagick___@MAGICK_MAJOR_VERSION@_@MAGICK_ABI_SUFFIX@_la_SOURCES = \
-	Magick++/lib/Blob.cpp \
-	Magick++/lib/BlobRef.cpp \
-	Magick++/lib/CoderInfo.cpp \
-	Magick++/lib/Color.cpp \
-	Magick++/lib/Drawable.cpp \
-	Magick++/lib/Exception.cpp \
-	Magick++/lib/Functions.cpp \
-	Magick++/lib/Geometry.cpp \
-	Magick++/lib/Image.cpp \
-	Magick++/lib/ImageRef.cpp \
-	Magick++/lib/Montage.cpp \
-	Magick++/lib/Options.cpp \
-	Magick++/lib/Pixels.cpp \
-	Magick++/lib/ResourceLimits.cpp \
-	Magick++/lib/SecurityPolicy.cpp \
-	Magick++/lib/Statistic.cpp \
-	Magick++/lib/STL.cpp \
-	Magick++/lib/Thread.cpp \
-	Magick++/lib/TypeMetric.cpp \
-	Magick++/lib/Magick++.h \
-	Magick++/lib/Magick++/Blob.h \
-	Magick++/lib/Magick++/BlobRef.h \
-	Magick++/lib/Magick++/CoderInfo.h \
-	Magick++/lib/Magick++/Color.h \
-	Magick++/lib/Magick++/Drawable.h \
-	Magick++/lib/Magick++/Exception.h \
-	Magick++/lib/Magick++/Functions.h \
-	Magick++/lib/Magick++/Geometry.h \
-	Magick++/lib/Magick++/Image.h \
-	Magick++/lib/Magick++/ImageRef.h \
-	Magick++/lib/Magick++/Include.h \
-	Magick++/lib/Magick++/Montage.h \
-	Magick++/lib/Magick++/Options.h \
-	Magick++/lib/Magick++/Pixels.h \
-	Magick++/lib/Magick++/ResourceLimits.h \
-	Magick++/lib/Magick++/SecurityPolicy.h \
-	Magick++/lib/Magick++/Statistic.h \
-	Magick++/lib/Magick++/STL.h \
-	Magick++/lib/Magick++/Thread.h \
-	Magick++/lib/Magick++/TypeMetric.h
+  Magick++/lib/Blob.cpp \
+  Magick++/lib/BlobRef.cpp \
+  Magick++/lib/CoderInfo.cpp \
+  Magick++/lib/Color.cpp \
+  Magick++/lib/Drawable.cpp \
+  Magick++/lib/Exception.cpp \
+  Magick++/lib/Functions.cpp \
+  Magick++/lib/Geometry.cpp \
+  Magick++/lib/Image.cpp \
+  Magick++/lib/ImageRef.cpp \
+  Magick++/lib/Montage.cpp \
+  Magick++/lib/Options.cpp \
+  Magick++/lib/Pixels.cpp \
+  Magick++/lib/ResourceLimits.cpp \
+  Magick++/lib/SecurityPolicy.cpp \
+  Magick++/lib/Statistic.cpp \
+  Magick++/lib/STL.cpp \
+  Magick++/lib/Thread.cpp \
+  Magick++/lib/TypeMetric.cpp \
+  Magick++/lib/Magick++.h \
+  Magick++/lib/Magick++/Blob.h \
+  Magick++/lib/Magick++/BlobRef.h \
+  Magick++/lib/Magick++/CoderInfo.h \
+  Magick++/lib/Magick++/Color.h \
+  Magick++/lib/Magick++/Drawable.h \
+  Magick++/lib/Magick++/Exception.h \
+  Magick++/lib/Magick++/Functions.h \
+  Magick++/lib/Magick++/Geometry.h \
+  Magick++/lib/Magick++/Image.h \
+  Magick++/lib/Magick++/ImageRef.h \
+  Magick++/lib/Magick++/Include.h \
+  Magick++/lib/Magick++/Montage.h \
+  Magick++/lib/Magick++/Options.h \
+  Magick++/lib/Magick++/Pixels.h \
+  Magick++/lib/Magick++/ResourceLimits.h \
+  Magick++/lib/Magick++/SecurityPolicy.h \
+  Magick++/lib/Magick++/Statistic.h \
+  Magick++/lib/Magick++/STL.h \
+  Magick++/lib/Magick++/Thread.h \
+  Magick++/lib/Magick++/TypeMetric.h
 
 Magick___lib_libMagick___@MAGICK_MAJOR_VERSION@_@MAGICK_ABI_SUFFIX@_la_CPPFLAGS = \
-	$(MAGICKPP_CPPFLAGS) $(LIBRARY_EXTRA_CPPFLAGS)
+  $(MAGICKPP_CPPFLAGS) $(LIBRARY_EXTRA_CPPFLAGS)
 
 magickpptopincdir = $(INCLUDE_PATH)
 magickpptopinc_HEADERS = $(MAGICKPP_TOP_INCHEADERS)
@@ -5650,22 +5640,22 @@
 magickppincdir = $(INCLUDE_PATH)/Magick++
 magickppinc_HEADERS = $(MAGICKPP_INCHEADERS)
 MAGICKPP_INCHEADERS_OPT = \
-	Magick++/lib/Magick++/Blob.h \
-	Magick++/lib/Magick++/CoderInfo.h \
-	Magick++/lib/Magick++/Color.h \
-	Magick++/lib/Magick++/Drawable.h \
-	Magick++/lib/Magick++/Exception.h \
-	Magick++/lib/Magick++/Functions.h \
-	Magick++/lib/Magick++/Geometry.h \
-	Magick++/lib/Magick++/Image.h \
-	Magick++/lib/Magick++/Include.h \
-	Magick++/lib/Magick++/Montage.h \
-	Magick++/lib/Magick++/Pixels.h \
-	Magick++/lib/Magick++/ResourceLimits.h \
-	Magick++/lib/Magick++/SecurityPolicy.h \
-	Magick++/lib/Magick++/Statistic.h \
-	Magick++/lib/Magick++/STL.h \
-	Magick++/lib/Magick++/TypeMetric.h
+  Magick++/lib/Magick++/Blob.h \
+  Magick++/lib/Magick++/CoderInfo.h \
+  Magick++/lib/Magick++/Color.h \
+  Magick++/lib/Magick++/Drawable.h \
+  Magick++/lib/Magick++/Exception.h \
+  Magick++/lib/Magick++/Functions.h \
+  Magick++/lib/Magick++/Geometry.h \
+  Magick++/lib/Magick++/Image.h \
+  Magick++/lib/Magick++/Include.h \
+  Magick++/lib/Magick++/Montage.h \
+  Magick++/lib/Magick++/Pixels.h \
+  Magick++/lib/Magick++/ResourceLimits.h \
+  Magick++/lib/Magick++/SecurityPolicy.h \
+  Magick++/lib/Magick++/Statistic.h \
+  Magick++/lib/Magick++/STL.h \
+  Magick++/lib/Magick++/TypeMetric.h
 
 @HAVE_LD_VERSION_SCRIPT_FALSE@Magick___lib_libMagick___@MAGICK_MAJOR_VERSION@_@MAGICK_ABI_SUFFIX@_la_LDFLAGS_VERSION = -export-symbols-regex ".*"
 @HAVE_LD_VERSION_SCRIPT_TRUE@Magick___lib_libMagick___@MAGICK_MAJOR_VERSION@_@MAGICK_ABI_SUFFIX@_la_LDFLAGS_VERSION = -Wl,--version-script=$(top_srcdir)/Magick++/lib/libMagick++.map
@@ -5676,28 +5666,28 @@
 
 Magick___lib_libMagick___@MAGICK_MAJOR_VERSION@_@MAGICK_ABI_SUFFIX@_la_LIBADD = $(MAGICKCORE_LIBS) $(MAGICKWAND_LIBS)
 MAGICKPP_CHECK_PGRMS_OPT = \
-	Magick++/demo/analyze \
-	Magick++/demo/button \
-	Magick++/demo/demo \
-	Magick++/demo/detrans \
-	Magick++/demo/flip \
-	Magick++/demo/gravity \
-	Magick++/demo/piddle \
-	Magick++/demo/shapes \
-	Magick++/demo/zoom \
-	Magick++/tests/appendImages \
-	Magick++/tests/attributes \
-	Magick++/tests/averageImages \
-	Magick++/tests/coalesceImages \
-	Magick++/tests/coderInfo \
-	Magick++/tests/color \
-	Magick++/tests/colorHistogram \
-	Magick++/tests/exceptions \
-	Magick++/tests/geometry \
-	Magick++/tests/montageImages \
-	Magick++/tests/morphImages \
-	Magick++/tests/readWriteBlob \
-	Magick++/tests/readWriteImages
+  Magick++/demo/analyze \
+  Magick++/demo/button \
+  Magick++/demo/demo \
+  Magick++/demo/detrans \
+  Magick++/demo/flip \
+  Magick++/demo/gravity \
+  Magick++/demo/piddle \
+  Magick++/demo/shapes \
+  Magick++/demo/zoom \
+  Magick++/tests/appendImages \
+  Magick++/tests/attributes \
+  Magick++/tests/averageImages \
+  Magick++/tests/coalesceImages \
+  Magick++/tests/coderInfo \
+  Magick++/tests/color \
+  Magick++/tests/colorHistogram \
+  Magick++/tests/exceptions \
+  Magick++/tests/geometry \
+  Magick++/tests/montageImages \
+  Magick++/tests/morphImages \
+  Magick++/tests/readWriteBlob \
+  Magick++/tests/readWriteImages
 
 Magick___demo_analyze_SOURCES = Magick++/demo/analyze.cpp
 Magick___demo_analyze_LDADD = $(MAGICKPP_LDADD)
@@ -5771,11 +5761,11 @@
 filtersdir = $(FILTER_PATH)
 MAGICK_FILTER_CPPFLAGS = $(AM_CPPFLAGS)
 MAGICKCORE_FILTER_SRCS = \
-	filters/analyze.c
+  filters/analyze.c
 
 @WITH_MODULES_FALSE@filters_LTLIBRARIES = 
 @WITH_MODULES_TRUE@filters_LTLIBRARIES = \
-@WITH_MODULES_TRUE@	filters/analyze.la
+@WITH_MODULES_TRUE@  filters/analyze.la
 
 filters_CPPFLAGS = $(MAGICK_FILTER_CPPFLAGS)
 
@@ -5786,7 +5776,7 @@
 filters_analyze_la_LIBADD = $(MAGICKCORE_LIBS) $(MATH_LIBS)
 @WITH_UTILITIES_FALSE@UTILITIES_PGMS = 
 @WITH_UTILITIES_TRUE@UTILITIES_PGMS = \
-@WITH_UTILITIES_TRUE@	utilities/magick
+@WITH_UTILITIES_TRUE@  utilities/magick
 
 @WITH_UTILITIES_TRUE@UTILITIES_XFAIL_TESTS = \
 @WITH_UTILITIES_TRUE@  $(UTILITIES_TTF_XFAIL_TESTS) \
@@ -5797,42 +5787,42 @@
 @WITH_UTILITIES_TRUE@utilities_magick_SOURCES = utilities/magick.c
 @WITH_UTILITIES_FALSE@UTILITIES_MANS = 
 @WITH_UTILITIES_TRUE@UTILITIES_MANS = \
-@WITH_UTILITIES_TRUE@	utilities/ImageMagick.1 \
-@WITH_UTILITIES_TRUE@	utilities/animate.1 \
-@WITH_UTILITIES_TRUE@	utilities/compare.1 \
-@WITH_UTILITIES_TRUE@	utilities/composite.1 \
-@WITH_UTILITIES_TRUE@	utilities/conjure.1 \
-@WITH_UTILITIES_TRUE@	utilities/convert.1 \
-@WITH_UTILITIES_TRUE@	utilities/display.1 \
-@WITH_UTILITIES_TRUE@	utilities/identify.1 \
-@WITH_UTILITIES_TRUE@	utilities/import.1 \
-@WITH_UTILITIES_TRUE@	utilities/magick.1 \
-@WITH_UTILITIES_TRUE@	utilities/magick-script.1 \
-@WITH_UTILITIES_TRUE@	utilities/mogrify.1 \
-@WITH_UTILITIES_TRUE@	utilities/montage.1 \
-@WITH_UTILITIES_TRUE@	utilities/stream.1
+@WITH_UTILITIES_TRUE@  utilities/ImageMagick.1 \
+@WITH_UTILITIES_TRUE@  utilities/animate.1 \
+@WITH_UTILITIES_TRUE@  utilities/compare.1 \
+@WITH_UTILITIES_TRUE@  utilities/composite.1 \
+@WITH_UTILITIES_TRUE@  utilities/conjure.1 \
+@WITH_UTILITIES_TRUE@  utilities/convert.1 \
+@WITH_UTILITIES_TRUE@  utilities/display.1 \
+@WITH_UTILITIES_TRUE@  utilities/identify.1 \
+@WITH_UTILITIES_TRUE@  utilities/import.1 \
+@WITH_UTILITIES_TRUE@  utilities/magick.1 \
+@WITH_UTILITIES_TRUE@  utilities/magick-script.1 \
+@WITH_UTILITIES_TRUE@  utilities/mogrify.1 \
+@WITH_UTILITIES_TRUE@  utilities/montage.1 \
+@WITH_UTILITIES_TRUE@  utilities/stream.1
 
 @WITH_UTILITIES_FALSE@UTILITIES_CONFIGURE = 
 @WITH_UTILITIES_TRUE@UTILITIES_CONFIGURE = \
-@WITH_UTILITIES_TRUE@	utilities/ImageMagick.1.in \
-@WITH_UTILITIES_TRUE@	utilities/animate.1.in \
-@WITH_UTILITIES_TRUE@	utilities/compare.1.in \
-@WITH_UTILITIES_TRUE@	utilities/composite.1.in \
-@WITH_UTILITIES_TRUE@	utilities/conjure.1.in \
-@WITH_UTILITIES_TRUE@	utilities/convert.1.in \
-@WITH_UTILITIES_TRUE@	utilities/display.1.in \
-@WITH_UTILITIES_TRUE@	utilities/identify.1.in \
-@WITH_UTILITIES_TRUE@	utilities/import.1.in \
-@WITH_UTILITIES_TRUE@	utilities/magick.1.in \
-@WITH_UTILITIES_TRUE@	utilities/magick-script.1.in \
-@WITH_UTILITIES_TRUE@	utilities/mogrify.1.in \
-@WITH_UTILITIES_TRUE@	utilities/montage.1.in \
-@WITH_UTILITIES_TRUE@	utilities/stream.1.in
+@WITH_UTILITIES_TRUE@  utilities/ImageMagick.1.in \
+@WITH_UTILITIES_TRUE@  utilities/animate.1.in \
+@WITH_UTILITIES_TRUE@  utilities/compare.1.in \
+@WITH_UTILITIES_TRUE@  utilities/composite.1.in \
+@WITH_UTILITIES_TRUE@  utilities/conjure.1.in \
+@WITH_UTILITIES_TRUE@  utilities/convert.1.in \
+@WITH_UTILITIES_TRUE@  utilities/display.1.in \
+@WITH_UTILITIES_TRUE@  utilities/identify.1.in \
+@WITH_UTILITIES_TRUE@  utilities/import.1.in \
+@WITH_UTILITIES_TRUE@  utilities/magick.1.in \
+@WITH_UTILITIES_TRUE@  utilities/magick-script.1.in \
+@WITH_UTILITIES_TRUE@  utilities/mogrify.1.in \
+@WITH_UTILITIES_TRUE@  utilities/montage.1.in \
+@WITH_UTILITIES_TRUE@  utilities/stream.1.in
 
 @WITH_UTILITIES_FALSE@UTILITIES_EXTRA_DIST = 
 @WITH_UTILITIES_TRUE@UTILITIES_EXTRA_DIST = \
-@WITH_UTILITIES_TRUE@	$(UTILITIES_MANS) \
-@WITH_UTILITIES_TRUE@	$(UTILITIES_TESTS)
+@WITH_UTILITIES_TRUE@  $(UTILITIES_MANS) \
+@WITH_UTILITIES_TRUE@  $(UTILITIES_TESTS)
 
 @WITH_UTILITIES_FALSE@UTILITIES_CLEANFILES = 
 @WITH_UTILITIES_TRUE@UTILITIES_CLEANFILES = 
@@ -5860,9 +5850,9 @@
 #  Makefile for the ImageMagick validation suite.
 TESTS_CPPFLAGS = $(AM_CPPFLAGS)
 TESTS_CHECK_PGRMS = \
-	tests/validate \
-	tests/drawtest \
-	tests/wandtest
+  tests/validate \
+  tests/drawtest \
+  tests/wandtest
 
 tests_validate_SOURCES = tests/validate.c tests/validate.h
 tests_validate_CPPFLAGS = $(TESTS_CPPFLAGS)
@@ -5878,34 +5868,34 @@
 tests_wandtest_LDADD = $(MAGICKCORE_LIBS) $(MAGICKWAND_LIBS)
 TESTS_XFAIL_TESTS = 
 TESTS_TESTS = \
-	tests/cli-colorspace.tap \
-	tests/cli-pipe.tap \
-	tests/validate-colorspace.tap \
-	tests/validate-compare.tap \
-	tests/validate-composite.tap \
-	tests/validate-convert.tap \
-	tests/validate-formats-disk.tap \
-	tests/validate-formats-map.tap \
-	tests/validate-formats-memory.tap \
-	tests/validate-identify.tap \
-	tests/validate-import.tap \
-	tests/validate-montage.tap \
-	tests/validate-stream.tap \
-	tests/drawtest.tap \
-	tests/wandtest.tap
+  tests/cli-colorspace.tap \
+  tests/cli-pipe.tap \
+  tests/validate-colorspace.tap \
+  tests/validate-compare.tap \
+  tests/validate-composite.tap \
+  tests/validate-convert.tap \
+  tests/validate-formats-disk.tap \
+  tests/validate-formats-map.tap \
+  tests/validate-formats-memory.tap \
+  tests/validate-identify.tap \
+  tests/validate-import.tap \
+  tests/validate-montage.tap \
+  tests/validate-stream.tap \
+  tests/drawtest.tap \
+  tests/wandtest.tap
 
 TESTS_EXTRA_DIST = \
-	tests/common.shi \
+  tests/common.shi \
   tests/rose.pnm \
   tests/input_256c.miff \
   tests/input_bilevel.miff \
   tests/input_gray.miff \
   tests/input_truecolor.miff \
   tests/sequence.miff \
-	$(TESTS_TESTS)
+  $(TESTS_TESTS)
 
 TESTS_CLEANFILES = \
-	tests/*_out.*
+  tests/*_out.*
 
 @WITH_PERL_TRUE@PERLMAGICK = PerlMagick
 @WITH_PERL_TRUE@PERLMAKEMAKER = $(PERLMAGICK)/Makefile.PL
@@ -5924,25 +5914,25 @@
 
 # Files to install in Pkgconfig directory
 pkgconfig_DATA = \
-	$(MAGICKCORE_PKGCONFIG) \
-	$(MAGICKWAND_PKGCONFIG) \
-	$(MAGICKPP_PKGCONFIG)
+  $(MAGICKCORE_PKGCONFIG) \
+  $(MAGICKWAND_PKGCONFIG) \
+  $(MAGICKPP_PKGCONFIG)
 
 
 # Manual pages to install
 @INSTALL_DOC_TRUE@man_MANS = \
-@INSTALL_DOC_TRUE@	$(MAGICKCORE_MANS) \
-@INSTALL_DOC_TRUE@	$(MAGICKWAND_MANS) \
-@INSTALL_DOC_TRUE@	$(MAGICKPP_MANS) \
-@INSTALL_DOC_TRUE@	$(UTILITIES_MANS)
+@INSTALL_DOC_TRUE@  $(MAGICKCORE_MANS) \
+@INSTALL_DOC_TRUE@  $(MAGICKWAND_MANS) \
+@INSTALL_DOC_TRUE@  $(MAGICKPP_MANS) \
+@INSTALL_DOC_TRUE@  $(UTILITIES_MANS)
 
 @INSTALL_DOC_TRUE@doc_DATA = \
-@INSTALL_DOC_TRUE@	LICENSE \
-@INSTALL_DOC_TRUE@	ChangeLog \
-@INSTALL_DOC_TRUE@	NEWS.txt
+@INSTALL_DOC_TRUE@  LICENSE \
+@INSTALL_DOC_TRUE@  ChangeLog \
+@INSTALL_DOC_TRUE@  NEWS.txt
 
 @MAINTAINER_MODE_TRUE@MAINTAINER_TARGETS = \
-@MAINTAINER_MODE_TRUE@	magick-version \
+@MAINTAINER_MODE_TRUE@  magick-version \
 @MAINTAINER_MODE_TRUE@  ImageMagick.spec \
 @MAINTAINER_MODE_TRUE@  $(PERLMAGICK_MAINTAINER_TARGETS)
 
@@ -5980,11 +5970,11 @@
 @RPM_DELEGATE_TRUE@RPMARCH = $(MAGICK_TARGET_CPU)
 @RPM_DELEGATE_FALSE@DIST_ARCHIVE_RPM = 
 @RPM_DELEGATE_TRUE@DIST_ARCHIVE_RPM = \
-@RPM_DELEGATE_TRUE@	$(RPMDIR)/$(RPMARCH)/$(PACKAGE_NAME)-$(PACKAGE_VERSION)$(PACKAGE_VERSION_ADDENDUM)-$(PACKAGE_RELEASE).$(RPMARCH).rpm \
-@RPM_DELEGATE_TRUE@	$(RPMDIR)/$(RPMARCH)/$(PACKAGE_NAME)-c++-$(PACKAGE_VERSION)$(PACKAGE_VERSION_ADDENDUM)-$(PACKAGE_RELEASE).$(RPMARCH).rpm \
-@RPM_DELEGATE_TRUE@	$(RPMDIR)/$(RPMARCH)/$(PACKAGE_NAME)-c++-devel-$(PACKAGE_VERSION)$(PACKAGE_VERSION_ADDENDUM)-$(PACKAGE_RELEASE).$(RPMARCH).rpm \
-@RPM_DELEGATE_TRUE@	$(RPMDIR)/$(RPMARCH)/$(PACKAGE_NAME)-devel-$(PACKAGE_VERSION)$(PACKAGE_VERSION_ADDENDUM)-$(PACKAGE_RELEASE).$(RPMARCH).rpm \
-@RPM_DELEGATE_TRUE@	$(RPMDIR)/$(RPMARCH)/$(PACKAGE_NAME)-perl-$(PACKAGE_VERSION)$(PACKAGE_VERSION_ADDENDUM)-$(PACKAGE_RELEASE).$(RPMARCH).rpm
+@RPM_DELEGATE_TRUE@  $(RPMDIR)/$(RPMARCH)/$(PACKAGE_NAME)-$(PACKAGE_VERSION)$(PACKAGE_VERSION_ADDENDUM)-$(PACKAGE_RELEASE).$(RPMARCH).rpm \
+@RPM_DELEGATE_TRUE@  $(RPMDIR)/$(RPMARCH)/$(PACKAGE_NAME)-c++-$(PACKAGE_VERSION)$(PACKAGE_VERSION_ADDENDUM)-$(PACKAGE_RELEASE).$(RPMARCH).rpm \
+@RPM_DELEGATE_TRUE@  $(RPMDIR)/$(RPMARCH)/$(PACKAGE_NAME)-c++-devel-$(PACKAGE_VERSION)$(PACKAGE_VERSION_ADDENDUM)-$(PACKAGE_RELEASE).$(RPMARCH).rpm \
+@RPM_DELEGATE_TRUE@  $(RPMDIR)/$(RPMARCH)/$(PACKAGE_NAME)-devel-$(PACKAGE_VERSION)$(PACKAGE_VERSION_ADDENDUM)-$(PACKAGE_RELEASE).$(RPMARCH).rpm \
+@RPM_DELEGATE_TRUE@  $(RPMDIR)/$(RPMARCH)/$(PACKAGE_NAME)-perl-$(PACKAGE_VERSION)$(PACKAGE_VERSION_ADDENDUM)-$(PACKAGE_RELEASE).$(RPMARCH).rpm
 
 all: $(BUILT_SOURCES)
 	$(MAKE) $(AM_MAKEFLAGS) all-am
@@ -13299,6 +13289,9 @@
 
 .PRECIOUS: Makefile
 
+@MAGICKCORE_ZERO_CONFIGURATION_SUPPORT_TRUE@$(libMagickCore_threshold_target): MagickCore/threshold-map.h
+@MAGICKCORE_ZERO_CONFIGURATION_SUPPORT_TRUE@MagickCore/threshold-map.h: config/thresholds.xml Makefile
+@MAGICKCORE_ZERO_CONFIGURATION_SUPPORT_TRUE@	$(AM_V_GEN){ printf '%s\n  %s=\n' 'static const char *const' BuiltinMap; sed -e 's/"/\\"/g; s/^.*$$/    "&\\n"/; $$s/$$/;/' $<; } >$@
 install-exec-local-utilities:
 	$(mkinstalldirs) $(DESTDIR)$(bindir)
 	cd $(DESTDIR)$(bindir) ; \
@@ -13464,9 +13457,9 @@
 	@for dir in $(DOCDIRS) ; do \
 	  $(mkinstalldirs) $(DESTDIR)$(pkgdocdir)/$$dir && \
 	  if test -d $(builddir)/$$dir ; then \
-  		docsrcdir=$(builddir)/$$dir; \
+	    docsrcdir=$(builddir)/$$dir; \
 	  else \
-  		docsrcdir=$(srcdir)/$$dir; \
+	    docsrcdir=$(srcdir)/$$dir; \
 	  fi; \
 	  for file in $$docsrcdir/*.* ; do \
 	    echo "$(INSTALL_DATA) $$file $(DESTDIR)$(pkgdocdir)/$$dir" ; \
@@ -13486,14 +13479,14 @@
 	fi
 	@if test -n "$(VPATH)" ; then \
 	  cmp MagickCore/version.h $(srcdir)/MagickCore/version.h > /dev/null ; \
-          if test $$? -eq 1 ; then \
+	        if test $$? -eq 1 ; then \
 	    echo "Updating $(srcdir)/MagickCore/version.h ..."; \
 	    cp MagickCore/version.h $(srcdir)/MagickCore/version.h ; \
 	  fi ; \
 	fi ; \
 	touch magick-version
 
-${srcdir}/configure: ${srcdir}/version.sh ${srcdir}/gitversion.sh
+${srcdir}/configure: ${srcdir}/version.sh
 libtool: $(LIBTOOL_DEPS)
 	$(SHELL) ./config.status --recheck
 
@@ -13538,7 +13531,7 @@
 @RPM_DELEGATE_TRUE@	@echo ==============================================================
 
 @RPM_DELEGATE_TRUE@.PHONY: rpm
-@RPM_DELEGATE_TRUE@rpm:	dist
+@RPM_DELEGATE_TRUE@rpm: dist
 @RPM_DELEGATE_TRUE@	rm -rf $(RPMDIR)
 @RPM_DELEGATE_TRUE@	$(mkinstalldirs) $(RPMDIR)
 @RPM_DELEGATE_TRUE@	$(mkinstalldirs) $(RPMDIR)/BUILD

config/Makefile.am

diff --git a/config/Makefile.am b/config/Makefile.am
index 44f0ede..b226467 100644
--- a/config/Makefile.am
+++ b/config/Makefile.am
@@ -18,56 +18,56 @@
 # (share/ImageMagick-version)
 configsharedir = $(SHARE_PATH)
 configshare_DATA = \
-	config/english.xml \
-	config/francais.xml \
-	config/locale.xml
+  config/english.xml \
+  config/francais.xml \
+  config/locale.xml
 
 # Where architecture-dependent configuration files get installed
 # (share/arch/ImageMagick-version)
 configsharearchdir = $(SHAREARCH_PATH)
 configsharearch_DATA = \
-	config/configure.xml
+  config/configure.xml
 
 # Where architecture-dependent configuration files get installed
 # (share/ImageMagick-version)
 configlibdir =  $(CONFIGURE_PATH)
 configlib_DATA = \
-	config/colors.xml \
-	config/delegates.xml \
-	config/log.xml \
-	config/mime.xml \
-	config/policy.xml \
-	config/quantization-table.xml \
-	config/thresholds.xml \
-	config/type.xml \
-	config/type-apple.xml \
-	config/type-dejavu.xml \
-	config/type-ghostscript.xml \
-	config/type-urw-base35.xml \
-	config/type-windows.xml
+  config/colors.xml \
+  config/delegates.xml \
+  config/log.xml \
+  config/mime.xml \
+  config/policy.xml \
+  config/quantization-table.xml \
+  config/thresholds.xml \
+  config/type.xml \
+  config/type-apple.xml \
+  config/type-dejavu.xml \
+  config/type-ghostscript.xml \
+  config/type-urw-base35.xml \
+  config/type-windows.xml
 
 CONFIG_EXTRA_DIST = \
-	config/cmyk.icm \
-	config/colors.xml \
-	config/config.h.in \
-	config/delegates.xml.in \
-	config/english.xml \
-	config/francais.xml \
-	config/ImageMagick.rc \
-	config/ImageMagick.rdf.in \
-	config/install-sh \
-	config/lndir.sh \
-	config/locale.md \
-	config/locale.xml \
-	config/log.xml \
-	config/mime.xml \
-	config/policy.xml \
-	config/quantization-table.xml \
-	config/sRGB.icm \
-	config/thresholds.xml \
-	config/type-apple.xml.in \
-	config/type-dejavu.xml.in \
-	config/type-ghostscript.xml.in \
-	config/type-urw-base35.xml.in \
-	config/type-windows.xml.in \
-	config/type.xml.in
+  config/cmyk.icm \
+  config/colors.xml \
+  config/config.h.in \
+  config/delegates.xml.in \
+  config/english.xml \
+  config/francais.xml \
+  config/ImageMagick.rc \
+  config/ImageMagick.rdf.in \
+  config/install-sh \
+  config/lndir.sh \
+  config/locale.md \
+  config/locale.xml \
+  config/log.xml \
+  config/mime.xml \
+  config/policy.xml \
+  config/quantization-table.xml \
+  config/sRGB.icm \
+  config/thresholds.xml \
+  config/type-apple.xml.in \
+  config/type-dejavu.xml.in \
+  config/type-ghostscript.xml.in \
+  config/type-urw-base35.xml.in \
+  config/type-windows.xml.in \
+  config/type.xml.in

config/config.h.in

diff --git a/config/config.h.in b/config/config.h.in
index 4f15dbe..fe1ef4d 100644
--- a/config/config.h.in
+++ b/config/config.h.in
@@ -164,9 +164,6 @@
 /* Define to 1 if you don't have `vprintf' but do have `_doprnt.' */
 #undef HAVE_DOPRNT
 
-/* Define to 1 if the system has the type `double_t'. */
-#undef HAVE_DOUBLE_T
-
 /* Define to 1 if you have the `erf' function. */
 #undef HAVE_ERF
 
@@ -182,9 +179,6 @@
 /* Define to 1 if you have the <fcntl.h> header file. */
 #undef HAVE_FCNTL_H
 
-/* Define to 1 if the system has the type `float_t'. */
-#undef HAVE_FLOAT_T
-
 /* Define to 1 if you have the `floor' function. */
 #undef HAVE_FLOOR
 
@@ -272,19 +266,9 @@
 /* Define to 1 if you have the <locale.h> header file. */
 #undef HAVE_LOCALE_H
 
-/* Define to 1 if the system has the type `locale_t'. */
-#undef HAVE_LOCALE_T
-
 /* Define to 1 if you have the `localtime_r' function. */
 #undef HAVE_LOCALTIME_R
 
-/* Define to 1 if the system has the type `long double'. */
-#undef HAVE_LONG_DOUBLE
-
-/* Define to 1 if the type `long double' works and has more range or precision
-   than `double'. */
-#undef HAVE_LONG_DOUBLE_WIDER
-
 /* Define to 1 if the system has the type `long long int'. */
 #undef HAVE_LONG_LONG_INT
 
@@ -863,9 +847,6 @@
 /* Define if you have LIBRAW library */
 #undef RAW_R_DELEGATE
 
-/* Define as the return type of signal handlers (`int' or `void'). */
-#undef RETSIGTYPE
-
 /* Define if you have RSVG library */
 #undef RSVG_DELEGATE
 
@@ -906,41 +887,11 @@
 /* The size of `long double', as computed by sizeof. */
 #undef SIZEOF_LONG_DOUBLE
 
-/* The size of `off_t', as computed by sizeof. */
-#undef SIZEOF_OFF_T
-
-/* The size of `signed int', as computed by sizeof. */
-#undef SIZEOF_SIGNED_INT
-
-/* The size of `signed long', as computed by sizeof. */
-#undef SIZEOF_SIGNED_LONG
-
-/* The size of `signed long long', as computed by sizeof. */
-#undef SIZEOF_SIGNED_LONG_LONG
-
-/* The size of `signed short', as computed by sizeof. */
-#undef SIZEOF_SIGNED_SHORT
-
-/* The size of `size_t', as computed by sizeof. */
-#undef SIZEOF_SIZE_T
-
-/* The size of `ssize_t', as computed by sizeof. */
-#undef SIZEOF_SSIZE_T
-
-/* The size of `unsigned int', as computed by sizeof. */
-#undef SIZEOF_UNSIGNED_INT
-
-/* The size of `unsigned int*', as computed by sizeof. */
-#undef SIZEOF_UNSIGNED_INTP
-
-/* The size of `unsigned long', as computed by sizeof. */
-#undef SIZEOF_UNSIGNED_LONG
-
 /* The size of `unsigned long long', as computed by sizeof. */
 #undef SIZEOF_UNSIGNED_LONG_LONG
 
-/* The size of `unsigned short', as computed by sizeof. */
-#undef SIZEOF_UNSIGNED_SHORT
+/* The size of `void *', as computed by sizeof. */
+#undef SIZEOF_VOID_P
 
 /* Define to 1 if the `S_IS*' macros in <sys/stat.h> do not work properly. */
 #undef STAT_MACROS_BROKEN

configure

diff --git a/configure b/configure
index 13ace88..91685bb 100755
--- a/configure
+++ b/configure
@@ -841,8 +841,7 @@
 RAQM_DELEGATE_TRUE
 RAQM_LIBS
 RAQM_CFLAGS
-FREETYPE_DELEGATE_FALSE
-FREETYPE_DELEGATE_TRUE
+MAGICKCORE_FREETYPE_DELEGATE
 FREETYPE_LIBS
 FREETYPE_CFLAGS
 FONTCONFIG_DELEGATE_FALSE
@@ -916,22 +915,6 @@
 MATH_LIBS
 POW_LIB
 LIBOBJS
-UINTPTR_F
-UINTPTR_T
-UINTMAX_F
-UINTMAX_T
-UINT64_F
-UINT64_T
-INT64_F
-INT64_T
-UINT32_F
-UINT32_T
-INT32_F
-INT32_T
-UINT16_T
-INT16_T
-UINT8_T
-INT8_T
 LIBRARY_EXTRA_CPPFLAGS
 MODULE_EXTRA_CPPFLAGS
 LIBSTDCLDFLAGS
@@ -947,6 +930,8 @@
 MAINTAINER_MODE_FALSE
 MAINTAINER_MODE_TRUE
 MAGICK_HDRI
+MAGICKCORE_ZERO_CONFIGURATION_SUPPORT_FALSE
+MAGICKCORE_ZERO_CONFIGURATION_SUPPORT_TRUE
 WITH_MODULES_FALSE
 WITH_MODULES_TRUE
 WITH_SHARED_LIBS_FALSE
@@ -2521,189 +2506,6 @@
 
 } # ac_fn_cxx_try_compile
 
-# ac_fn_c_compute_int LINENO EXPR VAR INCLUDES
-# --------------------------------------------
-# Tries to find the compile-time value of EXPR in a program that includes
-# INCLUDES, setting VAR accordingly. Returns whether the value could be
-# computed
-ac_fn_c_compute_int ()
-{
-  as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
-  if test "$cross_compiling" = yes; then
-    # Depending upon the size, compute the lo and hi bounds.
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-$4
-int
-main ()
-{
-static int test_array [1 - 2 * !(($2) >= 0)];
-test_array [0] = 0;
-return test_array [0];
-
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
-  ac_lo=0 ac_mid=0
-  while :; do
-    cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-$4
-int
-main ()
-{
-static int test_array [1 - 2 * !(($2) <= $ac_mid)];
-test_array [0] = 0;
-return test_array [0];
-
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
-  ac_hi=$ac_mid; break
-else
-  as_fn_arith $ac_mid + 1 && ac_lo=$as_val
-			if test $ac_lo -le $ac_mid; then
-			  ac_lo= ac_hi=
-			  break
-			fi
-			as_fn_arith 2 '*' $ac_mid + 1 && ac_mid=$as_val
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-  done
-else
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-$4
-int
-main ()
-{
-static int test_array [1 - 2 * !(($2) < 0)];
-test_array [0] = 0;
-return test_array [0];
-
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
-  ac_hi=-1 ac_mid=-1
-  while :; do
-    cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-$4
-int
-main ()
-{
-static int test_array [1 - 2 * !(($2) >= $ac_mid)];
-test_array [0] = 0;
-return test_array [0];
-
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
-  ac_lo=$ac_mid; break
-else
-  as_fn_arith '(' $ac_mid ')' - 1 && ac_hi=$as_val
-			if test $ac_mid -le $ac_hi; then
-			  ac_lo= ac_hi=
-			  break
-			fi
-			as_fn_arith 2 '*' $ac_mid && ac_mid=$as_val
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-  done
-else
-  ac_lo= ac_hi=
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-# Binary search between lo and hi bounds.
-while test "x$ac_lo" != "x$ac_hi"; do
-  as_fn_arith '(' $ac_hi - $ac_lo ')' / 2 + $ac_lo && ac_mid=$as_val
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-$4
-int
-main ()
-{
-static int test_array [1 - 2 * !(($2) <= $ac_mid)];
-test_array [0] = 0;
-return test_array [0];
-
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
-  ac_hi=$ac_mid
-else
-  as_fn_arith '(' $ac_mid ')' + 1 && ac_lo=$as_val
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-done
-case $ac_lo in #((
-?*) eval "$3=\$ac_lo"; ac_retval=0 ;;
-'') ac_retval=1 ;;
-esac
-  else
-    cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-$4
-static long int longval () { return $2; }
-static unsigned long int ulongval () { return $2; }
-#include <stdio.h>
-#include <stdlib.h>
-int
-main ()
-{
-
-  FILE *f = fopen ("conftest.val", "w");
-  if (! f)
-    return 1;
-  if (($2) < 0)
-    {
-      long int i = longval ();
-      if (i != ($2))
-	return 1;
-      fprintf (f, "%ld", i);
-    }
-  else
-    {
-      unsigned long int i = ulongval ();
-      if (i != ($2))
-	return 1;
-      fprintf (f, "%lu", i);
-    }
-  /* Do not output a trailing newline, as this causes \r\n confusion
-     on some platforms.  */
-  return ferror (f) || fclose (f) != 0;
-
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_run "$LINENO"; then :
-  echo >>conftest.val; read $3 <conftest.val; ac_retval=0
-else
-  ac_retval=1
-fi
-rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
-  conftest.$ac_objext conftest.beam conftest.$ac_ext
-rm -f conftest.val
-
-  fi
-  eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
-  as_fn_set_status $ac_retval
-
-} # ac_fn_c_compute_int
-
 # ac_fn_c_try_link LINENO
 # -----------------------
 # Try to link conftest.$ac_ext, and return whether this succeeded.
@@ -3187,6 +2989,189 @@
 
 } # ac_fn_c_find_uintX_t
 
+# ac_fn_c_compute_int LINENO EXPR VAR INCLUDES
+# --------------------------------------------
+# Tries to find the compile-time value of EXPR in a program that includes
+# INCLUDES, setting VAR accordingly. Returns whether the value could be
+# computed
+ac_fn_c_compute_int ()
+{
+  as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
+  if test "$cross_compiling" = yes; then
+    # Depending upon the size, compute the lo and hi bounds.
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+$4
+int
+main ()
+{
+static int test_array [1 - 2 * !(($2) >= 0)];
+test_array [0] = 0;
+return test_array [0];
+
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+  ac_lo=0 ac_mid=0
+  while :; do
+    cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+$4
+int
+main ()
+{
+static int test_array [1 - 2 * !(($2) <= $ac_mid)];
+test_array [0] = 0;
+return test_array [0];
+
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+  ac_hi=$ac_mid; break
+else
+  as_fn_arith $ac_mid + 1 && ac_lo=$as_val
+			if test $ac_lo -le $ac_mid; then
+			  ac_lo= ac_hi=
+			  break
+			fi
+			as_fn_arith 2 '*' $ac_mid + 1 && ac_mid=$as_val
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+  done
+else
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+$4
+int
+main ()
+{
+static int test_array [1 - 2 * !(($2) < 0)];
+test_array [0] = 0;
+return test_array [0];
+
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+  ac_hi=-1 ac_mid=-1
+  while :; do
+    cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+$4
+int
+main ()
+{
+static int test_array [1 - 2 * !(($2) >= $ac_mid)];
+test_array [0] = 0;
+return test_array [0];
+
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+  ac_lo=$ac_mid; break
+else
+  as_fn_arith '(' $ac_mid ')' - 1 && ac_hi=$as_val
+			if test $ac_mid -le $ac_hi; then
+			  ac_lo= ac_hi=
+			  break
+			fi
+			as_fn_arith 2 '*' $ac_mid && ac_mid=$as_val
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+  done
+else
+  ac_lo= ac_hi=
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+# Binary search between lo and hi bounds.
+while test "x$ac_lo" != "x$ac_hi"; do
+  as_fn_arith '(' $ac_hi - $ac_lo ')' / 2 + $ac_lo && ac_mid=$as_val
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+$4
+int
+main ()
+{
+static int test_array [1 - 2 * !(($2) <= $ac_mid)];
+test_array [0] = 0;
+return test_array [0];
+
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+  ac_hi=$ac_mid
+else
+  as_fn_arith '(' $ac_mid ')' + 1 && ac_lo=$as_val
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+done
+case $ac_lo in #((
+?*) eval "$3=\$ac_lo"; ac_retval=0 ;;
+'') ac_retval=1 ;;
+esac
+  else
+    cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+$4
+static long int longval () { return $2; }
+static unsigned long int ulongval () { return $2; }
+#include <stdio.h>
+#include <stdlib.h>
+int
+main ()
+{
+
+  FILE *f = fopen ("conftest.val", "w");
+  if (! f)
+    return 1;
+  if (($2) < 0)
+    {
+      long int i = longval ();
+      if (i != ($2))
+	return 1;
+      fprintf (f, "%ld", i);
+    }
+  else
+    {
+      unsigned long int i = ulongval ();
+      if (i != ($2))
+	return 1;
+      fprintf (f, "%lu", i);
+    }
+  /* Do not output a trailing newline, as this causes \r\n confusion
+     on some platforms.  */
+  return ferror (f) || fclose (f) != 0;
+
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_run "$LINENO"; then :
+  echo >>conftest.val; read $3 <conftest.val; ac_retval=0
+else
+  ac_retval=1
+fi
+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
+  conftest.$ac_objext conftest.beam conftest.$ac_ext
+rm -f conftest.val
+
+  fi
+  eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
+  as_fn_set_status $ac_retval
+
+} # ac_fn_c_compute_int
+
 # ac_fn_cxx_check_header_mongrel LINENO HEADER VAR INCLUDES
 # ---------------------------------------------------------
 # Tests whether HEADER exists, giving a warning if it cannot be compiled using
@@ -4520,7 +4505,7 @@
 # Save initial user-tunable values
 #
 USER_LIBS=$LIBS
-for var in CC CFLAGS CPPFLAGS CXX CXXCPP LDFLAGS LIBS ; do
+for var in CC CFLAGS CPPFLAGS CXX CXXCPP LDFLAGS AR_FLAGS LIBS ; do
   eval isset=\${$var+set}
     if test "$isset" = 'set'; then
         eval val=$`echo $var`
@@ -4581,7 +4566,7 @@
 
 MAGICK_VERSION=7.0.9-9
 
-MAGICK_GIT_REVISION=16475:5ddc33e6c:20191207
+MAGICK_GIT_REVISION=16474:014110dbd:20191207
 
 
 # Substitute library versioning
@@ -9422,41 +9407,6 @@
 
 
 
-# Test for 64-bit build.
-# The cast to long int works around a bug in the HP C Compiler
-# version HP92453-01 B.11.11.23709.GP, which incorrectly rejects
-# declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'.
-# This bug is HP SR number 8606223364.
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking size of size_t" >&5
-$as_echo_n "checking size of size_t... " >&6; }
-if ${ac_cv_sizeof_size_t+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  if ac_fn_c_compute_int "$LINENO" "(long int) (sizeof (size_t))" "ac_cv_sizeof_size_t"        "$ac_includes_default"; then :
-
-else
-  if test "$ac_cv_type_size_t" = yes; then
-     { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-as_fn_error 77 "cannot compute sizeof (size_t)
-See \`config.log' for more details" "$LINENO" 5; }
-   else
-     ac_cv_sizeof_size_t=0
-   fi
-fi
-
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sizeof_size_t" >&5
-$as_echo "$ac_cv_sizeof_size_t" >&6; }
-
-
-
-cat >>confdefs.h <<_ACEOF
-#define SIZEOF_SIZE_T $ac_cv_sizeof_size_t
-_ACEOF
-
-
-
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler vendor" >&5
 $as_echo_n "checking for C compiler vendor... " >&6; }
 if ${ax_cv_c_compiler_vendor+:} false; then :
@@ -11778,6 +11728,7 @@
 
 
 # Configure libtool
+: ${AR_FLAGS=cr}
 enable_dlopen=yes
 
 
@@ -22786,6 +22737,14 @@
 
     MAGICK_FEATURES="Zero-configuration $MAGICK_FEATURES"
 fi
+ if test "$enable_zero_configuration" = yes; then
+  MAGICKCORE_ZERO_CONFIGURATION_SUPPORT_TRUE=
+  MAGICKCORE_ZERO_CONFIGURATION_SUPPORT_FALSE='#'
+else
+  MAGICKCORE_ZERO_CONFIGURATION_SUPPORT_TRUE='#'
+  MAGICKCORE_ZERO_CONFIGURATION_SUPPORT_FALSE=
+fi
+
 
 # Build a high dynamic range version of ImageMagick.
 # Check whether --enable-hdri was given.
@@ -24596,160 +24555,6 @@
 fi
 
 
-
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for long double" >&5
-$as_echo_n "checking for long double... " >&6; }
-if ${ac_cv_type_long_double+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  if test "$GCC" = yes; then
-       ac_cv_type_long_double=yes
-     else
-       cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-/* The Stardent Vistra knows sizeof (long double), but does
-		 not support it.  */
-	      long double foo = 0.0L;
-int
-main ()
-{
-static int test_array [1 - 2 * !(/* On Ultrix 4.3 cc, long double is 4 and double is 8.  */
-	      sizeof (double) <= sizeof (long double))];
-test_array [0] = 0;
-return test_array [0];
-
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
-  ac_cv_type_long_double=yes
-else
-  ac_cv_type_long_double=no
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-     fi
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_type_long_double" >&5
-$as_echo "$ac_cv_type_long_double" >&6; }
-  if test $ac_cv_type_long_double = yes; then
-
-$as_echo "#define HAVE_LONG_DOUBLE 1" >>confdefs.h
-
-  fi
-
-
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for long double with more range or precision than double" >&5
-$as_echo_n "checking for long double with more range or precision than double... " >&6; }
-if ${ac_cv_type_long_double_wider+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-#include <float.h>
-	    long double const a[] =
-	      {
-		 0.0L, DBL_MIN, DBL_MAX, DBL_EPSILON,
-		 LDBL_MIN, LDBL_MAX, LDBL_EPSILON
-	      };
-	    long double
-	    f (long double x)
-	    {
-	       return ((x + (unsigned long int) 10) * (-1 / x) + a[0]
-			+ (x ? f (x) : 'c'));
-	    }
-
-int
-main ()
-{
-static int test_array [1 - 2 * !((0 < ((DBL_MAX_EXP < LDBL_MAX_EXP)
-		   + (DBL_MANT_DIG < LDBL_MANT_DIG)
-		   - (LDBL_MAX_EXP < DBL_MAX_EXP)
-		   - (LDBL_MANT_DIG < DBL_MANT_DIG)))
-	    && (int) LDBL_EPSILON == 0
-	  )];
-test_array [0] = 0;
-return test_array [0];
-
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
-  ac_cv_type_long_double_wider=yes
-else
-  ac_cv_type_long_double_wider=no
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_type_long_double_wider" >&5
-$as_echo "$ac_cv_type_long_double_wider" >&6; }
-  if test $ac_cv_type_long_double_wider = yes; then
-
-$as_echo "#define HAVE_LONG_DOUBLE_WIDER 1" >>confdefs.h
-
-  fi
-
-
-
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for long long int" >&5
-$as_echo_n "checking for long long int... " >&6; }
-if ${ac_cv_type_long_long_int+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  ac_cv_type_long_long_int=yes
-      if test "x${ac_cv_prog_cc_c99-no}" = xno; then
-	ac_cv_type_long_long_int=$ac_cv_type_unsigned_long_long_int
-	if test $ac_cv_type_long_long_int = yes; then
-	  	  	  	  if test "$cross_compiling" = yes; then :
-  :
-else
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-#include <limits.h>
-		 #ifndef LLONG_MAX
-		 # define HALF \
-			  (1LL << (sizeof (long long int) * CHAR_BIT - 2))
-		 # define LLONG_MAX (HALF - 1 + HALF)
-		 #endif
-int
-main ()
-{
-long long int n = 1;
-		 int i;
-		 for (i = 0; ; i++)
-		   {
-		     long long int m = n << i;
-		     if (m >> i != n)
-		       return 1;
-		     if (LLONG_MAX / 2 < m)
-		       break;
-		   }
-		 return 0;
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_run "$LINENO"; then :
-
-else
-  ac_cv_type_long_long_int=no
-fi
-rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
-  conftest.$ac_objext conftest.beam conftest.$ac_ext
-fi
-
-	fi
-      fi
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_type_long_long_int" >&5
-$as_echo "$ac_cv_type_long_long_int" >&6; }
-  if test $ac_cv_type_long_long_int = yes; then
-
-$as_echo "#define HAVE_LONG_LONG_INT 1" >>confdefs.h
-
-  fi
-
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for mbstate_t" >&5
 $as_echo_n "checking for mbstate_t... " >&6; }
 if ${ac_cv_type_mbstate_t+:} false; then :
@@ -24981,98 +24786,7 @@
 
 
 
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for unsigned long long int" >&5
-$as_echo_n "checking for unsigned long long int... " >&6; }
-if ${ac_cv_type_unsigned_long_long_int+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  ac_cv_type_unsigned_long_long_int=yes
-     if test "x${ac_cv_prog_cc_c99-no}" = xno; then
-       cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-  /* For now, do not test the preprocessor; as of 2007 there are too many
-	 implementations with broken preprocessors.  Perhaps this can
-	 be revisited in 2012.  In the meantime, code should not expect
-	 #if to work with literals wider than 32 bits.  */
-      /* Test literals.  */
-      long long int ll = 9223372036854775807ll;
-      long long int nll = -9223372036854775807LL;
-      unsigned long long int ull = 18446744073709551615ULL;
-      /* Test constant expressions.   */
-      typedef int a[((-9223372036854775807LL < 0 && 0 < 9223372036854775807ll)
-		     ? 1 : -1)];
-      typedef int b[(18446744073709551615ULL <= (unsigned long long int) -1
-		     ? 1 : -1)];
-      int i = 63;
-int
-main ()
-{
-/* Test availability of runtime routines for shift and division.  */
-      long long int llmax = 9223372036854775807ll;
-      unsigned long long int ullmax = 18446744073709551615ull;
-      return ((ll << 63) | (ll >> 63) | (ll < i) | (ll > i)
-	      | (llmax / ll) | (llmax % ll)
-	      | (ull << 63) | (ull >> 63) | (ull << i) | (ull >> i)
-	      | (ullmax / ull) | (ullmax % ull));
-  ;
-  return 0;
-}
-
-_ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
-
-else
-  ac_cv_type_unsigned_long_long_int=no
-fi
-rm -f core conftest.err conftest.$ac_objext \
-    conftest$ac_exeext conftest.$ac_ext
-     fi
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_type_unsigned_long_long_int" >&5
-$as_echo "$ac_cv_type_unsigned_long_long_int" >&6; }
-  if test $ac_cv_type_unsigned_long_long_int = yes; then
-
-$as_echo "#define HAVE_UNSIGNED_LONG_LONG_INT 1" >>confdefs.h
-
-  fi
-
-
-ac_fn_c_check_type "$LINENO" "locale_t" "ac_cv_type_locale_t" "#include <xlocale.h>
-"
-if test "x$ac_cv_type_locale_t" = xyes; then :
-
-cat >>confdefs.h <<_ACEOF
-#define HAVE_LOCALE_T 1
-_ACEOF
-
-
-fi
-
-
 # Float_t and double_t are intended to be the the most efficient type.
-ac_fn_c_check_type "$LINENO" "float_t" "ac_cv_type_float_t" "#include <math.h>
-"
-if test "x$ac_cv_type_float_t" = xyes; then :
-
-cat >>confdefs.h <<_ACEOF
-#define HAVE_FLOAT_T 1
-_ACEOF
-
-
-fi
-
-ac_fn_c_check_type "$LINENO" "double_t" "ac_cv_type_double_t" "#include <math.h>
-"
-if test "x$ac_cv_type_double_t" = xyes; then :
-
-cat >>confdefs.h <<_ACEOF
-#define HAVE_DOUBLE_T 1
-_ACEOF
-
-
-fi
-
 # The cast to long int works around a bug in the HP C Compiler
 # version HP92453-01 B.11.11.23709.GP, which incorrectly rejects
 # declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'.
@@ -25243,252 +24957,6 @@
 
 
 
-# Obtain size of an 'signed short' and define as SIZEOF_SIGNED_SHORT
-# The cast to long int works around a bug in the HP C Compiler
-# version HP92453-01 B.11.11.23709.GP, which incorrectly rejects
-# declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'.
-# This bug is HP SR number 8606223364.
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking size of signed short" >&5
-$as_echo_n "checking size of signed short... " >&6; }
-if ${ac_cv_sizeof_signed_short+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  if ac_fn_c_compute_int "$LINENO" "(long int) (sizeof (signed short))" "ac_cv_sizeof_signed_short"        "$ac_includes_default"; then :
-
-else
-  if test "$ac_cv_type_signed_short" = yes; then
-     { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-as_fn_error 77 "cannot compute sizeof (signed short)
-See \`config.log' for more details" "$LINENO" 5; }
-   else
-     ac_cv_sizeof_signed_short=0
-   fi
-fi
-
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sizeof_signed_short" >&5
-$as_echo "$ac_cv_sizeof_signed_short" >&6; }
-
-
-
-cat >>confdefs.h <<_ACEOF
-#define SIZEOF_SIGNED_SHORT $ac_cv_sizeof_signed_short
-_ACEOF
-
-
-
-# Obtain size of an 'unsigned short' and define as SIZEOF_UNSIGNED_SHORT
-# The cast to long int works around a bug in the HP C Compiler
-# version HP92453-01 B.11.11.23709.GP, which incorrectly rejects
-# declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'.
-# This bug is HP SR number 8606223364.
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking size of unsigned short" >&5
-$as_echo_n "checking size of unsigned short... " >&6; }
-if ${ac_cv_sizeof_unsigned_short+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  if ac_fn_c_compute_int "$LINENO" "(long int) (sizeof (unsigned short))" "ac_cv_sizeof_unsigned_short"        "$ac_includes_default"; then :
-
-else
-  if test "$ac_cv_type_unsigned_short" = yes; then
-     { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-as_fn_error 77 "cannot compute sizeof (unsigned short)
-See \`config.log' for more details" "$LINENO" 5; }
-   else
-     ac_cv_sizeof_unsigned_short=0
-   fi
-fi
-
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sizeof_unsigned_short" >&5
-$as_echo "$ac_cv_sizeof_unsigned_short" >&6; }
-
-
-
-cat >>confdefs.h <<_ACEOF
-#define SIZEOF_UNSIGNED_SHORT $ac_cv_sizeof_unsigned_short
-_ACEOF
-
-
-
-# Obtain size of an 'signed int' and define as SIZEOF_SIGNED_INT
-# The cast to long int works around a bug in the HP C Compiler
-# version HP92453-01 B.11.11.23709.GP, which incorrectly rejects
-# declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'.
-# This bug is HP SR number 8606223364.
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking size of signed int" >&5
-$as_echo_n "checking size of signed int... " >&6; }
-if ${ac_cv_sizeof_signed_int+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  if ac_fn_c_compute_int "$LINENO" "(long int) (sizeof (signed int))" "ac_cv_sizeof_signed_int"        "$ac_includes_default"; then :
-
-else
-  if test "$ac_cv_type_signed_int" = yes; then
-     { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-as_fn_error 77 "cannot compute sizeof (signed int)
-See \`config.log' for more details" "$LINENO" 5; }
-   else
-     ac_cv_sizeof_signed_int=0
-   fi
-fi
-
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sizeof_signed_int" >&5
-$as_echo "$ac_cv_sizeof_signed_int" >&6; }
-
-
-
-cat >>confdefs.h <<_ACEOF
-#define SIZEOF_SIGNED_INT $ac_cv_sizeof_signed_int
-_ACEOF
-
-
-
-# Obtain size of an 'unsigned int' and define as SIZEOF_UNSIGNED_INT
-# The cast to long int works around a bug in the HP C Compiler
-# version HP92453-01 B.11.11.23709.GP, which incorrectly rejects
-# declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'.
-# This bug is HP SR number 8606223364.
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking size of unsigned int" >&5
-$as_echo_n "checking size of unsigned int... " >&6; }
-if ${ac_cv_sizeof_unsigned_int+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  if ac_fn_c_compute_int "$LINENO" "(long int) (sizeof (unsigned int))" "ac_cv_sizeof_unsigned_int"        "$ac_includes_default"; then :
-
-else
-  if test "$ac_cv_type_unsigned_int" = yes; then
-     { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-as_fn_error 77 "cannot compute sizeof (unsigned int)
-See \`config.log' for more details" "$LINENO" 5; }
-   else
-     ac_cv_sizeof_unsigned_int=0
-   fi
-fi
-
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sizeof_unsigned_int" >&5
-$as_echo "$ac_cv_sizeof_unsigned_int" >&6; }
-
-
-
-cat >>confdefs.h <<_ACEOF
-#define SIZEOF_UNSIGNED_INT $ac_cv_sizeof_unsigned_int
-_ACEOF
-
-
-
-# Obtain size of a 'signed long' and define as SIZEOF_SIGNED_LONG
-# The cast to long int works around a bug in the HP C Compiler
-# version HP92453-01 B.11.11.23709.GP, which incorrectly rejects
-# declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'.
-# This bug is HP SR number 8606223364.
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking size of signed long" >&5
-$as_echo_n "checking size of signed long... " >&6; }
-if ${ac_cv_sizeof_signed_long+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  if ac_fn_c_compute_int "$LINENO" "(long int) (sizeof (signed long))" "ac_cv_sizeof_signed_long"        "$ac_includes_default"; then :
-
-else
-  if test "$ac_cv_type_signed_long" = yes; then
-     { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-as_fn_error 77 "cannot compute sizeof (signed long)
-See \`config.log' for more details" "$LINENO" 5; }
-   else
-     ac_cv_sizeof_signed_long=0
-   fi
-fi
-
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sizeof_signed_long" >&5
-$as_echo "$ac_cv_sizeof_signed_long" >&6; }
-
-
-
-cat >>confdefs.h <<_ACEOF
-#define SIZEOF_SIGNED_LONG $ac_cv_sizeof_signed_long
-_ACEOF
-
-
-
-# Obtain size of a 'unsigned long' and define as SIZEOF_UNSIGNED_LONG
-# The cast to long int works around a bug in the HP C Compiler
-# version HP92453-01 B.11.11.23709.GP, which incorrectly rejects
-# declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'.
-# This bug is HP SR number 8606223364.
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking size of unsigned long" >&5
-$as_echo_n "checking size of unsigned long... " >&6; }
-if ${ac_cv_sizeof_unsigned_long+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  if ac_fn_c_compute_int "$LINENO" "(long int) (sizeof (unsigned long))" "ac_cv_sizeof_unsigned_long"        "$ac_includes_default"; then :
-
-else
-  if test "$ac_cv_type_unsigned_long" = yes; then
-     { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-as_fn_error 77 "cannot compute sizeof (unsigned long)
-See \`config.log' for more details" "$LINENO" 5; }
-   else
-     ac_cv_sizeof_unsigned_long=0
-   fi
-fi
-
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sizeof_unsigned_long" >&5
-$as_echo "$ac_cv_sizeof_unsigned_long" >&6; }
-
-
-
-cat >>confdefs.h <<_ACEOF
-#define SIZEOF_UNSIGNED_LONG $ac_cv_sizeof_unsigned_long
-_ACEOF
-
-
-
-# Obtain size of a 'long long' and define as SIZEOF_SIGNED_LONG_LONG.  If
-# 'signed long long' is not supported then the value defined is zero.
-# The cast to long int works around a bug in the HP C Compiler
-# version HP92453-01 B.11.11.23709.GP, which incorrectly rejects
-# declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'.
-# This bug is HP SR number 8606223364.
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking size of signed long long" >&5
-$as_echo_n "checking size of signed long long... " >&6; }
-if ${ac_cv_sizeof_signed_long_long+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  if ac_fn_c_compute_int "$LINENO" "(long int) (sizeof (signed long long))" "ac_cv_sizeof_signed_long_long"        "$ac_includes_default"; then :
-
-else
-  if test "$ac_cv_type_signed_long_long" = yes; then
-     { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-as_fn_error 77 "cannot compute sizeof (signed long long)
-See \`config.log' for more details" "$LINENO" 5; }
-   else
-     ac_cv_sizeof_signed_long_long=0
-   fi
-fi
-
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sizeof_signed_long_long" >&5
-$as_echo "$ac_cv_sizeof_signed_long_long" >&6; }
-
-
-
-cat >>confdefs.h <<_ACEOF
-#define SIZEOF_SIGNED_LONG_LONG $ac_cv_sizeof_signed_long_long
-_ACEOF
-
-
-
 # Obtain size of a 'unsigned long long' and define as
 # SIZEOF_UNSIGNED_LONG_LONG.  If 'unsigned long long' is not
 # supported then the value defined is zero.
@@ -25526,284 +24994,40 @@
 
 
 
-# Obtain size of off_t and define as SIZEOF_OFF_T
 # The cast to long int works around a bug in the HP C Compiler
 # version HP92453-01 B.11.11.23709.GP, which incorrectly rejects
 # declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'.
 # This bug is HP SR number 8606223364.
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking size of off_t" >&5
-$as_echo_n "checking size of off_t... " >&6; }
-if ${ac_cv_sizeof_off_t+:} false; then :
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking size of void *" >&5
+$as_echo_n "checking size of void *... " >&6; }
+if ${ac_cv_sizeof_void_p+:} false; then :
   $as_echo_n "(cached) " >&6
 else
-  if ac_fn_c_compute_int "$LINENO" "(long int) (sizeof (off_t))" "ac_cv_sizeof_off_t"        "$ac_includes_default"; then :
+  if ac_fn_c_compute_int "$LINENO" "(long int) (sizeof (void *))" "ac_cv_sizeof_void_p"        "$ac_includes_default"; then :
 
 else
-  if test "$ac_cv_type_off_t" = yes; then
+  if test "$ac_cv_type_void_p" = yes; then
      { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-as_fn_error 77 "cannot compute sizeof (off_t)
+as_fn_error 77 "cannot compute sizeof (void *)
 See \`config.log' for more details" "$LINENO" 5; }
    else
-     ac_cv_sizeof_off_t=0
+     ac_cv_sizeof_void_p=0
    fi
 fi
 
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sizeof_off_t" >&5
-$as_echo "$ac_cv_sizeof_off_t" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sizeof_void_p" >&5
+$as_echo "$ac_cv_sizeof_void_p" >&6; }
 
 
 
 cat >>confdefs.h <<_ACEOF
-#define SIZEOF_OFF_T $ac_cv_sizeof_off_t
+#define SIZEOF_VOID_P $ac_cv_sizeof_void_p
 _ACEOF
 
 
 
-# Obtain size of size_t and define as SIZEOF_SIZE_T
-# The cast to long int works around a bug in the HP C Compiler
-# version HP92453-01 B.11.11.23709.GP, which incorrectly rejects
-# declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'.
-# This bug is HP SR number 8606223364.
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking size of size_t" >&5
-$as_echo_n "checking size of size_t... " >&6; }
-if ${ac_cv_sizeof_size_t+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  if ac_fn_c_compute_int "$LINENO" "(long int) (sizeof (size_t))" "ac_cv_sizeof_size_t"        "$ac_includes_default"; then :
-
-else
-  if test "$ac_cv_type_size_t" = yes; then
-     { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-as_fn_error 77 "cannot compute sizeof (size_t)
-See \`config.log' for more details" "$LINENO" 5; }
-   else
-     ac_cv_sizeof_size_t=0
-   fi
-fi
-
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sizeof_size_t" >&5
-$as_echo "$ac_cv_sizeof_size_t" >&6; }
-
-
-
-cat >>confdefs.h <<_ACEOF
-#define SIZEOF_SIZE_T $ac_cv_sizeof_size_t
-_ACEOF
-
-
-
-# Obtain size of ssize_t and define as SIZEOF_SSIZE_T
-# The cast to long int works around a bug in the HP C Compiler
-# version HP92453-01 B.11.11.23709.GP, which incorrectly rejects
-# declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'.
-# This bug is HP SR number 8606223364.
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking size of ssize_t" >&5
-$as_echo_n "checking size of ssize_t... " >&6; }
-if ${ac_cv_sizeof_ssize_t+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  if ac_fn_c_compute_int "$LINENO" "(long int) (sizeof (ssize_t))" "ac_cv_sizeof_ssize_t"        "$ac_includes_default"; then :
-
-else
-  if test "$ac_cv_type_ssize_t" = yes; then
-     { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-as_fn_error 77 "cannot compute sizeof (ssize_t)
-See \`config.log' for more details" "$LINENO" 5; }
-   else
-     ac_cv_sizeof_ssize_t=0
-   fi
-fi
-
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sizeof_ssize_t" >&5
-$as_echo "$ac_cv_sizeof_ssize_t" >&6; }
-
-
-
-cat >>confdefs.h <<_ACEOF
-#define SIZEOF_SSIZE_T $ac_cv_sizeof_ssize_t
-_ACEOF
-
-
-
-# Obtain size of an unsigned int pointer and define as SIZEOF_UNSIGNED_INTP
-# The cast to long int works around a bug in the HP C Compiler
-# version HP92453-01 B.11.11.23709.GP, which incorrectly rejects
-# declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'.
-# This bug is HP SR number 8606223364.
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking size of unsigned int*" >&5
-$as_echo_n "checking size of unsigned int*... " >&6; }
-if ${ac_cv_sizeof_unsigned_intp+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  if ac_fn_c_compute_int "$LINENO" "(long int) (sizeof (unsigned int*))" "ac_cv_sizeof_unsigned_intp"        "$ac_includes_default"; then :
-
-else
-  if test "$ac_cv_type_unsigned_intp" = yes; then
-     { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-as_fn_error 77 "cannot compute sizeof (unsigned int*)
-See \`config.log' for more details" "$LINENO" 5; }
-   else
-     ac_cv_sizeof_unsigned_intp=0
-   fi
-fi
-
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sizeof_unsigned_intp" >&5
-$as_echo "$ac_cv_sizeof_unsigned_intp" >&6; }
-
-
-
-cat >>confdefs.h <<_ACEOF
-#define SIZEOF_UNSIGNED_INTP $ac_cv_sizeof_unsigned_intp
-_ACEOF
-
-
-
-#
-# Compute sized types for current CPU and compiler options.
-#
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for signed 8-bit type" >&5
-$as_echo_n "checking for signed 8-bit type... " >&6; }
-INT8_T='signed char'
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $INT8_T" >&5
-$as_echo "$INT8_T" >&6; }
-
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for unsigned 8-bit type" >&5
-$as_echo_n "checking for unsigned 8-bit type... " >&6; }
-UINT8_T='unsigned char'
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $UINT8_T" >&5
-$as_echo "$UINT8_T" >&6; }
-
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for signed 16-bit type" >&5
-$as_echo_n "checking for signed 16-bit type... " >&6; }
-INT16_T='signed short'
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $INT16_T" >&5
-$as_echo "$INT16_T" >&6; }
-
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for unsigned 16-bit type" >&5
-$as_echo_n "checking for unsigned 16-bit type... " >&6; }
-UINT16_T='unsigned short'
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $UINT16_T" >&5
-$as_echo "$UINT16_T" >&6; }
-
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for signed 32-bit type" >&5
-$as_echo_n "checking for signed 32-bit type... " >&6; }
-INT32_T='none'
-INT32_F='none'
-if test $ac_cv_sizeof_signed_int -eq 4; then
-  INT32_T='signed int'
-  INT32_F='""'
-elif test $ac_cv_sizeof_signed_long -eq 4; then
-  INT32_T='signed long'
-  INT32_F='"l"'
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $INT32_T" >&5
-$as_echo "$INT32_T" >&6; }
-
-
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for unsigned 32-bit type" >&5
-$as_echo_n "checking for unsigned 32-bit type... " >&6; }
-UINT32_T='none'
-UINT32_F='none'
-if test $ac_cv_sizeof_unsigned_int -eq 4; then
-  UINT32_T='unsigned int'
-  UINT32_F='""'
-elif test $ac_cv_sizeof_unsigned_long -eq 4; then
-  UINT32_T='unsigned long'
-  UINT32_F='"l"'
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $UINT32_T" >&5
-$as_echo "$UINT32_T" >&6; }
-
-
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for signed 64-bit type" >&5
-$as_echo_n "checking for signed 64-bit type... " >&6; }
-INT64_T='none'
-INT64_F='none'
-if test $ac_cv_sizeof_signed_long -eq 8; then
-  INT64_T='signed long'
-  INT64_F='"l"'
-elif test $ac_cv_sizeof_signed_long_long -eq 8; then
-  INT64_T='signed long long'
-  INT64_F='"ll"'
-fi
-case "${host_os}" in
-  mingw* )
-    INT64_F='"I64"'
-    ;;
-esac
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $INT64_T" >&5
-$as_echo "$INT64_T" >&6; }
-
-
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for unsigned 64-bit type" >&5
-$as_echo_n "checking for unsigned 64-bit type... " >&6; }
-UINT64_T='none'
-UINT64_F='none'
-if test $ac_cv_sizeof_unsigned_long -eq 8; then
-  UINT64_T='unsigned long'
-  UINT64_F='"l"'
-elif test $ac_cv_sizeof_unsigned_long_long -eq 8; then
-  UINT64_T='unsigned long long'
-  UINT64_F='"ll"'
-fi
-case "${host_os}" in
-  mingw* )
-    UINT64_F='"I64"'
-    ;;
-esac
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $UINT64_T" >&5
-$as_echo "$UINT64_T" >&6; }
-
-
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for unsigned maximum type" >&5
-$as_echo_n "checking for unsigned maximum type... " >&6; }
-UINTMAX_T='none'
-UINTMAX_F='none'
-if test "$UINT64_T" != 'none'; then
-  UINTMAX_T=$UINT64_T
-  UINTMAX_F=$UINT64_F
-elif test "$UINT32_T" != 'none'; then
-  UINTMAX_T=$UINT32_T
-  UINTMAX_F=$UINT32_F
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $UINTMAX_T" >&5
-$as_echo "$UINTMAX_T" >&6; }
-
-
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for pointer difference type" >&5
-$as_echo_n "checking for pointer difference type... " >&6; }
-UINTPTR_T='none'
-UINTPTR_F='none'
-if test $ac_cv_sizeof_unsigned_long -eq $ac_cv_sizeof_unsigned_intp; then
-  UINTPTR_T='unsigned long'
-  UINTPTR_F='"l"'
-elif test $ac_cv_sizeof_unsigned_long_long -eq $ac_cv_sizeof_unsigned_intp; then
-  UINTPTR_T='unsigned long long'
-  UINTPTR_F='"ll"'
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $UINTPTR_T" >&5
-$as_echo "$UINTPTR_T" >&6; }
-
-
-
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether our compiler supports __func__" >&5
 $as_echo_n "checking whether our compiler supports __func__... " >&6; }
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -26458,39 +25682,6 @@
 fi
 
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking return type of signal handlers" >&5
-$as_echo_n "checking return type of signal handlers... " >&6; }
-if ${ac_cv_type_signal+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-#include <sys/types.h>
-#include <signal.h>
-
-int
-main ()
-{
-return *(signal (0, 0)) (0) == 1;
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
-  ac_cv_type_signal=int
-else
-  ac_cv_type_signal=void
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_type_signal" >&5
-$as_echo "$ac_cv_type_signal" >&6; }
-
-cat >>confdefs.h <<_ACEOF
-#define RETSIGTYPE $ac_cv_type_signal
-_ACEOF
-
-
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for working strtod" >&5
 $as_echo_n "checking for working strtod... " >&6; }
 if ${ac_cv_func_strtod+:} false; then :
@@ -31062,15 +30253,11 @@
 $as_echo "#define FREETYPE_DELEGATE 1" >>confdefs.h
 
   CFLAGS="$FREETYPE_CFLAGS $CFLAGS"
+  MAGICKCORE_FREETYPE_DELEGATE=1
+else
+  MAGICKCORE_FREETYPE_DELEGATE=0
 fi
 
- if test "$have_freetype" = 'yes'; then
-  FREETYPE_DELEGATE_TRUE=
-  FREETYPE_DELEGATE_FALSE='#'
-else
-  FREETYPE_DELEGATE_TRUE='#'
-  FREETYPE_DELEGATE_FALSE=
-fi
 
 
 
@@ -37504,6 +36691,10 @@
   as_fn_error $? "conditional \"WITH_MODULES\" was never defined.
 Usually this means the macro was only invoked conditionally." "$LINENO" 5
 fi
+if test -z "${MAGICKCORE_ZERO_CONFIGURATION_SUPPORT_TRUE}" && test -z "${MAGICKCORE_ZERO_CONFIGURATION_SUPPORT_FALSE}"; then
+  as_fn_error $? "conditional \"MAGICKCORE_ZERO_CONFIGURATION_SUPPORT\" was never defined.
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
+fi
 if test -z "${MAINTAINER_MODE_TRUE}" && test -z "${MAINTAINER_MODE_FALSE}"; then
   as_fn_error $? "conditional \"MAINTAINER_MODE\" was never defined.
 Usually this means the macro was only invoked conditionally." "$LINENO" 5
@@ -37585,10 +36776,6 @@
   as_fn_error $? "conditional \"FONTCONFIG_DELEGATE\" was never defined.
 Usually this means the macro was only invoked conditionally." "$LINENO" 5
 fi
-if test -z "${FREETYPE_DELEGATE_TRUE}" && test -z "${FREETYPE_DELEGATE_FALSE}"; then
-  as_fn_error $? "conditional \"FREETYPE_DELEGATE\" was never defined.
-Usually this means the macro was only invoked conditionally." "$LINENO" 5
-fi
 if test -z "${RAQM_DELEGATE_TRUE}" && test -z "${RAQM_DELEGATE_FALSE}"; then
   as_fn_error $? "conditional \"RAQM_DELEGATE\" was never defined.
 Usually this means the macro was only invoked conditionally." "$LINENO" 5

configure.ac

diff --git a/configure.ac b/configure.ac
index bc659d6..e699baa 100644
--- a/configure.ac
+++ b/configure.ac
@@ -30,7 +30,13 @@
 m4_define([magick_patchlevel_version], [9])
 m4_define([magick_version],
           [magick_major_version.magick_minor_version.magick_micro_version-magick_patchlevel_version])
-m4_define([magick_git_revision], esyscmd([sh -c "(gitversion.sh .) | awk '{ print \$1 }' | tr -d '\n'"]))
+m4_define([magick_git_revision],
+          esyscmd([
+            c=$(git log --full-history --format=tformat:. HEAD | wc -l)
+            h=$(git rev-parse --short HEAD)
+            d=$(date +%Y%m%d)
+            printf %s "$c:$h:$d"
+          ]))
 m4_define([magick_tar_name],[ImageMagick])
 
 # ==============================================================================
@@ -56,7 +62,7 @@
 # Save initial user-tunable values
 #
 USER_LIBS=$LIBS
-for var in CC CFLAGS CPPFLAGS CXX CXXCPP LDFLAGS LIBS ; do
+for var in CC CFLAGS CPPFLAGS CXX CXXCPP LDFLAGS AR_FLAGS LIBS ; do
   eval isset=\${$var+set}
     if test "$isset" = 'set'; then
         eval val=$`echo $var`
@@ -303,9 +309,6 @@
 AC_CANONICAL_BUILD
 AC_CANONICAL_HOST
 
-# Test for 64-bit build.
-AC_CHECK_SIZEOF([size_t])
-
 AX_COMPILER_VENDOR
 
 if test "x$GCC" = "xyes"; then
@@ -559,6 +562,7 @@
 AC_SUBST(LFS_CPPFLAGS)
 
 # Configure libtool
+: ${AR_FLAGS=cr}
 AC_LIBTOOL_DLOPEN
 LT_INIT([win32-dll])
 LT_LANG([C++])
@@ -659,6 +663,7 @@
     AC_DEFINE(ZERO_CONFIGURATION_SUPPORT,1,[Build self-contained, embeddable, zero-configuration ImageMagick])
     MAGICK_FEATURES="Zero-configuration $MAGICK_FEATURES"
 fi
+AM_CONDITIONAL([MAGICKCORE_ZERO_CONFIGURATION_SUPPORT], [test "$enable_zero_configuration" = yes])
 
 # Build a high dynamic range version of ImageMagick.
 AC_ARG_ENABLE([hdri],
@@ -993,9 +998,6 @@
 AC_TYPE_INT64_T
 AC_TYPE_INTMAX_T
 AC_TYPE_INTPTR_T
-AC_TYPE_LONG_DOUBLE
-AC_TYPE_LONG_DOUBLE_WIDER
-AC_TYPE_LONG_LONG_INT
 AC_TYPE_MBSTATE_T
 AC_TYPE_MODE_T
 AC_TYPE_OFF_T
@@ -1009,13 +1011,8 @@
 AC_TYPE_UINT64_T
 AC_TYPE_UINTMAX_T
 AC_TYPE_UINTPTR_T
-AC_TYPE_UNSIGNED_LONG_LONG_INT
-
-AC_CHECK_TYPES([locale_t], [], [], [[#include <xlocale.h>]])
 
 # Float_t and double_t are intended to be the the most efficient type.
-AC_CHECK_TYPES([float_t], [], [], [[#include <math.h>]])
-AC_CHECK_TYPES([double_t], [], [], [[#include <math.h>]])
 AC_CHECK_SIZEOF([float_t], [], [[#include <math.h>]])
 AC_CHECK_SIZEOF([double_t], [], [[#include <math.h>]])
 
@@ -1024,162 +1021,12 @@
 AC_CHECK_SIZEOF([double])
 AC_CHECK_SIZEOF([long double])
 
-# Obtain size of an 'signed short' and define as SIZEOF_SIGNED_SHORT
-AC_CHECK_SIZEOF(signed short)
-
-# Obtain size of an 'unsigned short' and define as SIZEOF_UNSIGNED_SHORT
-AC_CHECK_SIZEOF(unsigned short)
-
-# Obtain size of an 'signed int' and define as SIZEOF_SIGNED_INT
-AC_CHECK_SIZEOF(signed int)
-
-# Obtain size of an 'unsigned int' and define as SIZEOF_UNSIGNED_INT
-AC_CHECK_SIZEOF(unsigned int)
-
-# Obtain size of a 'signed long' and define as SIZEOF_SIGNED_LONG
-AC_CHECK_SIZEOF(signed long)
-
-# Obtain size of a 'unsigned long' and define as SIZEOF_UNSIGNED_LONG
-AC_CHECK_SIZEOF(unsigned long)
-
-# Obtain size of a 'long long' and define as SIZEOF_SIGNED_LONG_LONG.  If
-# 'signed long long' is not supported then the value defined is zero.
-AC_CHECK_SIZEOF(signed long long)
-
 # Obtain size of a 'unsigned long long' and define as
 # SIZEOF_UNSIGNED_LONG_LONG.  If 'unsigned long long' is not
 # supported then the value defined is zero.
 AC_CHECK_SIZEOF(unsigned long long)
 
-# Obtain size of off_t and define as SIZEOF_OFF_T
-AC_CHECK_SIZEOF(off_t)
-
-# Obtain size of size_t and define as SIZEOF_SIZE_T
-AC_CHECK_SIZEOF(size_t)
-
-# Obtain size of ssize_t and define as SIZEOF_SSIZE_T
-AC_CHECK_SIZEOF(ssize_t)
-
-# Obtain size of an unsigned int pointer and define as SIZEOF_UNSIGNED_INTP
-AC_CHECK_SIZEOF(unsigned int*)
-
-#
-# Compute sized types for current CPU and compiler options.
-#
-
-AC_MSG_CHECKING(for signed 8-bit type)
-INT8_T='signed char'
-AC_MSG_RESULT($INT8_T)
-AC_SUBST(INT8_T)
-
-AC_MSG_CHECKING(for unsigned 8-bit type)
-UINT8_T='unsigned char'
-AC_MSG_RESULT($UINT8_T)
-AC_SUBST(UINT8_T)
-
-AC_MSG_CHECKING(for signed 16-bit type)
-INT16_T='signed short'
-AC_MSG_RESULT($INT16_T)
-AC_SUBST(INT16_T)
-
-AC_MSG_CHECKING(for unsigned 16-bit type)
-UINT16_T='unsigned short'
-AC_MSG_RESULT($UINT16_T)
-AC_SUBST(UINT16_T)
-
-AC_MSG_CHECKING(for signed 32-bit type)
-INT32_T='none'
-INT32_F='none'
-if test $ac_cv_sizeof_signed_int -eq 4; then
-  INT32_T='signed int'
-  INT32_F='""'
-elif test $ac_cv_sizeof_signed_long -eq 4; then
-  INT32_T='signed long'
-  INT32_F='"l"'
-fi
-AC_MSG_RESULT($INT32_T)
-AC_SUBST(INT32_T)
-AC_SUBST(INT32_F)
-
-AC_MSG_CHECKING(for unsigned 32-bit type)
-UINT32_T='none'
-UINT32_F='none'
-if test $ac_cv_sizeof_unsigned_int -eq 4; then
-  UINT32_T='unsigned int'
-  UINT32_F='""'
-elif test $ac_cv_sizeof_unsigned_long -eq 4; then
-  UINT32_T='unsigned long'
-  UINT32_F='"l"'
-fi
-AC_MSG_RESULT($UINT32_T)
-AC_SUBST(UINT32_T)
-AC_SUBST(UINT32_F)
-
-AC_MSG_CHECKING(for signed 64-bit type)
-INT64_T='none'
-INT64_F='none'
-if test $ac_cv_sizeof_signed_long -eq 8; then
-  INT64_T='signed long'
-  INT64_F='"l"'
-elif test $ac_cv_sizeof_signed_long_long -eq 8; then
-  INT64_T='signed long long'
-  INT64_F='"ll"'
-fi
-case "${host_os}" in
-  mingw* )
-    INT64_F='"I64"'
-    ;;
-esac
-AC_MSG_RESULT($INT64_T)
-AC_SUBST(INT64_T)
-AC_SUBST(INT64_F)
-
-AC_MSG_CHECKING(for unsigned 64-bit type)
-UINT64_T='none'
-UINT64_F='none'
-if test $ac_cv_sizeof_unsigned_long -eq 8; then
-  UINT64_T='unsigned long'
-  UINT64_F='"l"'
-elif test $ac_cv_sizeof_unsigned_long_long -eq 8; then
-  UINT64_T='unsigned long long'
-  UINT64_F='"ll"'
-fi
-case "${host_os}" in
-  mingw* )
-    UINT64_F='"I64"'
-    ;;
-esac
-AC_MSG_RESULT($UINT64_T)
-AC_SUBST(UINT64_T)
-AC_SUBST(UINT64_F)
-
-AC_MSG_CHECKING(for unsigned maximum type)
-UINTMAX_T='none'
-UINTMAX_F='none'
-if test "$UINT64_T" != 'none'; then
-  UINTMAX_T=$UINT64_T
-  UINTMAX_F=$UINT64_F
-elif test "$UINT32_T" != 'none'; then
-  UINTMAX_T=$UINT32_T
-  UINTMAX_F=$UINT32_F
-fi
-AC_MSG_RESULT($UINTMAX_T)
-AC_SUBST(UINTMAX_T)
-AC_SUBST(UINTMAX_F)
-
-AC_MSG_CHECKING(for pointer difference type)
-UINTPTR_T='none'
-UINTPTR_F='none'
-if test $ac_cv_sizeof_unsigned_long -eq $ac_cv_sizeof_unsigned_intp; then
-  UINTPTR_T='unsigned long'
-  UINTPTR_F='"l"'
-elif test $ac_cv_sizeof_unsigned_long_long -eq $ac_cv_sizeof_unsigned_intp; then
-  UINTPTR_T='unsigned long long'
-  UINTPTR_F='"ll"'
-fi
-AC_MSG_RESULT($UINTPTR_T)
-AC_SUBST(UINTPTR_T)
-AC_SUBST(UINTPTR_F)
+AC_CHECK_SIZEOF(void *)
 
 AC_MSG_CHECKING([whether our compiler supports __func__])
 AC_TRY_COMPILE([],
@@ -1207,7 +1054,6 @@
 AC_FUNC_MEMCMP
 AC_FUNC_SELECT_ARGTYPES
 AC_FUNC_SETVBUF_REVERSED
-AC_TYPE_SIGNAL
 AC_FUNC_STRTOD
 AC_FUNC_STRERROR_R
 AC_FUNC_VPRINTF
@@ -2159,11 +2005,14 @@
 if test "$have_freetype" = 'yes'; then
   AC_DEFINE(FREETYPE_DELEGATE,1,Define if you have FREETYPE library)
   CFLAGS="$FREETYPE_CFLAGS $CFLAGS"
+  MAGICKCORE_FREETYPE_DELEGATE=1
+else
+  MAGICKCORE_FREETYPE_DELEGATE=0
 fi
 
-AM_CONDITIONAL(FREETYPE_DELEGATE, test "$have_freetype" = 'yes')
 AC_SUBST(FREETYPE_CFLAGS)
 AC_SUBST(FREETYPE_LIBS)
+AC_SUBST([MAGICKCORE_FREETYPE_DELEGATE])
 
 dnl ===========================================================================
 

filters/Makefile.am

diff --git a/filters/Makefile.am b/filters/Makefile.am
index 1589e1d..332eecc 100644
--- a/filters/Makefile.am
+++ b/filters/Makefile.am
@@ -20,11 +20,11 @@
 MAGICK_FILTER_CPPFLAGS = $(AM_CPPFLAGS)
 
 MAGICKCORE_FILTER_SRCS = \
-	filters/analyze.c
+  filters/analyze.c
 
 if WITH_MODULES
 filters_LTLIBRARIES = \
-	filters/analyze.la
+  filters/analyze.la
 else
 filters_LTLIBRARIES =
 endif # WITH_MODULES

gitversion.sh

diff --git a/gitversion.sh b/gitversion.sh
deleted file mode 100755
index 3dfaba0..0000000
--- a/gitversion.sh
+++ /dev/null
@@ -1,8 +0,0 @@
-git_rev ()
-{
-    d=`date +%Y%m%d`
-    c=`git rev-list --full-history --all --abbrev-commit | wc -l | sed -e 's/^ *//'`
-    h=`git rev-list --full-history --all --abbrev-commit | head -1`
-    echo ${c}:${h}:${d}
-}
-git_rev

m4/Makefile.am

diff --git a/m4/Makefile.am b/m4/Makefile.am
index 4104ca9..eecee67 100644
--- a/m4/Makefile.am
+++ b/m4/Makefile.am
@@ -15,27 +15,27 @@
 #  Makefile for building ImageMagick m4 macros.
 
 M4_EXTRA_DIST =  \
-	ac_func_fseeko.m4  \
-	ax_append_flag.m4  \
-	ax_c___attribute__.m4  \
-	ax_cflags_warn_all.m4  \
-	ax_compare_version.m4  \
-	ax_cxx_bool.m4  \
-	ax_cxx_namespaces.m4  \
-	ax_cxx_namespace_std.m4  \
-	ax_lang_compiler_ms.m4  \
-	ax_opencl.m4  \
-	ax_prefix_config_h.m4  \
-	ax_prog_perl_version.m4  \
-	ax_pthread.m4  \
-	ax_require_defined.m4  \
-	cxx_have_lstring.m4  \
-	cxx_have_std_libs.m4  \
-	framework.m4  \
-	libtool.m4  \
-	lt~obsolete.m4  \
-	ltoptions.m4  \
-	ltsugar.m4  \
-	ltversion.m4  \
-	magick_check_pthread_lib.m4  \
-	pkg.m4  
+  ac_func_fseeko.m4  \
+  ax_append_flag.m4  \
+  ax_c___attribute__.m4  \
+  ax_cflags_warn_all.m4  \
+  ax_compare_version.m4  \
+  ax_cxx_bool.m4  \
+  ax_cxx_namespaces.m4  \
+  ax_cxx_namespace_std.m4  \
+  ax_lang_compiler_ms.m4  \
+  ax_opencl.m4  \
+  ax_prefix_config_h.m4  \
+  ax_prog_perl_version.m4  \
+  ax_pthread.m4  \
+  ax_require_defined.m4  \
+  cxx_have_lstring.m4  \
+  cxx_have_std_libs.m4  \
+  framework.m4  \
+  libtool.m4  \
+  lt~obsolete.m4  \
+  ltoptions.m4  \
+  ltsugar.m4  \
+  ltversion.m4  \
+  magick_check_pthread_lib.m4  \
+  pkg.m4

tests/Makefile.am

diff --git a/tests/Makefile.am b/tests/Makefile.am
index dd638b0..906e054 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -16,9 +16,9 @@
 TESTS_CPPFLAGS = $(AM_CPPFLAGS)
 
 TESTS_CHECK_PGRMS = \
-	tests/validate \
-	tests/drawtest \
-	tests/wandtest
+  tests/validate \
+  tests/drawtest \
+  tests/wandtest
 
 tests_validate_SOURCES  = tests/validate.c tests/validate.h
 tests_validate_CPPFLAGS = $(TESTS_CPPFLAGS)
@@ -38,31 +38,31 @@
 TESTS_XFAIL_TESTS = 
 
 TESTS_TESTS = \
-	tests/cli-colorspace.tap \
-	tests/cli-pipe.tap \
-	tests/validate-colorspace.tap \
-	tests/validate-compare.tap \
-	tests/validate-composite.tap \
-	tests/validate-convert.tap \
-	tests/validate-formats-disk.tap \
-	tests/validate-formats-map.tap \
-	tests/validate-formats-memory.tap \
-	tests/validate-identify.tap \
-	tests/validate-import.tap \
-	tests/validate-montage.tap \
-	tests/validate-stream.tap \
-	tests/drawtest.tap \
-	tests/wandtest.tap
+  tests/cli-colorspace.tap \
+  tests/cli-pipe.tap \
+  tests/validate-colorspace.tap \
+  tests/validate-compare.tap \
+  tests/validate-composite.tap \
+  tests/validate-convert.tap \
+  tests/validate-formats-disk.tap \
+  tests/validate-formats-map.tap \
+  tests/validate-formats-memory.tap \
+  tests/validate-identify.tap \
+  tests/validate-import.tap \
+  tests/validate-montage.tap \
+  tests/validate-stream.tap \
+  tests/drawtest.tap \
+  tests/wandtest.tap
 
 TESTS_EXTRA_DIST = \
-	tests/common.shi \
+  tests/common.shi \
   tests/rose.pnm \
   tests/input_256c.miff \
   tests/input_bilevel.miff \
   tests/input_gray.miff \
   tests/input_truecolor.miff \
   tests/sequence.miff \
-	$(TESTS_TESTS)
+  $(TESTS_TESTS)
 
 TESTS_CLEANFILES = \
-	tests/*_out.*
+  tests/*_out.*

utilities/Makefile.am

diff --git a/utilities/Makefile.am b/utilities/Makefile.am
index f51c7b4..19604e7 100644
--- a/utilities/Makefile.am
+++ b/utilities/Makefile.am
@@ -16,51 +16,51 @@
 
 if WITH_UTILITIES
 UTILITIES_PGMS = \
-	utilities/magick
+  utilities/magick
 
 UTILITIES_XFAIL_TESTS = \
   $(UTILITIES_TTF_XFAIL_TESTS) \
   $(UTILITIES_XML_XFAIL_TESTS)
 
-utilities_magick_LDADD	= $(MAGICKCORE_LIBS) $(MAGICKWAND_LIBS)
-utilities_magick_LDFLAGS	= $(LDFLAGS)
-utilities_magick_SOURCES	= utilities/magick.c
+utilities_magick_LDADD    = $(MAGICKCORE_LIBS) $(MAGICKWAND_LIBS)
+utilities_magick_LDFLAGS  = $(LDFLAGS)
+utilities_magick_SOURCES  = utilities/magick.c
 
 UTILITIES_MANS = \
-	utilities/ImageMagick.1 \
-	utilities/animate.1 \
-	utilities/compare.1 \
-	utilities/composite.1 \
-	utilities/conjure.1 \
-	utilities/convert.1 \
-	utilities/display.1 \
-	utilities/identify.1 \
-	utilities/import.1 \
-	utilities/magick.1 \
-	utilities/magick-script.1 \
-	utilities/mogrify.1 \
-	utilities/montage.1 \
-	utilities/stream.1
+  utilities/ImageMagick.1 \
+  utilities/animate.1 \
+  utilities/compare.1 \
+  utilities/composite.1 \
+  utilities/conjure.1 \
+  utilities/convert.1 \
+  utilities/display.1 \
+  utilities/identify.1 \
+  utilities/import.1 \
+  utilities/magick.1 \
+  utilities/magick-script.1 \
+  utilities/mogrify.1 \
+  utilities/montage.1 \
+  utilities/stream.1
 
 UTILITIES_CONFIGURE = \
-	utilities/ImageMagick.1.in \
-	utilities/animate.1.in \
-	utilities/compare.1.in \
-	utilities/composite.1.in \
-	utilities/conjure.1.in \
-	utilities/convert.1.in \
-	utilities/display.1.in \
-	utilities/identify.1.in \
-	utilities/import.1.in \
-	utilities/magick.1.in \
-	utilities/magick-script.1.in \
-	utilities/mogrify.1.in \
-	utilities/montage.1.in \
-	utilities/stream.1.in
+  utilities/ImageMagick.1.in \
+  utilities/animate.1.in \
+  utilities/compare.1.in \
+  utilities/composite.1.in \
+  utilities/conjure.1.in \
+  utilities/convert.1.in \
+  utilities/display.1.in \
+  utilities/identify.1.in \
+  utilities/import.1.in \
+  utilities/magick.1.in \
+  utilities/magick-script.1.in \
+  utilities/mogrify.1.in \
+  utilities/montage.1.in \
+  utilities/stream.1.in
 
 UTILITIES_EXTRA_DIST = \
-	$(UTILITIES_MANS) \
-	$(UTILITIES_TESTS)
+  $(UTILITIES_MANS) \
+  $(UTILITIES_TESTS)
 
 UTILITIES_CLEANFILES =