[PATCH 11/15] uninorm: support libunistring-optional

[Paolo Bonzini]

* lib/uninorm.h: Rename to...
* lib/uninorm.in.h: ... this.
* modules/uninorm/base: Adjust, use gl_LIBUNISTRING_HEADER.
* modules/uninorm/*: Use gl_LIBUNISTRING_LIBOBJ.
---
 lib/{uninorm.h => uninorm.in.h}         |    0
 modules/uninorm/base                    |    4 +++-
 modules/uninorm/canonical-decomposition |    2 +-
 modules/uninorm/compat-decomposition    |    2 +-
 modules/uninorm/composition             |    4 ++--
 modules/uninorm/decompose-internal      |    2 +-
 modules/uninorm/decomposing-form        |    2 +-
 modules/uninorm/decomposition           |    2 +-
 modules/uninorm/decomposition-table     |    2 +-
 modules/uninorm/filter                  |    2 +-
 modules/uninorm/nfc                     |    2 +-
 modules/uninorm/nfd                     |    2 +-
 modules/uninorm/nfkc                    |    2 +-
 modules/uninorm/nfkd                    |    2 +-
 modules/uninorm/u16-normalize           |    2 +-
 modules/uninorm/u16-normcmp             |    2 +-
 modules/uninorm/u16-normcoll            |    2 +-
 modules/uninorm/u16-normxfrm            |    2 +-
 modules/uninorm/u32-normalize           |    2 +-
 modules/uninorm/u32-normcmp             |    2 +-
 modules/uninorm/u32-normcoll            |    2 +-
 modules/uninorm/u32-normxfrm            |    2 +-
 modules/uninorm/u8-normalize            |    2 +-
 modules/uninorm/u8-normcmp              |    2 +-
 modules/uninorm/u8-normcoll             |    2 +-
 modules/uninorm/u8-normxfrm             |    2 +-
 26 files changed, 28 insertions(+), 26 deletions(-)
 rename lib/{uninorm.h => uninorm.in.h} (100%)

diff --git a/lib/uninorm.h b/lib/uninorm.in.h
similarity index 100%
rename from lib/uninorm.h
rename to lib/uninorm.in.h
diff --git a/modules/uninorm/base b/modules/uninorm/base
index 062a5be..d248cc6 100644
--- a/modules/uninorm/base
+++ b/modules/uninorm/base
@@ -2,12 +2,14 @@ Description:
 Base layer for normalization forms of Unicode strings.
 
 Files:
-lib/uninorm.h
+lib/uninorm.in.h
+m4/libunistring-optional.m4
 
 Depends-on:
 unitypes
 
 configure.ac:
+gl_LIBUNISTRING_HEADER([uninorm])
 
 Makefile.am:
 
diff --git a/modules/uninorm/canonical-decomposition 
b/modules/uninorm/canonical-decomposition
index 8579e6e..5edb16b 100644
--- a/modules/uninorm/canonical-decomposition
+++ b/modules/uninorm/canonical-decomposition
@@ -9,9 +9,9 @@ uninorm/base
 uninorm/decomposition-table
 
 configure.ac:
+gl_LIBUNISTRING_LIBOBJ([uninorm/canonical-decomposition])
 
 Makefile.am:
-lib_SOURCES += uninorm/canonical-decomposition.c
 
 Include:
 "uninorm.h"
diff --git a/modules/uninorm/compat-decomposition 
b/modules/uninorm/compat-decomposition
index 17c8d45..236e187 100644
--- a/modules/uninorm/compat-decomposition
+++ b/modules/uninorm/compat-decomposition
@@ -10,9 +10,9 @@ uninorm/base
 uninorm/decomposition
 
 configure.ac:
+gl_LIBUNISTRING_LIBOBJ([uninorm/compat-decomposition])
 
 Makefile.am:
-lib_SOURCES += uninorm/compat-decomposition.c
 
 Include:
 "uninorm/decompose-internal.h"
diff --git a/modules/uninorm/composition b/modules/uninorm/composition
index 4b8b1df..1ca3a6e 100644
--- a/modules/uninorm/composition
+++ b/modules/uninorm/composition
@@ -3,16 +3,16 @@ Composition of Unicode characters.
 
 Files:
 lib/uninorm/composition.c
-lib/uninorm/composition-table.gperf
+lib/uninorm/composition-table.gperf.c
 
 Depends-on:
 uninorm/base
 gperf
 
 configure.ac:
+gl_LIBUNISTRING_LIBOBJ([uninorm/composition])
 
 Makefile.am:
-lib_SOURCES += uninorm/composition.c
 
 uninorm/composition-table.h: $(srcdir)/uninorm/composition-table.gperf
        $(GPERF) -m 1 $(srcdir)/uninorm/composition-table.gperf > 
$(srcdir)/uninorm/composition-table.h-t
diff --git a/modules/uninorm/decompose-internal 
b/modules/uninorm/decompose-internal
index 575de10..6af7a6f 100644
--- a/modules/uninorm/decompose-internal
+++ b/modules/uninorm/decompose-internal
@@ -10,9 +10,9 @@ unitypes
 array-mergesort
 
 configure.ac:
+gl_LIBUNISTRING_LIBOBJ([uninorm/decompose-internal])
 
 Makefile.am:
-lib_SOURCES += uninorm/decompose-internal.c
 
 Include:
 "uninorm/decompose-internal.h"
diff --git a/modules/uninorm/decomposing-form b/modules/uninorm/decomposing-form
index 3df8f9d..eea361e 100644
--- a/modules/uninorm/decomposing-form
+++ b/modules/uninorm/decomposing-form
@@ -9,9 +9,9 @@ Depends-on:
 uninorm/base
 
 configure.ac:
+gl_LIBUNISTRING_LIBOBJ([uninorm/decomposing-form])
 
 Makefile.am:
-lib_SOURCES += uninorm/decomposing-form.c
 
 Include:
 "uninorm.h"
diff --git a/modules/uninorm/decomposition b/modules/uninorm/decomposition
index ac09f1f..9f63cae 100644
--- a/modules/uninorm/decomposition
+++ b/modules/uninorm/decomposition
@@ -9,9 +9,9 @@ uninorm/base
 uninorm/decomposition-table
 
 configure.ac:
+gl_LIBUNISTRING_LIBOBJ([uninorm/decomposition])
 
 Makefile.am:
-lib_SOURCES += uninorm/decomposition.c
 
 Include:
 "uninorm.h"
diff --git a/modules/uninorm/decomposition-table 
b/modules/uninorm/decomposition-table
index 7aa21b7..29ae0f0 100644
--- a/modules/uninorm/decomposition-table
+++ b/modules/uninorm/decomposition-table
@@ -12,9 +12,9 @@ uninorm/base
 
 configure.ac:
 AC_REQUIRE([AC_C_INLINE])
+gl_LIBUNISTRING_LIBOBJ([uninorm/decomposition-table])
 
 Makefile.am:
-lib_SOURCES += uninorm/decomposition-table.c
 
 Include:
 "uninorm/decomposition-table.h"
diff --git a/modules/uninorm/filter b/modules/uninorm/filter
index fed14de..dbd54b5 100644
--- a/modules/uninorm/filter
+++ b/modules/uninorm/filter
@@ -12,9 +12,9 @@ uninorm/decompose-internal
 malloc-posix
 
 configure.ac:
+gl_LIBUNISTRING_LIBOBJ([uninorm/uninorm-filter])
 
 Makefile.am:
-lib_SOURCES += uninorm/uninorm-filter.c
 
 Include:
 "uninorm.h"
diff --git a/modules/uninorm/nfc b/modules/uninorm/nfc
index 31417d3..1732a0e 100644
--- a/modules/uninorm/nfc
+++ b/modules/uninorm/nfc
@@ -12,9 +12,9 @@ uninorm/composition
 uninorm/nfd
 
 configure.ac:
+gl_LIBUNISTRING_LIBOBJ([uninorm/nfc])
 
 Makefile.am:
-lib_SOURCES += uninorm/nfc.c
 
 Include:
 "uninorm.h"
diff --git a/modules/uninorm/nfd b/modules/uninorm/nfd
index ee18334..ebb7b23 100644
--- a/modules/uninorm/nfd
+++ b/modules/uninorm/nfd
@@ -10,9 +10,9 @@ uninorm/base
 uninorm/canonical-decomposition
 
 configure.ac:
+gl_LIBUNISTRING_LIBOBJ([uninorm/nfd])
 
 Makefile.am:
-lib_SOURCES += uninorm/nfd.c
 
 Include:
 "uninorm.h"
diff --git a/modules/uninorm/nfkc b/modules/uninorm/nfkc
index 408c8a1..5671462 100644
--- a/modules/uninorm/nfkc
+++ b/modules/uninorm/nfkc
@@ -12,9 +12,9 @@ uninorm/composition
 uninorm/nfkd
 
 configure.ac:
+gl_LIBUNISTRING_LIBOBJ([uninorm/nfkc])
 
 Makefile.am:
-lib_SOURCES += uninorm/nfkc.c
 
 Include:
 "uninorm.h"
diff --git a/modules/uninorm/nfkd b/modules/uninorm/nfkd
index 0a2510c..a33d2d6 100644
--- a/modules/uninorm/nfkd
+++ b/modules/uninorm/nfkd
@@ -10,9 +10,9 @@ uninorm/base
 uninorm/compat-decomposition
 
 configure.ac:
+gl_LIBUNISTRING_LIBOBJ([uninorm/nfkd])
 
 Makefile.am:
-lib_SOURCES += uninorm/nfkd.c
 
 Include:
 "uninorm.h"
diff --git a/modules/uninorm/u16-normalize b/modules/uninorm/u16-normalize
index 5338e5e..a8b2de1 100644
--- a/modules/uninorm/u16-normalize
+++ b/modules/uninorm/u16-normalize
@@ -16,9 +16,9 @@ uninorm/decompose-internal
 
 configure.ac:
 gl_MODULE_INDICATOR_FOR_TESTS([uninorm/u16-normalize])
+gl_LIBUNISTRING_LIBOBJ([uninorm/u16-normalize])
 
 Makefile.am:
-lib_SOURCES += uninorm/u16-normalize.c
 
 Include:
 "uninorm.h"
diff --git a/modules/uninorm/u16-normcmp b/modules/uninorm/u16-normcmp
index da41404..77c7c7a 100644
--- a/modules/uninorm/u16-normcmp
+++ b/modules/uninorm/u16-normcmp
@@ -12,9 +12,9 @@ unistr/u16-cmp2
 minmax
 
 configure.ac:
+gl_LIBUNISTRING_LIBOBJ([uninorm/u16-normcmp])
 
 Makefile.am:
-lib_SOURCES += uninorm/u16-normcmp.c
 
 Include:
 "uninorm.h"
diff --git a/modules/uninorm/u16-normcoll b/modules/uninorm/u16-normcoll
index c55e2cc..87c80b3 100644
--- a/modules/uninorm/u16-normcoll
+++ b/modules/uninorm/u16-normcoll
@@ -11,9 +11,9 @@ uninorm/u16-normxfrm
 memcmp2
 
 configure.ac:
+gl_LIBUNISTRING_LIBOBJ([uninorm/u16-normcoll])
 
 Makefile.am:
-lib_SOURCES += uninorm/u16-normcoll.c
 
 Include:
 "uninorm.h"
diff --git a/modules/uninorm/u16-normxfrm b/modules/uninorm/u16-normxfrm
index 7ef751e..28ab237 100644
--- a/modules/uninorm/u16-normxfrm
+++ b/modules/uninorm/u16-normxfrm
@@ -13,9 +13,9 @@ localcharset
 memxfrm
 
 configure.ac:
+gl_LIBUNISTRING_LIBOBJ([uninorm/u16-normxfrm])
 
 Makefile.am:
-lib_SOURCES += uninorm/u16-normxfrm.c
 
 Include:
 "uninorm.h"
diff --git a/modules/uninorm/u32-normalize b/modules/uninorm/u32-normalize
index 91b54b9..257f2d7 100644
--- a/modules/uninorm/u32-normalize
+++ b/modules/uninorm/u32-normalize
@@ -16,9 +16,9 @@ uninorm/decompose-internal
 
 configure.ac:
 gl_MODULE_INDICATOR_FOR_TESTS([uninorm/u32-normalize])
+gl_LIBUNISTRING_LIBOBJ([uninorm/u32-normalize])
 
 Makefile.am:
-lib_SOURCES += uninorm/u32-normalize.c
 
 Include:
 "uninorm.h"
diff --git a/modules/uninorm/u32-normcmp b/modules/uninorm/u32-normcmp
index 0b4f506..6287db7 100644
--- a/modules/uninorm/u32-normcmp
+++ b/modules/uninorm/u32-normcmp
@@ -12,9 +12,9 @@ unistr/u32-cmp2
 minmax
 
 configure.ac:
+gl_LIBUNISTRING_LIBOBJ([uninorm/u32-normcmp])
 
 Makefile.am:
-lib_SOURCES += uninorm/u32-normcmp.c
 
 Include:
 "uninorm.h"
diff --git a/modules/uninorm/u32-normcoll b/modules/uninorm/u32-normcoll
index 76b093e..ad0654e 100644
--- a/modules/uninorm/u32-normcoll
+++ b/modules/uninorm/u32-normcoll
@@ -11,9 +11,9 @@ uninorm/u32-normxfrm
 memcmp2
 
 configure.ac:
+gl_LIBUNISTRING_LIBOBJ([uninorm/u32-normcoll])
 
 Makefile.am:
-lib_SOURCES += uninorm/u32-normcoll.c
 
 Include:
 "uninorm.h"
diff --git a/modules/uninorm/u32-normxfrm b/modules/uninorm/u32-normxfrm
index d0d0260..4511bad 100644
--- a/modules/uninorm/u32-normxfrm
+++ b/modules/uninorm/u32-normxfrm
@@ -13,9 +13,9 @@ localcharset
 memxfrm
 
 configure.ac:
+gl_LIBUNISTRING_LIBOBJ([uninorm/u32-normxfrm])
 
 Makefile.am:
-lib_SOURCES += uninorm/u32-normxfrm.c
 
 Include:
 "uninorm.h"
diff --git a/modules/uninorm/u8-normalize b/modules/uninorm/u8-normalize
index 75670af..17cdf73 100644
--- a/modules/uninorm/u8-normalize
+++ b/modules/uninorm/u8-normalize
@@ -16,9 +16,9 @@ uninorm/decompose-internal
 
 configure.ac:
 gl_MODULE_INDICATOR_FOR_TESTS([uninorm/u8-normalize])
+gl_LIBUNISTRING_LIBOBJ([uninorm/u8-normalize])
 
 Makefile.am:
-lib_SOURCES += uninorm/u8-normalize.c
 
 Include:
 "uninorm.h"
diff --git a/modules/uninorm/u8-normcmp b/modules/uninorm/u8-normcmp
index 21de0ef..bc7b039 100644
--- a/modules/uninorm/u8-normcmp
+++ b/modules/uninorm/u8-normcmp
@@ -12,9 +12,9 @@ unistr/u8-cmp2
 minmax
 
 configure.ac:
+gl_LIBUNISTRING_LIBOBJ([uninorm/u8-normcmp])
 
 Makefile.am:
-lib_SOURCES += uninorm/u8-normcmp.c
 
 Include:
 "uninorm.h"
diff --git a/modules/uninorm/u8-normcoll b/modules/uninorm/u8-normcoll
index 143e18e..c92661d 100644
--- a/modules/uninorm/u8-normcoll
+++ b/modules/uninorm/u8-normcoll
@@ -11,9 +11,9 @@ uninorm/u8-normxfrm
 memcmp2
 
 configure.ac:
+gl_LIBUNISTRING_LIBOBJ([uninorm/u8-normcoll])
 
 Makefile.am:
-lib_SOURCES += uninorm/u8-normcoll.c
 
 Include:
 "uninorm.h"
diff --git a/modules/uninorm/u8-normxfrm b/modules/uninorm/u8-normxfrm
index b53918f..0c508f7 100644
--- a/modules/uninorm/u8-normxfrm
+++ b/modules/uninorm/u8-normxfrm
@@ -13,9 +13,9 @@ localcharset
 memxfrm
 
 configure.ac:
+gl_LIBUNISTRING_LIBOBJ([uninorm/u8-normxfrm])
 
 Makefile.am:
-lib_SOURCES += uninorm/u8-normxfrm.c
 
 Include:
 "uninorm.h"
-- 
1.6.6.1