New module 'libunistring-optional'.

10 files changed, 21 insertions, 10 deletions

diff --git a/modules/uniwbrk/base b/modules/uniwbrk/base
index 66afadbdb5..cfb9b78364 100644
--- a/modules/uniwbrk/base
+++ b/modules/uniwbrk/base
@@ -2,14 +2,25 @@ Description:
 Base layer for word breaks.
 
 Files:
-lib/uniwbrk.h
+lib/uniwbrk.in.h
+m4/libunistring-base.m4
 
 Depends-on:
 unitypes
 
 configure.ac:
+gl_LIBUNISTRING_LIBHEADER([0.9], [uniwbrk.h])
 
 Makefile.am:
+BUILT_SOURCES += $(LIBUNISTRING_UNIWBRK_H)
+
+uniwbrk.h: uniwbrk.in.h
+	$(AM_V_GEN)rm -f $@-t $@ && \
+	{ echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \
+	  cat $(srcdir)/uniwbrk.in.h; \
+	} > $@-t && \
+	mv -f $@-t $@
+MOSTLYCLEANFILES += uniwbrk.h uniwbrk.h-t
 
 Include:
 "uniwbrk.h"
diff --git a/modules/uniwbrk/u16-wordbreaks b/modules/uniwbrk/u16-wordbreaks
index 8bf71f8714..a5b29de71c 100644
--- a/modules/uniwbrk/u16-wordbreaks
+++ b/modules/uniwbrk/u16-wordbreaks
@@ -12,9 +12,9 @@ uniwbrk/table
 unistr/u16-mbtouc-unsafe
 
 configure.ac:
+gl_LIBUNISTRING_LIBSOURCE([0.9], [uniwbrk/u16-wordbreaks.c])
 
 Makefile.am:
-lib_SOURCES += uniwbrk/u16-wordbreaks.c
 
 Include:
 "uniwbrk.h"
diff --git a/modules/uniwbrk/u16-wordbreaks-tests b/modules/uniwbrk/u16-wordbreaks-tests
index 8a923f3a76..6396f7966c 100644
--- a/modules/uniwbrk/u16-wordbreaks-tests
+++ b/modules/uniwbrk/u16-wordbreaks-tests
@@ -10,4 +10,4 @@ Makefile.am:
 TESTS += test-u16-wordbreaks
 check_PROGRAMS += test-u16-wordbreaks
 test_u16_wordbreaks_SOURCES = uniwbrk/test-u16-wordbreaks.c
-
+test_u16_wordbreaks_LDADD = $(LDADD) $(LIBUNISTRING)
diff --git a/modules/uniwbrk/u32-wordbreaks b/modules/uniwbrk/u32-wordbreaks
index a290aa3a8f..20f39c389f 100644
--- a/modules/uniwbrk/u32-wordbreaks
+++ b/modules/uniwbrk/u32-wordbreaks
@@ -12,9 +12,9 @@ uniwbrk/table
 unistr/u32-mbtouc-unsafe
 
 configure.ac:
+gl_LIBUNISTRING_LIBSOURCE([0.9], [uniwbrk/u32-wordbreaks.c])
 
 Makefile.am:
-lib_SOURCES += uniwbrk/u32-wordbreaks.c
 
 Include:
 "uniwbrk.h"
diff --git a/modules/uniwbrk/u32-wordbreaks-tests b/modules/uniwbrk/u32-wordbreaks-tests
index 33145c07bd..1da80e49e2 100644
--- a/modules/uniwbrk/u32-wordbreaks-tests
+++ b/modules/uniwbrk/u32-wordbreaks-tests
@@ -10,4 +10,4 @@ Makefile.am:
 TESTS += test-u32-wordbreaks
 check_PROGRAMS += test-u32-wordbreaks
 test_u32_wordbreaks_SOURCES = uniwbrk/test-u32-wordbreaks.c
-
+test_u32_wordbreaks_LDADD = $(LDADD) $(LIBUNISTRING)
diff --git a/modules/uniwbrk/u8-wordbreaks b/modules/uniwbrk/u8-wordbreaks
index 46d1fd184c..e38bd417c6 100644
--- a/modules/uniwbrk/u8-wordbreaks
+++ b/modules/uniwbrk/u8-wordbreaks
@@ -12,9 +12,9 @@ uniwbrk/table
 unistr/u8-mbtouc-unsafe
 
 configure.ac:
+gl_LIBUNISTRING_LIBSOURCE([0.9], [uniwbrk/u8-wordbreaks.c])
 
 Makefile.am:
-lib_SOURCES += uniwbrk/u8-wordbreaks.c
 
 Include:
 "uniwbrk.h"
diff --git a/modules/uniwbrk/u8-wordbreaks-tests b/modules/uniwbrk/u8-wordbreaks-tests
index 8248f2f9a8..dde4767b1f 100644
--- a/modules/uniwbrk/u8-wordbreaks-tests
+++ b/modules/uniwbrk/u8-wordbreaks-tests
@@ -10,4 +10,4 @@ Makefile.am:
 TESTS += test-u8-wordbreaks
 check_PROGRAMS += test-u8-wordbreaks
 test_u8_wordbreaks_SOURCES = uniwbrk/test-u8-wordbreaks.c
-
+test_u8_wordbreaks_LDADD = $(LDADD) $(LIBUNISTRING)
diff --git a/modules/uniwbrk/ulc-wordbreaks b/modules/uniwbrk/ulc-wordbreaks
index 52507510b5..228944fd3d 100644
--- a/modules/uniwbrk/ulc-wordbreaks
+++ b/modules/uniwbrk/ulc-wordbreaks
@@ -13,9 +13,9 @@ c-ctype
 localcharset
 
 configure.ac:
+gl_LIBUNISTRING_LIBSOURCE([0.9], [uniwbrk/ulc-wordbreaks.c])
 
 Makefile.am:
-lib_SOURCES += uniwbrk/ulc-wordbreaks.c
 
 Include:
 "uniwbrk.h"
diff --git a/modules/uniwbrk/ulc-wordbreaks-tests b/modules/uniwbrk/ulc-wordbreaks-tests
index 3bf214d138..82d9ced594 100644
--- a/modules/uniwbrk/ulc-wordbreaks-tests
+++ b/modules/uniwbrk/ulc-wordbreaks-tests
@@ -15,5 +15,5 @@ TESTS += uniwbrk/test-ulc-wordbreaks.sh
 TESTS_ENVIRONMENT += LOCALE_FR='@LOCALE_FR@'
 check_PROGRAMS += test-ulc-wordbreaks
 test_ulc_wordbreaks_SOURCES = uniwbrk/test-ulc-wordbreaks.c
-test_ulc_wordbreaks_LDADD = $(LDADD) @LIBICONV@
+test_ulc_wordbreaks_LDADD = $(LDADD) $(LIBUNISTRING) @LIBICONV@
 
diff --git a/modules/uniwbrk/wordbreak-property b/modules/uniwbrk/wordbreak-property
index 34462ad5ac..4e7eb783df 100644
--- a/modules/uniwbrk/wordbreak-property
+++ b/modules/uniwbrk/wordbreak-property
@@ -9,9 +9,9 @@ Depends-on:
 uniwbrk/base
 
 configure.ac:
+gl_LIBUNISTRING_LIBSOURCE([0.9], [uniwbrk/wordbreak-property.c])
 
 Makefile.am:
-lib_SOURCES += uniwbrk/wordbreak-property.c
 
 Include:
 "uniwbrk.h"