(no commit message)

diff --git a/config/configure.xml b/config/configure.xml
index 5f8537e06554f53c2e960b397c1bcd82b0776610..4fc8f0625f656bd3d34d19d1fc7cab63ed144ded 100644 (file)
--- a/config/configure.xml
+++ b/config/configure.xml
@@ -9,7 +9,7 @@
   <configure name="NAME" value="ImageMagick"/>
   <configure name="LIB_VERSION" value="0x664"/>
   <configure name="LIB_VERSION_NUMBER" value="6,6,4,10"/>
-  <configure name="RELEASE_DATE" value="2010-10-05"/>
+  <configure name="RELEASE_DATE" value="2010-10-06"/>
   <configure name="CONFIGURE" value="./configure "/>
   <configure name="PREFIX" value="/usr/local"/>
   <configure name="EXEC-PREFIX" value="/usr/local"/>

diff --git a/magick/version.h b/magick/version.h
index 785f062a1a784065939a9006f06c325d003c2d21..a20f2fa317b4c798439023fc399740d5da4a9fd6 100644 (file)
--- a/magick/version.h
+++ b/magick/version.h
@@ -33,10 +33,25 @@ extern "C" {
 #define MagickLibAddendum  "-10"
 #define MagickLibInterface  4
 #define MagickLibMinInterface  4
-#define MagickReleaseDate  "2010-10-05"
+#define MagickReleaseDate  "2010-10-06"
 #define MagickChangeDate   "20101005"
 #define MagickAuthoritativeURL  "http://www.imagemagick.org"
-#define MagickFeatures  "OpenMP "
+#if defined(MAGICKCORE_OPENMP_SUPPORT)
+#define MagickOpenMPFeature  "OpenMP "
+#else
+#define MagickOpenMPFeature  " "
+#endif
+#if defined(MAGICKCORE_OPENCL_SUPPORT)
+#define MagickOpenCLFeature  "OpenCL "
+#else
+#define MagickOpenCLFeature  " "
+#endif
+#if defined(MAGICKCORE_HDRI_SUPPORT)
+#define MagickHDRIFeature  "HDRI "
+#else
+#define MagickHDRIFeature  " "
+#endif
+#define MagickFeatures MagickOpenMPFeature MagickOpenCLFeature MagickHDRIFeature
 #define MagickHomeURL  "file:///usr/local/share/doc/ImageMagick-6.6.4/index.html"
 #if (MAGICKCORE_QUANTUM_DEPTH == 8)
 #define MagickQuantumDepth  "Q8"

diff --git a/magick/version.h.in b/magick/version.h.in
index 4f8d31db2fa8e64893c70294df5a515ba24e3369..c88670b1c7f249ced38a53b1b7b503a64e5d4dc4 100644 (file)
--- a/magick/version.h.in
+++ b/magick/version.h.in
@@ -36,7 +36,22 @@ extern "C" {
 #define MagickReleaseDate  "@PACKAGE_RELEASE_DATE@"
 #define MagickChangeDate   "@PACKAGE_CHANGE_DATE@"
 #define MagickAuthoritativeURL  "http://www.imagemagick.org"
-#define MagickFeatures  "@MAGICK_FEATURES@"
+#if defined(MAGICKCORE_OPENMP_SUPPORT)
+#define MagickOpenMPFeature  "OpenMP "
+#else
+#define MagickOpenMPFeature  " "
+#endif
+#if defined(MAGICKCORE_OPENCL_SUPPORT)
+#define MagickOpenCLFeature  "OpenCL "
+#else
+#define MagickOpenCLFeature  " "
+#endif
+#if defined(MAGICKCORE_HDRI_SUPPORT)
+#define MagickHDRIFeature  "HDRI "
+#else
+#define MagickHDRIFeature  " "
+#endif
+#define MagickFeatures MagickOpenMPFeature MagickOpenCLFeature MagickHDRIFeature
 #define MagickHomeURL  "file://@DOCUMENTATION_PATH@/index.html"
 #if (MAGICKCORE_QUANTUM_DEPTH == 8)
 #define MagickQuantumDepth  "Q8"