(no commit message)

diff --git a/MagickCore/magick-baseconfig.h b/MagickCore/magick-baseconfig.h
index 632699a35d37f9d5e2912b24c65dd82a8ceb5a33..3e6027acd7c64524ff7a2ec6912f09f7b5990b34 100644 (file)
--- a/MagickCore/magick-baseconfig.h
+++ b/MagickCore/magick-baseconfig.h
@@ -15,7 +15,9 @@
 /* #undef BUILD_MODULES */
 
 /* Define if you have the bzip2 library */
-/* #undef BZLIB_DELEGATE */
+#ifndef MAGICKCORE_BZLIB_DELEGATE
+#define MAGICKCORE_BZLIB_DELEGATE 1
+#endif
 
 /* Define if you have CAIRO library */
 /* #undef CAIRO_DELEGATE */
@@ -78,7 +80,9 @@
 /* #undef FPX_DELEGATE */
 
 /* Define if you have FreeType (TrueType font) library */
-/* #undef FREETYPE_DELEGATE */
+#ifndef MAGICKCORE_FREETYPE_DELEGATE
+#define MAGICKCORE_FREETYPE_DELEGATE 1
+#endif
 
 /* Define if you have Ghostscript library or framework */
 /* #undef GS_DELEGATE */
@@ -264,7 +268,9 @@
 #endif
 
 /* Define to 1 if you have the <ft2build.h> header file. */
-/* #undef HAVE_FT2BUILD_H */
+#ifndef MAGICKCORE_HAVE_FT2BUILD_H
+#define MAGICKCORE_HAVE_FT2BUILD_H 1
+#endif
 
 /* Define to 1 if you have the `ftime' function. */
 #ifndef MAGICKCORE_HAVE_FTIME
@@ -361,7 +367,9 @@
 /* #undef HAVE_LCMS2_LCMS2_H */
 
 /* Define if you have the <lcms.h> header file. */
-/* #undef HAVE_LCMS_H */
+#ifndef MAGICKCORE_HAVE_LCMS_H
+#define MAGICKCORE_HAVE_LCMS_H 1
+#endif
 
 /* Define if you have the <lcms/lcms.h> header file. */
 /* #undef HAVE_LCMS_LCMS_H */
@@ -607,10 +615,14 @@
 #endif
 
 /* X11 server supports shape extension */
-/* #undef HAVE_SHAPE */
+#ifndef MAGICKCORE_HAVE_SHAPE
+#define MAGICKCORE_HAVE_SHAPE 1
+#endif
 
 /* X11 server supports shared memory extension */
-/* #undef HAVE_SHARED_MEMORY */
+#ifndef MAGICKCORE_HAVE_SHARED_MEMORY
+#define MAGICKCORE_HAVE_SHARED_MEMORY 1
+#endif
 
 /* Define to 1 if you have the `sigaction' function. */
 #ifndef MAGICKCORE_HAVE_SIGACTION
@@ -856,31 +868,49 @@
 #endif
 
 /* Define to 1 if you have the <tiffconf.h> header file. */
-/* #undef HAVE_TIFFCONF_H */
+#ifndef MAGICKCORE_HAVE_TIFFCONF_H
+#define MAGICKCORE_HAVE_TIFFCONF_H 1
+#endif
 
 /* Define to 1 if you have the `TIFFIsBigEndian' function. */
-/* #undef HAVE_TIFFISBIGENDIAN */
+#ifndef MAGICKCORE_HAVE_TIFFISBIGENDIAN
+#define MAGICKCORE_HAVE_TIFFISBIGENDIAN 1
+#endif
 
 /* Define to 1 if you have the `TIFFIsCODECConfigured' function. */
-/* #undef HAVE_TIFFISCODECCONFIGURED */
+#ifndef MAGICKCORE_HAVE_TIFFISCODECCONFIGURED
+#define MAGICKCORE_HAVE_TIFFISCODECCONFIGURED 1
+#endif
 
 /* Define to 1 if you have the `TIFFMergeFieldInfo' function. */
-/* #undef HAVE_TIFFMERGEFIELDINFO */
+#ifndef MAGICKCORE_HAVE_TIFFMERGEFIELDINFO
+#define MAGICKCORE_HAVE_TIFFMERGEFIELDINFO 1
+#endif
 
 /* Define to 1 if you have the `TIFFReadEXIFDirectory' function. */
-/* #undef HAVE_TIFFREADEXIFDIRECTORY */
+#ifndef MAGICKCORE_HAVE_TIFFREADEXIFDIRECTORY
+#define MAGICKCORE_HAVE_TIFFREADEXIFDIRECTORY 1
+#endif
 
 /* Define to 1 if you have the `TIFFSetErrorHandlerExt' function. */
-/* #undef HAVE_TIFFSETERRORHANDLEREXT */
+#ifndef MAGICKCORE_HAVE_TIFFSETERRORHANDLEREXT
+#define MAGICKCORE_HAVE_TIFFSETERRORHANDLEREXT 1
+#endif
 
 /* Define to 1 if you have the `TIFFSetTagExtender' function. */
-/* #undef HAVE_TIFFSETTAGEXTENDER */
+#ifndef MAGICKCORE_HAVE_TIFFSETTAGEXTENDER
+#define MAGICKCORE_HAVE_TIFFSETTAGEXTENDER 1
+#endif
 
 /* Define to 1 if you have the `TIFFSetWarningHandlerExt' function. */
-/* #undef HAVE_TIFFSETWARNINGHANDLEREXT */
+#ifndef MAGICKCORE_HAVE_TIFFSETWARNINGHANDLEREXT
+#define MAGICKCORE_HAVE_TIFFSETWARNINGHANDLEREXT 1
+#endif
 
 /* Define to 1 if you have the `TIFFSwabArrayOfTriples' function. */
-/* #undef HAVE_TIFFSWABARRAYOFTRIPLES */
+#ifndef MAGICKCORE_HAVE_TIFFSWABARRAYOFTRIPLES
+#define MAGICKCORE_HAVE_TIFFSWABARRAYOFTRIPLES 1
+#endif
 
 /* Define to 1 if you have the `times' function. */
 #ifndef MAGICKCORE_HAVE_TIMES
@@ -1052,13 +1082,19 @@
 /* #undef JBIG_DELEGATE */
 
 /* Define if you have JPEG version 2 "Jasper" library */
-/* #undef JP2_DELEGATE */
+#ifndef MAGICKCORE_JP2_DELEGATE
+#define MAGICKCORE_JP2_DELEGATE 1
+#endif
 
 /* Define if you have JPEG library */
-/* #undef JPEG_DELEGATE */
+#ifndef MAGICKCORE_JPEG_DELEGATE
+#define MAGICKCORE_JPEG_DELEGATE 1
+#endif
 
 /* Define if you have LCMS (v1.11 or later) library */
-/* #undef LCMS_DELEGATE */
+#ifndef MAGICKCORE_LCMS_DELEGATE
+#define MAGICKCORE_LCMS_DELEGATE 1
+#endif
 
 /* Directory where architecture-dependent files live. */
 #ifndef MAGICKCORE_LIBRARY_PATH
@@ -1326,7 +1362,9 @@
 #endif
 
 /* Define if you have TIFF library */
-/* #undef TIFF_DELEGATE */
+#ifndef MAGICKCORE_TIFF_DELEGATE
+#define MAGICKCORE_TIFF_DELEGATE 1
+#endif
 
 /* Define to 1 if you can safely include both <sys/time.h> and <time.h>. */
 #ifndef MAGICKCORE_TIME_WITH_SYS_TIME
@@ -1396,21 +1434,23 @@
 #endif
 
 /* Define if you have X11 library */
-/* #undef X11_DELEGATE */
+#ifndef MAGICKCORE_X11_DELEGATE
+#define MAGICKCORE_X11_DELEGATE 1
+#endif
 
 /* Define if you have XML library */
 /* #undef XML_DELEGATE */
 
 /* Define to 1 if the X Window System is missing or not being used. */
-#ifndef MAGICKCORE_X_DISPLAY_MISSING
-#define MAGICKCORE_X_DISPLAY_MISSING 1
-#endif
+/* #undef X_DISPLAY_MISSING */
 
 /* Build self-contained, embeddable, zero-configuration ImageMagick */
 /* #undef ZERO_CONFIGURATION_SUPPORT */
 
 /* Define if you have zlib compression library */
-/* #undef ZLIB_DELEGATE */
+#ifndef MAGICKCORE_ZLIB_DELEGATE
+#define MAGICKCORE_ZLIB_DELEGATE 1
+#endif
 
 /* Enable large inode numbers on Mac OS X 10.5.  */
 #ifndef _DARWIN_USE_64_BIT_INODE

diff --git a/MagickCore/version.h b/MagickCore/version.h
index 693b2ce81d7ddddf00f98ce248a954237f8f8958..51fa8183d8baafc200e497eb046d3123ec6058d4 100644 (file)
--- a/MagickCore/version.h
+++ b/MagickCore/version.h
@@ -27,14 +27,14 @@ extern "C" {
 */
 #define MagickPackageName "ImageMagick"
 #define MagickCopyright  "Copyright (C) 1999-2013 ImageMagick Studio LLC"
-#define MagickSVNRevision  "10255M"
+#define MagickSVNRevision  "10255:10277M"
 #define MagickLibVersion  0x700
 #define MagickLibVersionText  "7.0.0"
 #define MagickLibVersionNumber  8,0,0
 #define MagickLibAddendum  "-0"
 #define MagickLibInterface  8
 #define MagickLibMinInterface  8
-#define MagickReleaseDate  "2012-12-16"
+#define MagickReleaseDate  "2012-12-17"
 #define MagickChangeDate   "20121005"
 #define MagickAuthoritativeURL  "http://www.imagemagick.org"
 #if defined(MAGICKCORE_OPENMP_SUPPORT)

diff --git a/PerlMagick/Makefile.PL b/PerlMagick/Makefile.PL
index ddbda57c8afdfe4d1522597138778cd58c1b0e74..13fda27d59211183be21c7b76afa08f01ffb9ea0 100644 (file)
--- a/PerlMagick/Makefile.PL
+++ b/PerlMagick/Makefile.PL
@@ -161,11 +161,11 @@ foreach my $delegate (@tested_delegates) {
 }
 
 # defaults for LIBS & INC & CCFLAGS params that we later pass to Writemakefile
-my $INC_magick = '-I../ -I..  -I"' . $Config{'usrinc'} . '/ImageMagick"';
+my $INC_magick = '-I../ -I.. -I/usr/include/freetype2 -I"' . $Config{'usrinc'} . '/ImageMagick"';
 my $LIBS_magick = '-L../MagickCore/.libs -lMagickCore-Q16HDRI -lperl -lm';
 my $CCFLAGS_magick = "$Config{'ccflags'} -fopenmp -g -O2 -Wall -pthread";
-my $LDFLAGS_magick   = "-L../MagickCore/.libs -lMagickCore-Q16HDRI $Config{'ldflags'} ";
-my $LDDLFLAGS_magick = "-L../MagickCore/.libs -lMagickCore-Q16HDRI $Config{'lddlflags'} ";
+my $LDFLAGS_magick   = "-L../MagickCore/.libs -lMagickCore-Q16HDRI $Config{'ldflags'} -L/usr/lib";
+my $LDDLFLAGS_magick = "-L../MagickCore/.libs -lMagickCore-Q16HDRI $Config{'lddlflags'} -L/usr/lib";
 
 if (($^O eq 'MSWin32') && ($Config{cc} =~ /gcc/)) {
   my($Ipaths, $Lpaths) = AutodetectWin32gcc();
@@ -206,7 +206,7 @@ WriteMakefile
    #'CC' => 'gcc -std=gnu99 -std=gnu99',
 
    # C pre-processor flags (e.g. -I & -D options)
-   # 'CPPFLAGS' => "$Config{'cppflags'} ",
+   # 'CPPFLAGS' => "$Config{'cppflags'} -I/usr/include/freetype2",
 
    # C compiler flags (e.g. -O -g)
    'CCFLAGS' => $CCFLAGS_magick,

diff --git a/configure b/configure
index 1d050a8ef28dd769555d85a5c5fa748c1befafc3..35777eef886d71ec0319f1bae26b33d08a68a0ec 100755 (executable)
--- a/configure
+++ b/configure
@@ -636,7 +636,6 @@ ac_header_list=
 ac_subst_vars='am__EXEEXT_FALSE
 am__EXEEXT_TRUE
 LTLIBOBJS
-MAGICK_FEATURES
 MAGICK_LIBS
 MAGICK_LDFLAGS
 MAGICK_PCFLAGS
@@ -3649,7 +3648,7 @@ MAGICK_LIBRARY_CURRENT_MIN=`expr $MAGICK_LIBRARY_CURRENT - $MAGICK_LIBRARY_AGE`
 
 MAGICK_LIBRARY_VERSION_INFO=$MAGICK_LIBRARY_CURRENT:$MAGICK_LIBRARY_REVISION:$MAGICK_LIBRARY_AGE
 
-MAGICK_SVN_REVISION=10255M
+MAGICK_SVN_REVISION=10255:10277M
 
 
 
@@ -34781,39 +34780,145 @@ if test $with_perl_static = 'yes'; then
 fi
 
 
-# Create a simple string containing format names for all delegate libraries
+# Create a simple string containing format names for all delegate libraries.
 DELEGATES=''
-if test "$have_autotrace"  = 'yes'; then DELEGATES="$DELEGATES autotrace"; fi
-if test "$have_bzlib"      = 'yes'; then DELEGATES="$DELEGATES bzlib"; fi
-if test "$have_djvu"       = 'yes'; then DELEGATES="$DELEGATES djvu"; fi
-if test "$have_dps"        = 'yes'; then DELEGATES="$DELEGATES dps"; fi
-if test "$have_fftw"       = 'yes'; then DELEGATES="$DELEGATES fftw"; fi
-if test "$have_fpx"        = 'yes'; then DELEGATES="$DELEGATES fpx"; fi
-if test "$have_fontconfig" = 'yes'; then DELEGATES="$DELEGATES fontconfig"; fi
-if test "$have_freetype"   = 'yes'; then DELEGATES="$DELEGATES freetype"; fi
-if test "$have_gslib"      = 'yes'; then DELEGATES="$DELEGATES gs"; fi
-if test "$have_gvc"        = 'yes'; then DELEGATES="$DELEGATES gvc"; fi
-if test "$have_jbig"       = 'yes'; then DELEGATES="$DELEGATES jbig"; fi
-if test "$have_jpeg"       = 'yes'; then
-  DELEGATES="$DELEGATES jpeg";
-  if test "$have_png"      = 'yes'; then DELEGATES="$DELEGATES jng"; fi
-fi
-if test "$have_jp2"        = 'yes'; then DELEGATES="$DELEGATES jp2"; fi
-if test "$have_lcms2"      = 'yes'; then DELEGATES="$DELEGATES lcms2"; fi
-if test "$have_lcms"       = 'yes'; then DELEGATES="$DELEGATES lcms"; fi
-if test "$have_lqr"        = 'yes'; then DELEGATES="$DELEGATES lqr"; fi
-if test "$have_lzma"       = 'yes'; then DELEGATES="$DELEGATES lzma"; fi
-if test "$have_ffmpeg"     = 'yes'; then DELEGATES="$DELEGATES mpeg"; fi
-if test "$have_openexr"    = 'yes'; then DELEGATES="$DELEGATES openexr"; fi
-if test "$have_pango"      = 'yes'; then DELEGATES="$DELEGATES pango"; fi
-if test "$have_png"        = 'yes'; then DELEGATES="$DELEGATES png"; fi
-if test "$have_rsvg"       = 'yes'; then DELEGATES="$DELEGATES rsvg"; fi
-if test "$have_tiff"       = 'yes'; then DELEGATES="$DELEGATES tiff"; fi
-if test "$have_x"          = 'yes'; then DELEGATES="$DELEGATES x11"; fi
-if test "$have_xml"        = 'yes'; then DELEGATES="$DELEGATES xml"; fi
-if test "$have_wmf"        = 'yes'; then DELEGATES="$DELEGATES wmf"; fi
-if test "$have_zlib"       = 'yes'; then DELEGATES="$DELEGATES zlib"; fi
-
+if test "$have_autotrace"  = 'yes' ; then
+   DELEGATES="$DELEGATES autotrace"
+   MAGICK_FEATURES="$MAGICK_FEATURES Autotrace"
+fi
+if test "$have_bzlib"  = 'yes' ; then
+   DELEGATES="$DELEGATES bzlib"
+   MAGICK_FEATURES="$MAGICK_FEATURES BZLIB"
+fi
+if test "$have_dps"    = 'yes' ; then
+   DELEGATES="$DELEGATES dps"
+   MAGICK_FEATURES="$MAGICK_FEATURES DPS"
+fi
+if test "$have_djvu"    = 'yes' ; then
+   DELEGATES="$DELEGATES djvu"
+   MAGICK_FEATURES="$MAGICK_FEATURES DJVU"
+fi
+if test "$have_ffmpeg"   = 'yes' ; then
+   DELEGATES="$DELEGATES mpeg"
+   MAGICK_FEATURES="$MAGICK_FEATURES MPEG"
+fi
+if test "$have_fftw"    = 'yes' ; then
+   DELEGATES="$DELEGATES fftw"
+   MAGICK_FEATURES="$MAGICK_FEATURES FFTW"
+fi
+if test "$have_fig2dev" = 'yes' && test "$have_ps" = 'yes'  ; then
+   DELEGATES="$DELEGATES xfig"
+   MAGICK_FEATURES="$MAGICK_FEATURES XFIG"
+fi
+if test "$have_fpx"    = 'yes' ; then
+   DELEGATES="$DELEGATES fpx"
+   MAGICK_FEATURES="$MAGICK_FEATURES FPX"
+fi
+if test "$have_fontconfig"    = 'yes' ; then
+   DELEGATES="$DELEGATES fontconfig"
+   MAGICK_FEATURES="$MAGICK_FEATURES Fontconfig"
+fi
+if test "$have_freetype"    = 'yes' ; then
+   DELEGATES="$DELEGATES freetype"
+   MAGICK_FEATURES="$MAGICK_FEATURES Freetype"
+fi
+if test "$have_gslib"    = 'yes' ; then
+   DELEGATES="$DELEGATES gslib"
+   MAGICK_FEATURES="$MAGICK_FEATURES Ghostscript"
+fi
+if test "$have_jbig"    = 'yes' ; then
+   DELEGATES="$DELEGATES jbig"
+   MAGICK_FEATURES="$MAGICK_FEATURES JBIG"
+fi
+if test "$have_png$have_jpeg" = 'yesyes' ; then
+   DELEGATES="$DELEGATES jng"
+   MAGICK_FEATURES="$MAGICK_FEATURES JNG"
+fi
+if test "$have_jp2"   = 'yes' ; then
+   DELEGATES="$DELEGATES jp2"
+   MAGICK_FEATURES="$MAGICK_FEATURES JP2"
+fi
+if test "$have_jpeg"   = 'yes' ; then
+   DELEGATES="$DELEGATES jpeg"
+   MAGICK_FEATURES="$MAGICK_FEATURES JPEG"
+fi
+if test "$have_lcms" = 'yes' || test "$have_lcms2" = 'yes' ; then
+   DELEGATES="$DELEGATES lcms"
+   MAGICK_FEATURES="$MAGICK_FEATURES LCMS"
+fi
+if test "$have_lqr"    = 'yes' ; then
+   DELEGATES="$DELEGATES lqr"
+   MAGICK_FEATURES="$MAGICK_FEATURES LQR"
+fi
+if test "$have_lzma"    = 'yes' ; then
+   DELEGATES="$DELEGATES lzma"
+   MAGICK_FEATURES="$MAGICK_FEATURES LZMA"
+fi
+if test "$have_openexr"    = 'yes' ; then
+   DELEGATES="$DELEGATES openexr"
+   MAGICK_FEATURES="$MAGICK_FEATURES OpenEXR"
+fi
+if test "$have_pango"    = 'yes' ; then
+   DELEGATES="$DELEGATES pango"
+   MAGICK_FEATURES="$MAGICK_FEATURES Pango"
+fi
+if test "$have_png"    = 'yes' ; then
+   DELEGATES="$DELEGATES png"
+   MAGICK_FEATURES="$MAGICK_FEATURES PNG"
+fi
+have_ps='no'
+if test "$have_dps"    = 'yes' || \
+   test "$have_gs" = 'yes' || \
+   test "${native_win32_build}" = 'yes' ; then
+   have_ps='yes'
+fi
+if test "$have_ps"     = 'yes' ; then
+   DELEGATES="$DELEGATES ps"
+   MAGICK_FEATURES="$MAGICK_FEATURES PS"
+fi
+if test "$have_ralcgm" = 'yes' ; then
+   DELEGATES="$DELEGATES cgm"
+   MAGICK_FEATURES="$MAGICK_FEATURES CGM"
+fi
+if test "$have_ra_ppm" = 'yes' ; then
+   DELEGATES="$DELEGATES rad"
+   MAGICK_FEATURES="$MAGICK_FEATURES RAD"
+fi
+if test "$have_rsvg"   = 'yes' ; then
+   DELEGATES="$DELEGATES rsvg"
+   MAGICK_FEATURES="$MAGICK_FEATURES RSVG"
+fi
+if test "$have_tiff"   = 'yes' ; then
+   DELEGATES="$DELEGATES tiff"
+   MAGICK_FEATURES="$MAGICK_FEATURES TIFF"
+fi
+if test "$have_ttf"    = 'yes' ; then
+   DELEGATES="$DELEGATES ttf"
+   MAGICK_FEATURES="$MAGICK_FEATURES TTF"
+fi
+if test "$have_wmf"    = 'yes' ; then
+   DELEGATES="$DELEGATES wmf"
+   MAGICK_FEATURES="$MAGICK_FEATURES WMF"
+fi
+if test "$have_x"      = 'yes' ; then
+   DELEGATES="$DELEGATES x"
+   MAGICK_FEATURES="$MAGICK_FEATURES X"
+fi
+if test "$have_xml"      = 'yes' ; then
+   DELEGATES="$DELEGATES xml"
+   MAGICK_FEATURES="$MAGICK_FEATURES XML"
+fi
+if test "$have_zlib"   = 'yes' ; then
+   DELEGATES="$DELEGATES zlib"
+   MAGICK_FEATURES="$MAGICK_FEATURES ZLIB"
+fi
+if test "$build_modules" != 'no' || \
+   test "${native_win32_build}" = 'yes' ; then
+   MAGICK_FEATURES="$MAGICK_FEATURES MODULES"
+fi
+# Remove extraneous spaces from output variables (asthetic)
+DELEGATES=`echo $DELEGATES | sed -e 's/  */ /g'`
+MAGICK_FEATURES=`echo $MAGICK_FEATURES | sed -e 's/  */ /g'`
 
 
 #
@@ -34995,8 +35100,6 @@ MAGICK_LIBS="-lMagickCore $MAGICK_DEP_LIBS"
 
 
 
-
-
 # Set configured scripts to executable.
 ac_config_commands="$ac_config_commands default"
 

diff --git a/configure.ac b/configure.ac
index 4bf0c7cdb6969c3e09121884739c9b48190cb03b..0aebea52c20d4438830b9c6bc7d8568e34f43cfb 100755 (executable)
--- a/configure.ac
+++ b/configure.ac
@@ -3692,39 +3692,145 @@ if test $with_perl_static = 'yes'; then
 fi
 AC_SUBST(MAGICKCORE_PATH)
 
-# Create a simple string containing format names for all delegate libraries
+# Create a simple string containing format names for all delegate libraries.
 DELEGATES=''
-if test "$have_autotrace"  = 'yes'; then DELEGATES="$DELEGATES autotrace"; fi
-if test "$have_bzlib"      = 'yes'; then DELEGATES="$DELEGATES bzlib"; fi
-if test "$have_djvu"       = 'yes'; then DELEGATES="$DELEGATES djvu"; fi
-if test "$have_dps"        = 'yes'; then DELEGATES="$DELEGATES dps"; fi
-if test "$have_fftw"       = 'yes'; then DELEGATES="$DELEGATES fftw"; fi
-if test "$have_fpx"        = 'yes'; then DELEGATES="$DELEGATES fpx"; fi
-if test "$have_fontconfig" = 'yes'; then DELEGATES="$DELEGATES fontconfig"; fi
-if test "$have_freetype"   = 'yes'; then DELEGATES="$DELEGATES freetype"; fi
-if test "$have_gslib"      = 'yes'; then DELEGATES="$DELEGATES gs"; fi
-if test "$have_gvc"        = 'yes'; then DELEGATES="$DELEGATES gvc"; fi
-if test "$have_jbig"       = 'yes'; then DELEGATES="$DELEGATES jbig"; fi
-if test "$have_jpeg"       = 'yes'; then
-  DELEGATES="$DELEGATES jpeg";
-  if test "$have_png"      = 'yes'; then DELEGATES="$DELEGATES jng"; fi
-fi
-if test "$have_jp2"        = 'yes'; then DELEGATES="$DELEGATES jp2"; fi
-if test "$have_lcms2"      = 'yes'; then DELEGATES="$DELEGATES lcms2"; fi
-if test "$have_lcms"       = 'yes'; then DELEGATES="$DELEGATES lcms"; fi
-if test "$have_lqr"        = 'yes'; then DELEGATES="$DELEGATES lqr"; fi
-if test "$have_lzma"       = 'yes'; then DELEGATES="$DELEGATES lzma"; fi
-if test "$have_ffmpeg"     = 'yes'; then DELEGATES="$DELEGATES mpeg"; fi
-if test "$have_openexr"    = 'yes'; then DELEGATES="$DELEGATES openexr"; fi
-if test "$have_pango"      = 'yes'; then DELEGATES="$DELEGATES pango"; fi
-if test "$have_png"        = 'yes'; then DELEGATES="$DELEGATES png"; fi
-if test "$have_rsvg"       = 'yes'; then DELEGATES="$DELEGATES rsvg"; fi
-if test "$have_tiff"       = 'yes'; then DELEGATES="$DELEGATES tiff"; fi
-if test "$have_x"          = 'yes'; then DELEGATES="$DELEGATES x11"; fi
-if test "$have_xml"        = 'yes'; then DELEGATES="$DELEGATES xml"; fi
-if test "$have_wmf"        = 'yes'; then DELEGATES="$DELEGATES wmf"; fi
-if test "$have_zlib"       = 'yes'; then DELEGATES="$DELEGATES zlib"; fi
-
+if test "$have_autotrace"  = 'yes' ; then
+   DELEGATES="$DELEGATES autotrace"
+   MAGICK_FEATURES="$MAGICK_FEATURES Autotrace"
+fi
+if test "$have_bzlib"  = 'yes' ; then
+   DELEGATES="$DELEGATES bzlib"
+   MAGICK_FEATURES="$MAGICK_FEATURES BZLIB"
+fi
+if test "$have_dps"    = 'yes' ; then
+   DELEGATES="$DELEGATES dps"
+   MAGICK_FEATURES="$MAGICK_FEATURES DPS"
+fi
+if test "$have_djvu"    = 'yes' ; then
+   DELEGATES="$DELEGATES djvu"
+   MAGICK_FEATURES="$MAGICK_FEATURES DJVU"
+fi
+if test "$have_ffmpeg"   = 'yes' ; then
+   DELEGATES="$DELEGATES mpeg"
+   MAGICK_FEATURES="$MAGICK_FEATURES MPEG"
+fi
+if test "$have_fftw"    = 'yes' ; then
+   DELEGATES="$DELEGATES fftw"
+   MAGICK_FEATURES="$MAGICK_FEATURES FFTW"
+fi
+if test "$have_fig2dev" = 'yes' && test "$have_ps" = 'yes'  ; then
+   DELEGATES="$DELEGATES xfig"
+   MAGICK_FEATURES="$MAGICK_FEATURES XFIG"
+fi
+if test "$have_fpx"    = 'yes' ; then
+   DELEGATES="$DELEGATES fpx"
+   MAGICK_FEATURES="$MAGICK_FEATURES FPX"
+fi
+if test "$have_fontconfig"    = 'yes' ; then
+   DELEGATES="$DELEGATES fontconfig"
+   MAGICK_FEATURES="$MAGICK_FEATURES Fontconfig"
+fi
+if test "$have_freetype"    = 'yes' ; then
+   DELEGATES="$DELEGATES freetype"
+   MAGICK_FEATURES="$MAGICK_FEATURES Freetype"
+fi
+if test "$have_gslib"    = 'yes' ; then
+   DELEGATES="$DELEGATES gslib"
+   MAGICK_FEATURES="$MAGICK_FEATURES Ghostscript"
+fi
+if test "$have_jbig"    = 'yes' ; then
+   DELEGATES="$DELEGATES jbig"
+   MAGICK_FEATURES="$MAGICK_FEATURES JBIG"
+fi
+if test "$have_png$have_jpeg" = 'yesyes' ; then
+   DELEGATES="$DELEGATES jng"
+   MAGICK_FEATURES="$MAGICK_FEATURES JNG"
+fi
+if test "$have_jp2"   = 'yes' ; then
+   DELEGATES="$DELEGATES jp2"
+   MAGICK_FEATURES="$MAGICK_FEATURES JP2"
+fi
+if test "$have_jpeg"   = 'yes' ; then
+   DELEGATES="$DELEGATES jpeg"
+   MAGICK_FEATURES="$MAGICK_FEATURES JPEG"
+fi
+if test "$have_lcms" = 'yes' || test "$have_lcms2" = 'yes' ; then
+   DELEGATES="$DELEGATES lcms"
+   MAGICK_FEATURES="$MAGICK_FEATURES LCMS"
+fi
+if test "$have_lqr"    = 'yes' ; then
+   DELEGATES="$DELEGATES lqr"
+   MAGICK_FEATURES="$MAGICK_FEATURES LQR"
+fi
+if test "$have_lzma"    = 'yes' ; then
+   DELEGATES="$DELEGATES lzma"
+   MAGICK_FEATURES="$MAGICK_FEATURES LZMA"
+fi
+if test "$have_openexr"    = 'yes' ; then
+   DELEGATES="$DELEGATES openexr"
+   MAGICK_FEATURES="$MAGICK_FEATURES OpenEXR"
+fi
+if test "$have_pango"    = 'yes' ; then
+   DELEGATES="$DELEGATES pango"
+   MAGICK_FEATURES="$MAGICK_FEATURES Pango"
+fi
+if test "$have_png"    = 'yes' ; then
+   DELEGATES="$DELEGATES png"
+   MAGICK_FEATURES="$MAGICK_FEATURES PNG"
+fi
+have_ps='no'
+if test "$have_dps"    = 'yes' || \
+   test "$have_gs" = 'yes' || \
+   test "${native_win32_build}" = 'yes' ; then
+   have_ps='yes'
+fi
+if test "$have_ps"     = 'yes' ; then
+   DELEGATES="$DELEGATES ps"
+   MAGICK_FEATURES="$MAGICK_FEATURES PS"
+fi
+if test "$have_ralcgm" = 'yes' ; then
+   DELEGATES="$DELEGATES cgm"
+   MAGICK_FEATURES="$MAGICK_FEATURES CGM"
+fi
+if test "$have_ra_ppm" = 'yes' ; then
+   DELEGATES="$DELEGATES rad"
+   MAGICK_FEATURES="$MAGICK_FEATURES RAD"
+fi
+if test "$have_rsvg"   = 'yes' ; then
+   DELEGATES="$DELEGATES rsvg"
+   MAGICK_FEATURES="$MAGICK_FEATURES RSVG"
+fi
+if test "$have_tiff"   = 'yes' ; then
+   DELEGATES="$DELEGATES tiff"
+   MAGICK_FEATURES="$MAGICK_FEATURES TIFF"
+fi
+if test "$have_ttf"    = 'yes' ; then
+   DELEGATES="$DELEGATES ttf"
+   MAGICK_FEATURES="$MAGICK_FEATURES TTF"
+fi
+if test "$have_wmf"    = 'yes' ; then
+   DELEGATES="$DELEGATES wmf"
+   MAGICK_FEATURES="$MAGICK_FEATURES WMF"
+fi
+if test "$have_x"      = 'yes' ; then
+   DELEGATES="$DELEGATES x"
+   MAGICK_FEATURES="$MAGICK_FEATURES X"
+fi
+if test "$have_xml"      = 'yes' ; then
+   DELEGATES="$DELEGATES xml"
+   MAGICK_FEATURES="$MAGICK_FEATURES XML"
+fi
+if test "$have_zlib"   = 'yes' ; then
+   DELEGATES="$DELEGATES zlib"
+   MAGICK_FEATURES="$MAGICK_FEATURES ZLIB"
+fi
+if test "$build_modules" != 'no' || \
+   test "${native_win32_build}" = 'yes' ; then
+   MAGICK_FEATURES="$MAGICK_FEATURES MODULES"
+fi
+# Remove extraneous spaces from output variables (asthetic)
+DELEGATES=`echo $DELEGATES | sed -e 's/  */ /g'`
+MAGICK_FEATURES=`echo $MAGICK_FEATURES | sed -e 's/  */ /g'`
 AC_SUBST(DELEGATES)
 
 #
@@ -3818,8 +3924,6 @@ AC_SUBST(MAGICK_PCFLAGS)
 AC_SUBST(MAGICK_LDFLAGS)
 AC_SUBST(MAGICK_LIBS)
 
-AC_SUBST(MAGICK_FEATURES)
-
 # Set configured scripts to executable.
 AC_CONFIG_COMMANDS([default],[],[])
 AC_CONFIG_COMMANDS([magick.sh.in],[chmod +x magick.sh])