Include GIT revision to the configure.xml configuration file

diff --git a/config/configure.xml.in b/config/configure.xml.in
index c9b040c0de002c330994147d24e05a2e1caddfd2..ecd7ed75d9489d0e5682f9a4382a830b0f3eb9c7 100644 (file)
--- a/config/configure.xml.in
+++ b/config/configure.xml.in
@@ -23,6 +23,7 @@
   <configure name="EXECUTABLE_PATH" value="@EXECUTABLE_PATH@"/>
   <configure name="FEATURES" value="@MAGICK_FEATURES@"/>
   <configure name="FILTER_PATH" value="@FILTER_PATH@"/>
+  <configure name="GIT_REVISION" value="@MAGICK_GIT_REVISION@" />
   <configure name="HOST" value="@host@"/>
   <configure name="INCLUDE_PATH" value="@INCLUDE_PATH@"/>
   <configure name="LDFLAGS" value="@MAGICK_LDFLAGS@"/>
@@ -37,7 +38,6 @@
   <configure name="RELEASE_DATE" value="@PACKAGE_RELEASE_DATE@"/>
   <configure name="SHAREARCH_PATH" value="@SHAREARCH_PATH@"/>
   <configure name="SHARE_PATH" value="@SHARE_PATH@"/>
-  <configure name="GIT_REVISION" value="@MAGICK_GIT_REVISION@" />
   <configure name="TARGET_CPU" value="@MAGICK_TARGET_CPU@"/>
   <configure name="TARGET_OS" value="@MAGICK_TARGET_OS@"/>
   <configure name="TARGET_VENDOR" value="@MAGICK_TARGET_VENDOR@"/>

diff --git a/configure b/configure
index 5e8a647bc97e2e989a9a351f050d63c6c2ba4098..3bbb4a41fd8b50618fec4660b662bcf626c1bd85 100755 (executable)
--- a/configure
+++ b/configure
@@ -4387,7 +4387,7 @@ MAGICK_PATCHLEVEL_VERSION=0
 
 MAGICK_VERSION=7.0.0-0
 
-MAGICK_GIT_REVISION=17359:88932ef:20151220
+MAGICK_GIT_REVISION=17413:4f83be8:20151231
 
 
 # Substitute library versioning

diff --git a/configure.ac b/configure.ac
index a506de790a5dc0e07895d6cb896b20fc009c93db..9c7ac08afe6bd04852ca3238744ba5a41bd86ba0 100755 (executable)
--- a/configure.ac
+++ b/configure.ac
@@ -30,7 +30,7 @@ m4_define([magick_micro_version], [0])
 m4_define([magick_patchlevel_version], [0])
 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 .) | awk '{ print \$1 }' | tr -d '\n'"]))
+m4_define([magick_git_revision], esyscmd([sh -c "(gitversion .) | tr -d '\n'"]))
 m4_define([magick_tar_name],[ImageMagick])
 
 # ==============================================================================