New module 'libunistring-optional'.

15 files changed, 27 insertions, 15 deletions

diff --git a/modules/uniwidth/base b/modules/uniwidth/base
index 2b78dca0eb..4d0cb08402 100644
--- a/modules/uniwidth/base
+++ b/modules/uniwidth/base
@@ -2,15 +2,26 @@ Description:
 Base layer for Unicode string width.
 
 Files:
-lib/uniwidth.h
+lib/uniwidth.in.h
 lib/localcharset.h
+m4/libunistring-base.m4
 
 Depends-on:
 unitypes
 
 configure.ac:
+gl_LIBUNISTRING_LIBHEADER([0.9], [uniwidth.h])
 
 Makefile.am:
+BUILT_SOURCES += $(LIBUNISTRING_UNIWIDTH_H)
+
+uniwidth.h: uniwidth.in.h
+	$(AM_V_GEN)rm -f $@-t $@ && \
+	{ echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \
+	  cat $(srcdir)/uniwidth.in.h; \
+	} > $@-t && \
+	mv -f $@-t $@
+MOSTLYCLEANFILES += uniwidth.h uniwidth.h-t
 
 Include:
 "uniwidth.h"
diff --git a/modules/uniwidth/u16-strwidth b/modules/uniwidth/u16-strwidth
index a11f1aacb3..d5e626bdb3 100644
--- a/modules/uniwidth/u16-strwidth
+++ b/modules/uniwidth/u16-strwidth
@@ -10,9 +10,9 @@ uniwidth/u16-width
 unistr/u16-strlen
 
 configure.ac:
+gl_LIBUNISTRING_LIBSOURCE([0.9], [uniwidth/u16-strwidth.c])
 
 Makefile.am:
-lib_SOURCES += uniwidth/u16-strwidth.c
 
 Include:
 "uniwidth.h"
diff --git a/modules/uniwidth/u16-strwidth-tests b/modules/uniwidth/u16-strwidth-tests
index 84d0c7e798..17998aac54 100644
--- a/modules/uniwidth/u16-strwidth-tests
+++ b/modules/uniwidth/u16-strwidth-tests
@@ -10,4 +10,4 @@ Makefile.am:
 TESTS += test-u16-strwidth
 check_PROGRAMS += test-u16-strwidth
 test_u16_strwidth_SOURCES = uniwidth/test-u16-strwidth.c
-
+test_u16_strwidth_LDADD = $(LDADD) $(LIBUNISTRING)
diff --git a/modules/uniwidth/u16-width b/modules/uniwidth/u16-width
index ae31a3f60d..4b34d3bee0 100644
--- a/modules/uniwidth/u16-width
+++ b/modules/uniwidth/u16-width
@@ -10,9 +10,9 @@ uniwidth/width
 unistr/u16-mbtouc-unsafe
 
 configure.ac:
+gl_LIBUNISTRING_LIBSOURCE([0.9], [uniwidth/u16-width.c])
 
 Makefile.am:
-lib_SOURCES += uniwidth/u16-width.c
 
 Include:
 "uniwidth.h"
diff --git a/modules/uniwidth/u16-width-tests b/modules/uniwidth/u16-width-tests
index 3a872035ad..cea7ca7e71 100644
--- a/modules/uniwidth/u16-width-tests
+++ b/modules/uniwidth/u16-width-tests
@@ -10,4 +10,4 @@ Makefile.am:
 TESTS += test-u16-width
 check_PROGRAMS += test-u16-width
 test_u16_width_SOURCES = uniwidth/test-u16-width.c
-
+test_u16_width_LDADD = $(LDADD) $(LIBUNISTRING)
diff --git a/modules/uniwidth/u32-strwidth b/modules/uniwidth/u32-strwidth
index fbd140025c..2769fed472 100644
--- a/modules/uniwidth/u32-strwidth
+++ b/modules/uniwidth/u32-strwidth
@@ -10,9 +10,9 @@ uniwidth/u32-width
 unistr/u32-strlen
 
 configure.ac:
+gl_LIBUNISTRING_LIBSOURCE([0.9], [uniwidth/u32-strwidth.c])
 
 Makefile.am:
-lib_SOURCES += uniwidth/u32-strwidth.c
 
 Include:
 "uniwidth.h"
diff --git a/modules/uniwidth/u32-strwidth-tests b/modules/uniwidth/u32-strwidth-tests
index a8e34da4b7..51006b7219 100644
--- a/modules/uniwidth/u32-strwidth-tests
+++ b/modules/uniwidth/u32-strwidth-tests
@@ -10,4 +10,4 @@ Makefile.am:
 TESTS += test-u32-strwidth
 check_PROGRAMS += test-u32-strwidth
 test_u32_strwidth_SOURCES = uniwidth/test-u32-strwidth.c
-
+test_u32_strwidth_LDADD = $(LDADD) $(LIBUNISTRING)
diff --git a/modules/uniwidth/u32-width b/modules/uniwidth/u32-width
index a5660fcdc6..55e00161b4 100644
--- a/modules/uniwidth/u32-width
+++ b/modules/uniwidth/u32-width
@@ -9,9 +9,9 @@ uniwidth/base
 uniwidth/width
 
 configure.ac:
+gl_LIBUNISTRING_LIBSOURCE([0.9], [uniwidth/u32-width.c])
 
 Makefile.am:
-lib_SOURCES += uniwidth/u32-width.c
 
 Include:
 "uniwidth.h"
diff --git a/modules/uniwidth/u32-width-tests b/modules/uniwidth/u32-width-tests
index 934402fd95..349d19048a 100644
--- a/modules/uniwidth/u32-width-tests
+++ b/modules/uniwidth/u32-width-tests
@@ -10,4 +10,4 @@ Makefile.am:
 TESTS += test-u32-width
 check_PROGRAMS += test-u32-width
 test_u32_width_SOURCES = uniwidth/test-u32-width.c
-
+test_u32_width_LDADD = $(LDADD) $(LIBUNISTRING)
diff --git a/modules/uniwidth/u8-strwidth b/modules/uniwidth/u8-strwidth
index 49b2df92b4..5d7d14824a 100644
--- a/modules/uniwidth/u8-strwidth
+++ b/modules/uniwidth/u8-strwidth
@@ -10,9 +10,9 @@ uniwidth/u8-width
 unistr/u8-strlen
 
 configure.ac:
+gl_LIBUNISTRING_LIBSOURCE([0.9], [uniwidth/u8-strwidth.c])
 
 Makefile.am:
-lib_SOURCES += uniwidth/u8-strwidth.c
 
 Include:
 "uniwidth.h"
diff --git a/modules/uniwidth/u8-strwidth-tests b/modules/uniwidth/u8-strwidth-tests
index 1898c9064b..ee95db9d86 100644
--- a/modules/uniwidth/u8-strwidth-tests
+++ b/modules/uniwidth/u8-strwidth-tests
@@ -10,4 +10,4 @@ Makefile.am:
 TESTS += test-u8-strwidth
 check_PROGRAMS += test-u8-strwidth
 test_u8_strwidth_SOURCES = uniwidth/test-u8-strwidth.c
-
+test_u8_strwidth_LDADD = $(LDADD) $(LIBUNISTRING)
diff --git a/modules/uniwidth/u8-width b/modules/uniwidth/u8-width
index e00eb8d994..a4d1ebef3a 100644
--- a/modules/uniwidth/u8-width
+++ b/modules/uniwidth/u8-width
@@ -10,9 +10,9 @@ uniwidth/width
 unistr/u8-mbtouc-unsafe
 
 configure.ac:
+gl_LIBUNISTRING_LIBSOURCE([0.9], [uniwidth/u8-width.c])
 
 Makefile.am:
-lib_SOURCES += uniwidth/u8-width.c
 
 Include:
 "uniwidth.h"
diff --git a/modules/uniwidth/u8-width-tests b/modules/uniwidth/u8-width-tests
index a0112a76c2..f334af1e7c 100644
--- a/modules/uniwidth/u8-width-tests
+++ b/modules/uniwidth/u8-width-tests
@@ -10,4 +10,4 @@ Makefile.am:
 TESTS += test-u8-width
 check_PROGRAMS += test-u8-width
 test_u8_width_SOURCES = uniwidth/test-u8-width.c
-
+test_u8_width_LDADD = $(LDADD) $(LIBUNISTRING)
diff --git a/modules/uniwidth/width b/modules/uniwidth/width
index d0fe6540b2..50a427c5c2 100644
--- a/modules/uniwidth/width
+++ b/modules/uniwidth/width
@@ -10,9 +10,9 @@ uniwidth/base
 streq
 
 configure.ac:
+gl_LIBUNISTRING_LIBSOURCE([0.9], [uniwidth/width.c])
 
 Makefile.am:
-lib_SOURCES += uniwidth/width.c
 
 Include:
 "uniwidth.h"
diff --git a/modules/uniwidth/width-tests b/modules/uniwidth/width-tests
index c6caf1f6b2..9549760987 100644
--- a/modules/uniwidth/width-tests
+++ b/modules/uniwidth/width-tests
@@ -12,5 +12,6 @@ Makefile.am:
 TESTS += test-uc_width uniwidth/test-uc_width2.sh
 check_PROGRAMS += test-uc_width test-uc_width2
 test_uc_width_SOURCES = uniwidth/test-uc_width.c
+test_uc_width_LDADD = $(LDADD) $(LIBUNISTRING)
 test_uc_width2_SOURCES = uniwidth/test-uc_width2.c
-
+test_uc_width2_LDADD = $(LDADD) $(LIBUNISTRING)