(no commit message)

diff --git a/Makefile.in b/Makefile.in
index fbe021b6709f659ef2869fc71567fb4e47d76806..a837db3194984ef33c80542e488c2767ba736d39 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -2426,6 +2426,7 @@ MAGICK_LIB_VERSION_NUMBER = @MAGICK_LIB_VERSION_NUMBER@
 MAGICK_LIB_VERSION_TEXT = @MAGICK_LIB_VERSION_TEXT@
 MAGICK_LTDLDEPS = @MAGICK_LTDLDEPS@
 MAGICK_PCFLAGS = @MAGICK_PCFLAGS@
+MAGICK_SVN_REVISION = @MAGICK_SVN_REVISION@
 MAGICK_TARGET_CPU = @MAGICK_TARGET_CPU@
 MAGICK_TARGET_OS = @MAGICK_TARGET_OS@
 MAGICK_TARGET_VENDOR = @MAGICK_TARGET_VENDOR@

diff --git a/config/configure.xml b/config/configure.xml
index 8c6cb08e47d2412c187e97c537f5b94c8c77d200..095270732a2357db9e434b1267b23198e199c3a6 100644 (file)
--- a/config/configure.xml
+++ b/config/configure.xml
@@ -10,6 +10,7 @@
   <configure name="VERSION" value="6.6.9"/>
   <configure name="LIB_VERSION" value="0x669"/>
   <configure name="LIB_VERSION_NUMBER" value="6,6,9,0"/>
+  <configure name="SVN_REVISION" value="4049" />
   <configure name="RELEASE_DATE" value="2011-03-27"/>
   <configure name="CONFIGURE" value="./configure "/>
   <configure name="PREFIX" value="/usr/local"/>

diff --git a/config/configure.xml.in b/config/configure.xml.in
index 01735c5d578e40e23bbf050052aec3e183f019ed..fcee6ef07268fca4d2cb28d451108707a3ab487e 100644 (file)
--- a/config/configure.xml.in
+++ b/config/configure.xml.in
@@ -10,6 +10,7 @@
   <configure name="VERSION" value="@PACKAGE_VERSION@"/>
   <configure name="LIB_VERSION" value="@PACKAGE_LIB_VERSION@"/>
   <configure name="LIB_VERSION_NUMBER" value="@PACKAGE_LIB_VERSION_NUMBER@"/>
+  <configure name="SVN_REVISION" value="@MAGICK_SVN_REVISION@" />
   <configure name="RELEASE_DATE" value="@PACKAGE_RELEASE_DATE@"/>
   <configure name="CONFIGURE" value="@CONFIGURE_ARGS@"/>
   <configure name="PREFIX" value="@PREFIX_DIR@"/>

diff --git a/configure b/configure
index 7bb5f0eb69bfa2d79f7fb5e9aeb69163ddb7fbe7..0fd8f49dae2280f4c4fd561f0698e6f55299ba26 100755 (executable)
--- a/configure
+++ b/configure
@@ -1001,6 +1001,7 @@ PACKAGE_LIB_VERSION_NUMBER
 PACKAGE_LIB_VERSION
 PACKAGE_CHANGE_DATE
 PACKAGE_RELEASE
+MAGICK_SVN_REVISION
 MAGICK_LIBRARY_VERSION_INFO
 MAGICK_LIBRARY_CURRENT_MIN
 MAGICK_LIBRARY_AGE
@@ -3450,6 +3451,9 @@ 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=4049
+
+
 
 
 # Ensure that make can run correctly

diff --git a/configure.ac b/configure.ac
index 66778f66163b805baabe14cda8a4d56cfd94f1f3..aa44fa44019e029a4c2fdc821093597caf832665 100755 (executable)
--- a/configure.ac
+++ b/configure.ac
@@ -21,6 +21,7 @@ m4_define([magick_minor_version], [6])
 m4_define([magick_micro_version], [9])
 m4_define([magick_version],
           [magick_major_version.magick_minor_version.magick_micro_version])
+m4_define([magick_svn_revision], esyscmd([sh -c "svnversion | sed -r 's/([0-9]+).*/\1/'"]))
 
 AC_INIT([ImageMagick],[magick_version],[http://www.imagemagick.org],[ImageMagick-magick_version])
 AC_CONFIG_SRCDIR([magick/MagickCore.h])
@@ -112,6 +113,7 @@ AC_SUBST([MAGICK_LIBRARY_CURRENT_MIN],
          [`expr $MAGICK_LIBRARY_CURRENT - $MAGICK_LIBRARY_AGE`])
 AC_SUBST([MAGICK_LIBRARY_VERSION_INFO],
          [$MAGICK_LIBRARY_CURRENT:$MAGICK_LIBRARY_REVISION:$MAGICK_LIBRARY_AGE])
+AC_SUBST([MAGICK_SVN_REVISION],[magick_svn_revision])
 
 AC_SUBST(PACKAGE_NAME)dnl
 AC_SUBST(PACKAGE_VERSION)dnl

diff --git a/magick/version.h b/magick/version.h
index f2ec750e7df4cf44acc21c162895668d37fe7083..2a6699c2adbaf72d50d8893cd73ff84031210493 100644 (file)
--- a/magick/version.h
+++ b/magick/version.h
@@ -27,6 +27,7 @@ extern "C" {
 */
 #define MagickPackageName "ImageMagick"
 #define MagickCopyright  "Copyright (C) 1999-2011 ImageMagick Studio LLC"
+#define MagickSVNRevision  "4049"
 #define MagickLibVersion  0x669
 #define MagickLibVersionText  "6.6.9"
 #define MagickLibVersionNumber  4,0,1

diff --git a/magick/version.h.in b/magick/version.h.in
index cf8a708d5f23ecfa3ca1f726a3cf4f25fa53be0e..380266e5dfda66cc7a59c2b868af628acba3bfa1 100644 (file)
--- a/magick/version.h.in
+++ b/magick/version.h.in
@@ -27,6 +27,7 @@ extern "C" {
 */
 #define MagickPackageName "@PACKAGE_NAME@"
 #define MagickCopyright  "Copyright (C) 1999-2011 ImageMagick Studio LLC"
+#define MagickSVNRevision  "@MAGICK_SVN_REVISION@"
 #define MagickLibVersion  @PACKAGE_LIB_VERSION@
 #define MagickLibVersionText  "@MAGICK_LIB_VERSION_TEXT@"
 #define MagickLibVersionNumber  @MAGICK_LIB_VERSION_NUMBER@