summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBruno Haible <bruno@clisp.org>2010-05-14 02:34:55 +0200
committerBruno Haible <bruno@clisp.org>2010-05-14 11:55:57 +0200
commitb9d488f8f3407f70aa01bed2fe992dce543207ca (patch)
treeddb5530197ab06696df82075d41ab026072c8e56
parente1a35eb3ea0ebe6f64fbff403c2fc76a3044f31d (diff)
downloadlibunistring-b9d488f8f3407f70aa01bed2fe992dce543207ca.tar.gz
Publicize also the subminor version number.
-rw-r--r--ChangeLog7
-rw-r--r--NEWS5
-rw-r--r--configure.ac8
-rw-r--r--lib/unistring/version.in.h6
4 files changed, 23 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index 92c53c6..63e01fb 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2010-05-14 Bruno Haible <bruno@clisp.org>
+
+ Publicize also the subminor version number.
+ * lib/unistring/version.in.h (_LIBUNISTRING_VERSION,
+ _libunistring_version): Include also the subminor version.
+ * configure.ac (HEXVERSION): Likewise.
+
2010-05-02 Bruno Haible <bruno@clisp.org>
* Version 0.9.3 released.
diff --git a/NEWS b/NEWS
index 72e79cc..cb47b15 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,8 @@
+New in 0.9.4:
+* It is now easier to detect the subminor version: The value of the variable
+ _libunistring_version and of the macro _LIBUNISTRING_VERSION now includes
+ also the subminor version.
+
New in 0.9.3:
* Bug fixes in unistr.h functions:
- The functions u16_to_u32, u16_to_u8, u8_to_u32, u8_to_u16 now fail when
diff --git a/configure.ac b/configure.ac
index 460244f..22abd5d 100644
--- a/configure.ac
+++ b/configure.ac
@@ -130,10 +130,16 @@ i\
0
q
'
+sed_extract_subminor='/^[0-9][0-9]*[.][0-9][0-9]*[.][0-9]/{s/^[0-9]*[.][0-9]*[.]\([0-9]*\).*/\1/p;q;}
+i\
+0
+q
+'
changequote([,])
version_major=`echo "${VERSION}" | sed -n -e "$sed_extract_major"`
version_minor=`echo "${VERSION}" | sed -n -e "$sed_extract_minor"`
-HEXVERSION=0x`$AWK 'BEGIN { printf("%02d%02d"',"$version_major","$version_minor"') }'`
+version_subminor=`echo "${VERSION}" | sed -n -e "$sed_extract_subminor"`
+HEXVERSION=0x`$AWK 'BEGIN { printf("%02X%02X%02X"',"$version_major","$version_minor","$version_subminor"') }'`
AC_SUBST([HEXVERSION])
dnl Check for tools needed for formatting the documentation.
diff --git a/lib/unistring/version.in.h b/lib/unistring/version.in.h
index 47b736a..7b572fd 100644
--- a/lib/unistring/version.in.h
+++ b/lib/unistring/version.in.h
@@ -1,5 +1,5 @@
/* Meta information about GNU libunistring.
- Copyright (C) 2009 Free Software Foundation, Inc.
+ Copyright (C) 2009-2010 Free Software Foundation, Inc.
Written by Bruno Haible <bruno@clisp.org>, 2009.
This program is free software: you can redistribute it and/or modify it
@@ -27,7 +27,9 @@ extern "C" {
#endif
-#define _LIBUNISTRING_VERSION @HEXVERSION@ /* version number: (major<<8) + minor */
+/* Version number: (major<<16) + (minor<<8) + subminor
+ except that for versions <= 0.9.3 the value was 0x000009. */
+#define _LIBUNISTRING_VERSION @HEXVERSION@
extern LIBUNISTRING_DLL_VARIABLE const int _libunistring_version; /* Likewise */