summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBruno Haible <bruno@clisp.org>2021-05-07 12:51:47 +0200
committerBruno Haible <bruno@clisp.org>2021-05-07 12:52:36 +0200
commit7cc8d8aa0db12119d6d88af430238c24361afc4e (patch)
tree7569e9099cf79cb7e42811894de56b0c2aa41bbe
parent5c8def7165ab81856137e094d793a7679bf157b2 (diff)
downloadgnulib-7cc8d8aa0db12119d6d88af430238c24361afc4e.tar.gz
Fix build when an older libunistring is installed (regr. 2020-02-23).
* modules/unitypes (configure.ac): Arrange to generate the .h file if the installed one is from a version < 0.9.11. * modules/unicase/base (configure.ac): Likewise. * modules/uniconv/base (configure.ac): Likewise. * modules/unilbrk/base (configure.ac): Likewise. * modules/uninorm/base (configure.ac): Likewise. * modules/unistdio/base (configure.ac): Likewise. * modules/unistr/base (configure.ac): Likewise. * modules/uniwbrk/base (configure.ac): Likewise. * modules/uniwidth/base (configure.ac): Likewise. * modules/unictype/base (configure.ac): Arrange to generate the .h file if the installed one is from a version < 0.9.8. * modules/unigbrk/base (configure.ac): Likewise.
-rw-r--r--ChangeLog17
-rw-r--r--modules/unicase/base2
-rw-r--r--modules/uniconv/base2
-rw-r--r--modules/unictype/base2
-rw-r--r--modules/unigbrk/base2
-rw-r--r--modules/unilbrk/base2
-rw-r--r--modules/uninorm/base2
-rw-r--r--modules/unistdio/base2
-rw-r--r--modules/unistr/base2
-rw-r--r--modules/unitypes2
-rw-r--r--modules/uniwbrk/base2
-rw-r--r--modules/uniwidth/base2
12 files changed, 28 insertions, 11 deletions
diff --git a/ChangeLog b/ChangeLog
index 3173be96df..0ac69a08c8 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,20 @@
+2021-05-07 Bruno Haible <bruno@clisp.org>
+
+ Fix build when an older libunistring is installed (regr. 2020-02-23).
+ * modules/unitypes (configure.ac): Arrange to generate the .h file if
+ the installed one is from a version < 0.9.11.
+ * modules/unicase/base (configure.ac): Likewise.
+ * modules/uniconv/base (configure.ac): Likewise.
+ * modules/unilbrk/base (configure.ac): Likewise.
+ * modules/uninorm/base (configure.ac): Likewise.
+ * modules/unistdio/base (configure.ac): Likewise.
+ * modules/unistr/base (configure.ac): Likewise.
+ * modules/uniwbrk/base (configure.ac): Likewise.
+ * modules/uniwidth/base (configure.ac): Likewise.
+ * modules/unictype/base (configure.ac): Arrange to generate the .h file
+ if the installed one is from a version < 0.9.8.
+ * modules/unigbrk/base (configure.ac): Likewise.
+
2021-04-30 Bruno Haible <bruno@clisp.org>
immutable: Fix crash when immmalloc() fails.
diff --git a/modules/unicase/base b/modules/unicase/base
index aedb2eb013..1906c81096 100644
--- a/modules/unicase/base
+++ b/modules/unicase/base
@@ -11,7 +11,7 @@ uninorm/base
stdbool
configure.ac:
-gl_LIBUNISTRING_LIBHEADER([0.9.4], [unicase.h])
+gl_LIBUNISTRING_LIBHEADER([0.9.11], [unicase.h])
Makefile.am:
BUILT_SOURCES += $(LIBUNISTRING_UNICASE_H)
diff --git a/modules/uniconv/base b/modules/uniconv/base
index 4e06a27de2..c6c35fc89a 100644
--- a/modules/uniconv/base
+++ b/modules/uniconv/base
@@ -12,7 +12,7 @@ Depends-on:
unitypes
configure.ac:
-gl_LIBUNISTRING_LIBHEADER([0.9.4], [uniconv.h])
+gl_LIBUNISTRING_LIBHEADER([0.9.11], [uniconv.h])
Makefile.am:
BUILT_SOURCES += $(LIBUNISTRING_UNICONV_H)
diff --git a/modules/unictype/base b/modules/unictype/base
index b1d0596c20..f6b80b8f96 100644
--- a/modules/unictype/base
+++ b/modules/unictype/base
@@ -10,7 +10,7 @@ unitypes
stdbool
configure.ac:
-gl_LIBUNISTRING_LIBHEADER([0.9.4], [unictype.h])
+gl_LIBUNISTRING_LIBHEADER([0.9.8], [unictype.h])
Makefile.am:
BUILT_SOURCES += $(LIBUNISTRING_UNICTYPE_H)
diff --git a/modules/unigbrk/base b/modules/unigbrk/base
index f630b46fdd..e6c4c01fb6 100644
--- a/modules/unigbrk/base
+++ b/modules/unigbrk/base
@@ -10,7 +10,7 @@ unitypes
stdbool
configure.ac:
-gl_LIBUNISTRING_LIBHEADER([0.9.4], [unigbrk.h])
+gl_LIBUNISTRING_LIBHEADER([0.9.8], [unigbrk.h])
Makefile.am:
BUILT_SOURCES += $(LIBUNISTRING_UNIGBRK_H)
diff --git a/modules/unilbrk/base b/modules/unilbrk/base
index 693fe8e9a9..03403f49f6 100644
--- a/modules/unilbrk/base
+++ b/modules/unilbrk/base
@@ -10,7 +10,7 @@ unitypes
localcharset
configure.ac:
-gl_LIBUNISTRING_LIBHEADER([0.9.4], [unilbrk.h])
+gl_LIBUNISTRING_LIBHEADER([0.9.11], [unilbrk.h])
Makefile.am:
BUILT_SOURCES += $(LIBUNISTRING_UNILBRK_H)
diff --git a/modules/uninorm/base b/modules/uninorm/base
index 3f3c772689..67bb3261da 100644
--- a/modules/uninorm/base
+++ b/modules/uninorm/base
@@ -9,7 +9,7 @@ Depends-on:
unitypes
configure.ac:
-gl_LIBUNISTRING_LIBHEADER([0.9.4], [uninorm.h])
+gl_LIBUNISTRING_LIBHEADER([0.9.11], [uninorm.h])
Makefile.am:
BUILT_SOURCES += $(LIBUNISTRING_UNINORM_H)
diff --git a/modules/unistdio/base b/modules/unistdio/base
index 11fe80a919..a1b555b38d 100644
--- a/modules/unistdio/base
+++ b/modules/unistdio/base
@@ -9,7 +9,7 @@ Depends-on:
unitypes
configure.ac:
-gl_LIBUNISTRING_LIBHEADER([0.9.4], [unistdio.h])
+gl_LIBUNISTRING_LIBHEADER([0.9.11], [unistdio.h])
Makefile.am:
BUILT_SOURCES += $(LIBUNISTRING_UNISTDIO_H)
diff --git a/modules/unistr/base b/modules/unistr/base
index 0f5e6bc0f9..a85fdab4d7 100644
--- a/modules/unistr/base
+++ b/modules/unistr/base
@@ -12,7 +12,7 @@ stdbool
inline
configure.ac:
-gl_LIBUNISTRING_LIBHEADER([0.9.4], [unistr.h])
+gl_LIBUNISTRING_LIBHEADER([0.9.11], [unistr.h])
Makefile.am:
BUILT_SOURCES += $(LIBUNISTRING_UNISTR_H)
diff --git a/modules/unitypes b/modules/unitypes
index a7cf91eaf2..8d3ccf0c19 100644
--- a/modules/unitypes
+++ b/modules/unitypes
@@ -9,7 +9,7 @@ Depends-on:
stdint
configure.ac:
-gl_LIBUNISTRING_LIBHEADER([0.9.4], [unitypes.h])
+gl_LIBUNISTRING_LIBHEADER([0.9.11], [unitypes.h])
Makefile.am:
BUILT_SOURCES += $(LIBUNISTRING_UNITYPES_H)
diff --git a/modules/uniwbrk/base b/modules/uniwbrk/base
index 82ca4cbbce..198b9b386b 100644
--- a/modules/uniwbrk/base
+++ b/modules/uniwbrk/base
@@ -9,7 +9,7 @@ Depends-on:
unitypes
configure.ac:
-gl_LIBUNISTRING_LIBHEADER([0.9.4], [uniwbrk.h])
+gl_LIBUNISTRING_LIBHEADER([0.9.11], [uniwbrk.h])
Makefile.am:
BUILT_SOURCES += $(LIBUNISTRING_UNIWBRK_H)
diff --git a/modules/uniwidth/base b/modules/uniwidth/base
index 3156cf74fa..fbf4d41f50 100644
--- a/modules/uniwidth/base
+++ b/modules/uniwidth/base
@@ -10,7 +10,7 @@ Depends-on:
unitypes
configure.ac:
-gl_LIBUNISTRING_LIBHEADER([0.9.4], [uniwidth.h])
+gl_LIBUNISTRING_LIBHEADER([0.9.11], [uniwidth.h])
Makefile.am:
BUILT_SOURCES += $(LIBUNISTRING_UNIWIDTH_H)