[PATCH] libunistring: fix interoperability with preinstalled libunistring

[Daiki Ueno]

I've pushed the following couple of minor fixes to libunistring modules,
related to preinstalled libunistring.

>From c7e000ae818fd62ccabd806d78b4b6c28f6decc9 Mon Sep 17 00:00:00 2001
From: Daiki Ueno <address@hidden>
Date: Tue, 20 Jan 2015 15:34:36 +0900
Subject: [PATCH 1/2] unitypes: fix build with installed libunistring

The minimum version was not bumped after _UC_ATTRIBUTE_CONST and
_UC_ATTRIBUTE_PURE were added to unitypes.in.h.
* modules/unitypes (configure.ac): Bump minimum version to 0.9.4.
---
 ChangeLog        | 7 +++++++
 modules/unitypes | 2 +-
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/ChangeLog b/ChangeLog
index 3a7ee14..895617d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2015-01-20  Daiki Ueno  <address@hidden>
+
+       unitypes: fix build with installed libunistring
+       The minimum version has not bumped after _UC_ATTRIBUTE_CONST and
+       _UC_ATTRIBUTE_PURE were added to unitypes.in.h.
+       * modules/unitypes (configure.ac): Bump minimum version to 0.9.4.
+
 2015-01-15  Paul Eggert  <address@hidden>
 
        time: port to MinGW32 3.21
diff --git a/modules/unitypes b/modules/unitypes
index 03e7faa..943f73f 100644
--- a/modules/unitypes
+++ b/modules/unitypes
@@ -9,7 +9,7 @@ Depends-on:
 stdint
 
 configure.ac:
-gl_LIBUNISTRING_LIBHEADER([0.9], [unitypes.h])
+gl_LIBUNISTRING_LIBHEADER([0.9.4], [unitypes.h])
 
 Makefile.am:
 BUILT_SOURCES += $(LIBUNISTRING_UNITYPES_H)
-- 
2.1.0

>From 40023a310ff6a829ce145f80ecfae15f498fe1d8 Mon Sep 17 00:00:00 2001
From: Daiki Ueno <address@hidden>
Date: Tue, 20 Jan 2015 15:46:54 +0900
Subject: [PATCH 2/2] unictype/category-none: fix link with libunistring

Since _UC_CATEGORY_NONE is not a public symbol, it will be
prefixed with "libstring_" when compiled as part of libunistring.
To avoid undefined symbol at link time, increase the minimum
version when the dependant modules are updated.
* modules/unictype/category-none (configure.ac): Bump minimum
version to 0.9.5.
---
 ChangeLog                      | 10 ++++++++++
 modules/unictype/category-none |  2 +-
 2 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/ChangeLog b/ChangeLog
index 895617d..1054dec 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,15 @@
 2015-01-20  Daiki Ueno  <address@hidden>
 
+       unictype/category-none: fix link with libunistring
+       Since _UC_CATEGORY_NONE is not a public symbol, it will be
+       prefixed with "libstring_" when compiled as part of libunistring.
+       To avoid undefined symbol at link time, increase the minimum
+       version when the dependant modules are updated.
+       * modules/unictype/category-none (configure.ac): Bump minimum
+       version to 0.9.5.
+
+2015-01-20  Daiki Ueno  <address@hidden>
+
        unitypes: fix build with installed libunistring
        The minimum version has not bumped after _UC_ATTRIBUTE_CONST and
        _UC_ATTRIBUTE_PURE were added to unitypes.in.h.
diff --git a/modules/unictype/category-none b/modules/unictype/category-none
index c5e91a8..c8f2a5d 100644
--- a/modules/unictype/category-none
+++ b/modules/unictype/category-none
@@ -8,7 +8,7 @@ Depends-on:
 unictype/base
 
 configure.ac:
-gl_LIBUNISTRING_MODULE([0.9], [unictype/category-none])
+gl_LIBUNISTRING_MODULE([0.9.5], [unictype/category-none])
 
 Makefile.am:
 if LIBUNISTRING_COMPILE_UNICTYPE_CATEGORY_NONE
-- 
2.1.0

Regards,
--
Daiki Ueno