New module 'libunistring-optional'.

17 files changed, 28 insertions, 17 deletions

diff --git a/modules/unilbrk/base b/modules/unilbrk/base
index 988aaae20f..692c48ce0c 100644
--- a/modules/unilbrk/base
+++ b/modules/unilbrk/base
@@ -2,15 +2,26 @@ Description:
 Base layer for line breaking.
 
 Files:
-lib/unilbrk.h
+lib/unilbrk.in.h
+m4/libunistring-base.m4
 
 Depends-on:
 unitypes
 localcharset
 
 configure.ac:
+gl_LIBUNISTRING_LIBHEADER([0.9], [unilbrk.h])
 
 Makefile.am:
+BUILT_SOURCES += $(LIBUNISTRING_UNILBRK_H)
+
+unilbrk.h: unilbrk.in.h
+	$(AM_V_GEN)rm -f $@-t $@ && \
+	{ echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \
+	  cat $(srcdir)/unilbrk.in.h; \
+	} > $@-t && \
+	mv -f $@-t $@
+MOSTLYCLEANFILES += unilbrk.h unilbrk.h-t
 
 Include:
 "unilbrk.h"
diff --git a/modules/unilbrk/u16-possible-linebreaks b/modules/unilbrk/u16-possible-linebreaks
index 5f79aa5667..0f740c1831 100644
--- a/modules/unilbrk/u16-possible-linebreaks
+++ b/modules/unilbrk/u16-possible-linebreaks
@@ -12,9 +12,9 @@ unistr/u16-mbtouc-unsafe
 streq
 
 configure.ac:
+gl_LIBUNISTRING_LIBSOURCE([0.9], [unilbrk/u16-possible-linebreaks.c])
 
 Makefile.am:
-lib_SOURCES += unilbrk/u16-possible-linebreaks.c
 
 Include:
 "unilbrk.h"
diff --git a/modules/unilbrk/u16-possible-linebreaks-tests b/modules/unilbrk/u16-possible-linebreaks-tests
index 0ccca8c01a..b5bad36d00 100644
--- a/modules/unilbrk/u16-possible-linebreaks-tests
+++ b/modules/unilbrk/u16-possible-linebreaks-tests
@@ -10,4 +10,4 @@ Makefile.am:
 TESTS += test-u16-possible-linebreaks
 check_PROGRAMS += test-u16-possible-linebreaks
 test_u16_possible_linebreaks_SOURCES = unilbrk/test-u16-possible-linebreaks.c
-
+test_u16_possible_linebreaks_LDADD = $(LDADD) $(LIBUNISTRING)
diff --git a/modules/unilbrk/u16-width-linebreaks b/modules/unilbrk/u16-width-linebreaks
index 6f6db8804b..bdc4d4b7e1 100644
--- a/modules/unilbrk/u16-width-linebreaks
+++ b/modules/unilbrk/u16-width-linebreaks
@@ -11,9 +11,9 @@ uniwidth/width
 unistr/u16-mbtouc-unsafe
 
 configure.ac:
+gl_LIBUNISTRING_LIBSOURCE([0.9], [unilbrk/u16-width-linebreaks.c])
 
 Makefile.am:
-lib_SOURCES += unilbrk/u16-width-linebreaks.c
 
 Include:
 "unilbrk.h"
diff --git a/modules/unilbrk/u16-width-linebreaks-tests b/modules/unilbrk/u16-width-linebreaks-tests
index 1f2eb540ee..ee86a9d086 100644
--- a/modules/unilbrk/u16-width-linebreaks-tests
+++ b/modules/unilbrk/u16-width-linebreaks-tests
@@ -10,4 +10,4 @@ Makefile.am:
 TESTS += test-u16-width-linebreaks
 check_PROGRAMS += test-u16-width-linebreaks
 test_u16_width_linebreaks_SOURCES = unilbrk/test-u16-width-linebreaks.c
-
+test_u16_width_linebreaks_LDADD = $(LDADD) $(LIBUNISTRING)
diff --git a/modules/unilbrk/u32-possible-linebreaks b/modules/unilbrk/u32-possible-linebreaks
index eda95189a8..e51d251495 100644
--- a/modules/unilbrk/u32-possible-linebreaks
+++ b/modules/unilbrk/u32-possible-linebreaks
@@ -11,9 +11,9 @@ unilbrk/tables
 streq
 
 configure.ac:
+gl_LIBUNISTRING_LIBSOURCE([0.9], [unilbrk/u32-possible-linebreaks.c])
 
 Makefile.am:
-lib_SOURCES += unilbrk/u32-possible-linebreaks.c
 
 Include:
 "unilbrk.h"
diff --git a/modules/unilbrk/u32-possible-linebreaks-tests b/modules/unilbrk/u32-possible-linebreaks-tests
index 12ff96e976..7e5b50563a 100644
--- a/modules/unilbrk/u32-possible-linebreaks-tests
+++ b/modules/unilbrk/u32-possible-linebreaks-tests
@@ -10,4 +10,4 @@ Makefile.am:
 TESTS += test-u32-possible-linebreaks
 check_PROGRAMS += test-u32-possible-linebreaks
 test_u32_possible_linebreaks_SOURCES = unilbrk/test-u32-possible-linebreaks.c
-
+test_u32_possible_linebreaks_LDADD = $(LDADD) $(LIBUNISTRING)
diff --git a/modules/unilbrk/u32-width-linebreaks b/modules/unilbrk/u32-width-linebreaks
index e69f298b49..c0217fa101 100644
--- a/modules/unilbrk/u32-width-linebreaks
+++ b/modules/unilbrk/u32-width-linebreaks
@@ -10,9 +10,9 @@ unilbrk/u32-possible-linebreaks
 uniwidth/width
 
 configure.ac:
+gl_LIBUNISTRING_LIBSOURCE([0.9], [unilbrk/u32-width-linebreaks.c])
 
 Makefile.am:
-lib_SOURCES += unilbrk/u32-width-linebreaks.c
 
 Include:
 "unilbrk.h"
diff --git a/modules/unilbrk/u32-width-linebreaks-tests b/modules/unilbrk/u32-width-linebreaks-tests
index e6daa5a972..806af772e5 100644
--- a/modules/unilbrk/u32-width-linebreaks-tests
+++ b/modules/unilbrk/u32-width-linebreaks-tests
@@ -10,4 +10,4 @@ Makefile.am:
 TESTS += test-u32-width-linebreaks
 check_PROGRAMS += test-u32-width-linebreaks
 test_u32_width_linebreaks_SOURCES = unilbrk/test-u32-width-linebreaks.c
-
+test_u32_width_linebreaks_LDADD = $(LDADD) $(LIBUNISTRING)
diff --git a/modules/unilbrk/u8-possible-linebreaks b/modules/unilbrk/u8-possible-linebreaks
index 6bd41ae80c..c628f36b70 100644
--- a/modules/unilbrk/u8-possible-linebreaks
+++ b/modules/unilbrk/u8-possible-linebreaks
@@ -12,9 +12,9 @@ unistr/u8-mbtouc-unsafe
 streq
 
 configure.ac:
+gl_LIBUNISTRING_LIBSOURCE([0.9], [unilbrk/u8-possible-linebreaks.c])
 
 Makefile.am:
-lib_SOURCES += unilbrk/u8-possible-linebreaks.c
 
 Include:
 "unilbrk.h"
diff --git a/modules/unilbrk/u8-possible-linebreaks-tests b/modules/unilbrk/u8-possible-linebreaks-tests
index 3b1ac382c0..049642a534 100644
--- a/modules/unilbrk/u8-possible-linebreaks-tests
+++ b/modules/unilbrk/u8-possible-linebreaks-tests
@@ -10,4 +10,4 @@ Makefile.am:
 TESTS += test-u8-possible-linebreaks
 check_PROGRAMS += test-u8-possible-linebreaks
 test_u8_possible_linebreaks_SOURCES = unilbrk/test-u8-possible-linebreaks.c
-
+test_u8_possible_linebreaks_LDADD = $(LDADD) $(LIBUNISTRING)
diff --git a/modules/unilbrk/u8-width-linebreaks b/modules/unilbrk/u8-width-linebreaks
index 83a2e25de4..904b6d52f9 100644
--- a/modules/unilbrk/u8-width-linebreaks
+++ b/modules/unilbrk/u8-width-linebreaks
@@ -11,9 +11,9 @@ uniwidth/width
 unistr/u8-mbtouc-unsafe
 
 configure.ac:
+gl_LIBUNISTRING_LIBSOURCE([0.9], [unilbrk/u8-width-linebreaks.c])
 
 Makefile.am:
-lib_SOURCES += unilbrk/u8-width-linebreaks.c
 
 Include:
 "unilbrk.h"
diff --git a/modules/unilbrk/u8-width-linebreaks-tests b/modules/unilbrk/u8-width-linebreaks-tests
index 00fe85fef6..4d5a3610f5 100644
--- a/modules/unilbrk/u8-width-linebreaks-tests
+++ b/modules/unilbrk/u8-width-linebreaks-tests
@@ -10,4 +10,4 @@ Makefile.am:
 TESTS += test-u8-width-linebreaks
 check_PROGRAMS += test-u8-width-linebreaks
 test_u8_width_linebreaks_SOURCES = unilbrk/test-u8-width-linebreaks.c
-
+test_u8_width_linebreaks_LDADD = $(LDADD) $(LIBUNISTRING)
diff --git a/modules/unilbrk/ulc-possible-linebreaks b/modules/unilbrk/ulc-possible-linebreaks
index f7cc283e3f..915e8c79a1 100644
--- a/modules/unilbrk/ulc-possible-linebreaks
+++ b/modules/unilbrk/ulc-possible-linebreaks
@@ -12,9 +12,9 @@ uniconv/u8-conv-from-enc
 c-ctype
 
 configure.ac:
+gl_LIBUNISTRING_LIBSOURCE([0.9], [unilbrk/ulc-possible-linebreaks.c])
 
 Makefile.am:
-lib_SOURCES += unilbrk/ulc-possible-linebreaks.c
 
 Include:
 "unilbrk.h"
diff --git a/modules/unilbrk/ulc-possible-linebreaks-tests b/modules/unilbrk/ulc-possible-linebreaks-tests
index 33c1e04144..10f4a5d7a5 100644
--- a/modules/unilbrk/ulc-possible-linebreaks-tests
+++ b/modules/unilbrk/ulc-possible-linebreaks-tests
@@ -10,5 +10,5 @@ Makefile.am:
 TESTS += test-ulc-possible-linebreaks
 check_PROGRAMS += test-ulc-possible-linebreaks
 test_ulc_possible_linebreaks_SOURCES = unilbrk/test-ulc-possible-linebreaks.c
-test_ulc_possible_linebreaks_LDADD = $(LDADD) @LIBICONV@
+test_ulc_possible_linebreaks_LDADD = $(LDADD) $(LIBUNISTRING) @LIBICONV@
 
diff --git a/modules/unilbrk/ulc-width-linebreaks b/modules/unilbrk/ulc-width-linebreaks
index 5763e8508f..d41187f598 100644
--- a/modules/unilbrk/ulc-width-linebreaks
+++ b/modules/unilbrk/ulc-width-linebreaks
@@ -12,9 +12,9 @@ uniconv/u8-conv-from-enc
 c-ctype
 
 configure.ac:
+gl_LIBUNISTRING_LIBSOURCE([0.9], [unilbrk/ulc-width-linebreaks.c])
 
 Makefile.am:
-lib_SOURCES += unilbrk/ulc-width-linebreaks.c
 
 Include:
 "unilbrk.h"
diff --git a/modules/unilbrk/ulc-width-linebreaks-tests b/modules/unilbrk/ulc-width-linebreaks-tests
index 7c05b5ab5c..9ab3eefd58 100644
--- a/modules/unilbrk/ulc-width-linebreaks-tests
+++ b/modules/unilbrk/ulc-width-linebreaks-tests
@@ -10,5 +10,5 @@ Makefile.am:
 TESTS += test-ulc-width-linebreaks
 check_PROGRAMS += test-ulc-width-linebreaks
 test_ulc_width_linebreaks_SOURCES = unilbrk/test-ulc-width-linebreaks.c
-test_ulc_width_linebreaks_LDADD = $(LDADD) @LIBICONV@
+test_ulc_width_linebreaks_LDADD = $(LDADD) $(LIBUNISTRING) @LIBICONV@