(no commit message)

diff --git a/MagickCore/configure.c b/MagickCore/configure.c
index 75ca67acd691354eaaf642dfd9ec6d6ce775c66c..7dc8ccbaf1adafda3774aaf903b04951376c3e74 100644 (file)
--- a/MagickCore/configure.c
+++ b/MagickCore/configure.c
@@ -61,6 +61,29 @@
   Define declarations.
 */
 #define ConfigureFilename  "configure.xml"
+
+#ifdef _OPENMP
+#define MAGICKCORE_FEATURE_OPENMP_STR "OpenMP "
+#else
+#define MAGICKCORE_FEATURE_OPENMP_STR ""
+#endif
+#ifdef _OPENCL
+#define MAGICKCORE_FEATURE_OPENCL_STR "OpenCL "
+#else
+#define MAGICKCORE_FEATURE_OPENCL_STR ""
+#endif
+#ifdef MAGICKCORE_ZERO_CONFIGURATION_SUPPORT
+#define MAGICKCORE_FEATURE_ZERO_CONFIGURATION_STR "Zero-Configuration "
+#else 
+#define MAGICKCORE_FEATURE_ZERO_CONFIGURATION_STR ""
+#endif
+#ifdef HDRI_SUPPORT
+#define MAGICKCORE_FEATURE_HDRI_STR "HDRI"
+#else
+#define MAGICKCORE_FEATURE_HDRI_STR ""
+#endif
+
+#define MAGICKCORE_FEATURES_STR MAGICKCORE_FEATURE_OPENMP_STR MAGICKCORE_FEATURE_OPENCL_STR MAGICKCORE_FEATURE_ZERO_CONFIGURATION_STR MAGICKCORE_FEATURE_HDRI_STR
 \f
 /*
   Typedef declarations.
@@ -78,7 +101,13 @@ typedef struct _ConfigureMapInfo
 static const ConfigureMapInfo
   ConfigureMap[] =
   {
-    { "NAME", "ImageMagick" }
+    { "NAME", "ImageMagick" },
+    { "QuantumDepth", MAGICKCORE_STRING_XQUOTE(MAGICKCORE_QUANTUM_DEPTH) } ,
+    { "FEATURES", MAGICKCORE_FEATURES_STR },
+#ifdef MAGICKCORE_BUILD_MODULES 
+    { "CODER_PATH", MAGICKCORE_CODER_PATH },
+    { "FILTER_PATH", MAGICKCORE_FILTER_PATH },
+#endif
   };
 
 static LinkedListInfo

diff --git a/MagickCore/version.h b/MagickCore/version.h
index 7ce34e49940cfc1bb29186f37ff22534eede8680..c0d8a1c7ecd636f68b2f3176473af4ba166a5860 100644 (file)
--- a/MagickCore/version.h
+++ b/MagickCore/version.h
@@ -27,14 +27,14 @@ extern "C" {
 */
 #define MagickPackageName "ImageMagick"
 #define MagickCopyright  "Copyright (C) 1999-2012 ImageMagick Studio LLC"
-#define MagickSVNRevision  "10099:10105M"
+#define MagickSVNRevision  "10107M"
 #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-04"
+#define MagickReleaseDate  "2012-12-05"
 #define MagickChangeDate   "20121005"
 #define MagickAuthoritativeURL  "http://www.imagemagick.org"
 #if defined(MAGICKCORE_OPENMP_SUPPORT)

diff --git a/configure b/configure
index 0f02bcd710f358762b3b30afda63fc6dd67aeb13..4e6a0cb9a4b4fbd1568bcc9dac0f7adcdd84bf27 100755 (executable)
--- a/configure
+++ b/configure
@@ -3649,7 +3649,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=10099:10105M
+MAGICK_SVN_REVISION=10107M
 
 
 
@@ -35107,6 +35107,7 @@ 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 8039c2864a80fe622ce20cf10c09de5b22cf61ca..f97553ffcc8d728ba5c3e4ba948c9435ca4d63bc 100755 (executable)
--- a/configure.ac
+++ b/configure.ac
@@ -3817,6 +3817,7 @@ AC_SUBST(MAGICK_CPPFLAGS)
 AC_SUBST(MAGICK_PCFLAGS)
 AC_SUBST(MAGICK_LDFLAGS)
 AC_SUBST(MAGICK_LIBS)
+
 AC_SUBST(MAGICK_FEATURES)
 
 # Set configured scripts to executable.