Renamed AC var YAZ_VERSION_HEX to VERSION_HEX

diff --git a/configure.ac b/configure.ac
index 521d05f..02ffbb9 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -394,8 +394,8 @@ dnl ------ versioning
 dnl
 WIN_FILEVERSION=`echo $PACKAGE_VERSION | $AWK 'BEGIN { FS = "."; } { m = $4; printf("%d,%d,%d,%d", $1, $2, $3 == "" ? "0" : $3, $4 == "" ? "1" : $4);}'`
 AC_SUBST([WIN_FILEVERSION])
 dnl
 WIN_FILEVERSION=`echo $PACKAGE_VERSION | $AWK 'BEGIN { FS = "."; } { m = $4; printf("%d,%d,%d,%d", $1, $2, $3 == "" ? "0" : $3, $4 == "" ? "1" : $4);}'`
 AC_SUBST([WIN_FILEVERSION])

-YAZ_VERSION_HEX=`echo $PACKAGE_VERSION | $AWK 'BEGIN { FS = "."; } { printf("%x", ($1 * 256 + $2) * 256 + $3);}'`
-AC_SUBST([YAZ_VERSION_HEX])
+VERSION_HEX=`echo $PACKAGE_VERSION | $AWK 'BEGIN { FS = "."; } { printf("%x", ($1 * 256 + $2) * 256 + $3);}'`
+AC_SUBST([VERSION_HEX])

 if test -d ${srcdir}/.git; then
     VERSION_SHA1=`git show --pretty=format:%H|head -1`
 else
 if test -d ${srcdir}/.git; then
     VERSION_SHA1=`git show --pretty=format:%H|head -1`
 else

diff --git a/include/yaz/yaz-version.h.in b/include/yaz/yaz-version.h.in
index da6c22c..e440a8f 100644 (file)
--- a/include/yaz/yaz-version.h.in
+++ b/include/yaz/yaz-version.h.in
@@ -36,7 +36,7 @@
 #define YAZ_VERSION "@VERSION@"
 
 /** \brief YAZ version as integer (for comparison purposes) */
 #define YAZ_VERSION "@VERSION@"
 
 /** \brief YAZ version as integer (for comparison purposes) */

-#define YAZ_VERSIONL 0x@YAZ_VERSION_HEX@
+#define YAZ_VERSIONL 0x@VERSION_HEX@

 
 /** \brief YAZ file version for YAZ DLL (resource) */
 #define YAZ_FILEVERSION @WIN_FILEVERSION@
 
 /** \brief YAZ file version for YAZ DLL (resource) */
 #define YAZ_FILEVERSION @WIN_FILEVERSION@