[PATCH 15/15] uniwidth: support libunistring-optional

[Paolo Bonzini]

* lib/uniwidth.h: Rename to...
* lib/uniwidth.in.h: ... this.
* modules/uniwidth/base: Adjust, use gl_LIBUNISTRING_HEADER.
* modules/uniwidth/*: Use gl_LIBUNISTRING_LIBOBJ.
---
 lib/{uniwidth.h => uniwidth.in.h} |    0
 modules/uniwidth/base             |    4 +++-
 modules/uniwidth/u16-strwidth     |    2 +-
 modules/uniwidth/u16-width        |    2 +-
 modules/uniwidth/u32-strwidth     |    2 +-
 modules/uniwidth/u32-width        |    2 +-
 modules/uniwidth/u8-strwidth      |    2 +-
 modules/uniwidth/u8-width         |    2 +-
 modules/uniwidth/width            |    2 +-
 9 files changed, 10 insertions(+), 8 deletions(-)
 rename lib/{uniwidth.h => uniwidth.in.h} (100%)

diff --git a/lib/uniwidth.h b/lib/uniwidth.in.h
similarity index 100%
rename from lib/uniwidth.h
rename to lib/uniwidth.in.h
diff --git a/modules/uniwidth/base b/modules/uniwidth/base
index 2b78dca..ffb8913 100644
--- a/modules/uniwidth/base
+++ b/modules/uniwidth/base
@@ -2,13 +2,15 @@ Description:
 Base layer for Unicode string width.
 
 Files:
-lib/uniwidth.h
+lib/uniwidth.in.h
 lib/localcharset.h
+m4/libunistring-optional.m4
 
 Depends-on:
 unitypes
 
 configure.ac:
+gl_LIBUNISTRING_HEADER([uniwidth])
 
 Makefile.am:
 
diff --git a/modules/uniwidth/u16-strwidth b/modules/uniwidth/u16-strwidth
index a11f1aa..8208c94 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_LIBOBJ([uniwidth/u16-strwidth])
 
 Makefile.am:
-lib_SOURCES += uniwidth/u16-strwidth.c
 
 Include:
 "uniwidth.h"
diff --git a/modules/uniwidth/u16-width b/modules/uniwidth/u16-width
index ae31a3f..390725f 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_LIBOBJ([uniwidth/u16-width])
 
 Makefile.am:
-lib_SOURCES += uniwidth/u16-width.c
 
 Include:
 "uniwidth.h"
diff --git a/modules/uniwidth/u32-strwidth b/modules/uniwidth/u32-strwidth
index fbd1400..b98cf3d 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_LIBOBJ([uniwidth/u32-strwidth])
 
 Makefile.am:
-lib_SOURCES += uniwidth/u32-strwidth.c
 
 Include:
 "uniwidth.h"
diff --git a/modules/uniwidth/u32-width b/modules/uniwidth/u32-width
index a5660fc..83fdd48 100644
--- a/modules/uniwidth/u32-width
+++ b/modules/uniwidth/u32-width
@@ -9,9 +9,9 @@ uniwidth/base
 uniwidth/width
 
 configure.ac:
+gl_LIBUNISTRING_LIBOBJ([uniwidth/u32-width])
 
 Makefile.am:
-lib_SOURCES += uniwidth/u32-width.c
 
 Include:
 "uniwidth.h"
diff --git a/modules/uniwidth/u8-strwidth b/modules/uniwidth/u8-strwidth
index 49b2df9..6d72712 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_LIBOBJ([uniwidth/u8-strwidth])
 
 Makefile.am:
-lib_SOURCES += uniwidth/u8-strwidth.c
 
 Include:
 "uniwidth.h"
diff --git a/modules/uniwidth/u8-width b/modules/uniwidth/u8-width
index e00eb8d..7fdf19e 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_LIBOBJ([uniwidth/u8-width])
 
 Makefile.am:
-lib_SOURCES += uniwidth/u8-width.c
 
 Include:
 "uniwidth.h"
diff --git a/modules/uniwidth/width b/modules/uniwidth/width
index d0fe654..0133a0c 100644
--- a/modules/uniwidth/width
+++ b/modules/uniwidth/width
@@ -10,9 +10,9 @@ uniwidth/base
 streq
 
 configure.ac:
+gl_LIBUNISTRING_LIBOBJ([uniwidth/width])
 
 Makefile.am:
-lib_SOURCES += uniwidth/width.c
 
 Include:
 "uniwidth.h"
-- 
1.6.6.1