[PATCH 07/15] uniconv: support libunistring-optional

[Paolo Bonzini]

* lib/uniconv.h: Rename to...
* lib/uniconv.in.h: ... this.
* modules/uniconv/base: Adjust, use gl_LIBUNISTRING_HEADER.
* modules/uniconv/*: Use gl_LIBUNISTRING_LIBOBJ.
---
 lib/{uniconv.h => uniconv.in.h}         |    0
 modules/uniconv/base                    |    4 +++-
 modules/uniconv/u16-conv-from-enc       |    2 +-
 modules/uniconv/u16-conv-to-enc         |    2 +-
 modules/uniconv/u16-strconv-from-enc    |    2 +-
 modules/uniconv/u16-strconv-from-locale |    2 +-
 modules/uniconv/u16-strconv-to-enc      |    2 +-
 modules/uniconv/u16-strconv-to-locale   |    2 +-
 modules/uniconv/u32-conv-from-enc       |    2 +-
 modules/uniconv/u32-conv-to-enc         |    2 +-
 modules/uniconv/u32-strconv-from-enc    |    2 +-
 modules/uniconv/u32-strconv-from-locale |    2 +-
 modules/uniconv/u32-strconv-to-enc      |    2 +-
 modules/uniconv/u32-strconv-to-locale   |    2 +-
 modules/uniconv/u8-conv-from-enc        |    2 +-
 modules/uniconv/u8-conv-to-enc          |    2 +-
 modules/uniconv/u8-strconv-from-enc     |    2 +-
 modules/uniconv/u8-strconv-from-locale  |    2 +-
 modules/uniconv/u8-strconv-to-enc       |    2 +-
 modules/uniconv/u8-strconv-to-locale    |    2 +-
 20 files changed, 21 insertions(+), 19 deletions(-)
 rename lib/{uniconv.h => uniconv.in.h} (100%)

diff --git a/lib/uniconv.h b/lib/uniconv.in.h
similarity index 100%
rename from lib/uniconv.h
rename to lib/uniconv.in.h
diff --git a/modules/uniconv/base b/modules/uniconv/base
index b5c6786..ecaf2f4 100644
--- a/modules/uniconv/base
+++ b/modules/uniconv/base
@@ -2,15 +2,17 @@ Description:
 Base layer for conversion from/to legacy encodings.
 
 Files:
-lib/uniconv.h
+lib/uniconv.in.h
 lib/iconveh.h
 lib/striconveha.h
 lib/localcharset.h
+m4/libunistring-optional.m4
 
 Depends-on:
 unitypes
 
 configure.ac:
+gl_LIBUNISTRING_HEADER([uniconv])
 
 Makefile.am:
 
diff --git a/modules/uniconv/u16-conv-from-enc 
b/modules/uniconv/u16-conv-from-enc
index acb9c99..eb56fef 100644
--- a/modules/uniconv/u16-conv-from-enc
+++ b/modules/uniconv/u16-conv-from-enc
@@ -15,9 +15,9 @@ unistr/u16-mblen
 
 configure.ac:
 AC_REQUIRE([gl_BIGENDIAN])
+gl_LIBUNISTRING_LIBOBJ([uniconv/u16-conv-from-enc])
 
 Makefile.am:
-lib_SOURCES += uniconv/u16-conv-from-enc.c
 
 Include:
 "uniconv.h"
diff --git a/modules/uniconv/u16-conv-to-enc b/modules/uniconv/u16-conv-to-enc
index 2a5012e..683afb0 100644
--- a/modules/uniconv/u16-conv-to-enc
+++ b/modules/uniconv/u16-conv-to-enc
@@ -16,9 +16,9 @@ unistr/u8-mblen
 
 configure.ac:
 AC_REQUIRE([gl_BIGENDIAN])
+gl_LIBUNISTRING_LIBOBJ([uniconv/u16-conv-to-enc])
 
 Makefile.am:
-lib_SOURCES += uniconv/u16-conv-to-enc.c
 
 Include:
 "uniconv.h"
diff --git a/modules/uniconv/u16-strconv-from-enc 
b/modules/uniconv/u16-strconv-from-enc
index a7da446..2a60179 100644
--- a/modules/uniconv/u16-strconv-from-enc
+++ b/modules/uniconv/u16-strconv-from-enc
@@ -11,9 +11,9 @@ uniconv/u16-conv-from-enc
 unistr/u16-strlen
 
 configure.ac:
+gl_LIBUNISTRING_LIBOBJ([uniconv/u16-strconv-from-enc])
 
 Makefile.am:
-lib_SOURCES += uniconv/u16-strconv-from-enc.c
 
 Include:
 "uniconv.h"
diff --git a/modules/uniconv/u16-strconv-from-locale 
b/modules/uniconv/u16-strconv-from-locale
index a8dc48f..834a934 100644
--- a/modules/uniconv/u16-strconv-from-locale
+++ b/modules/uniconv/u16-strconv-from-locale
@@ -10,9 +10,9 @@ uniconv/u16-strconv-from-enc
 localcharset
 
 configure.ac:
+gl_LIBUNISTRING_LIBOBJ([uniconv/u16-strconv-from-locale])
 
 Makefile.am:
-lib_SOURCES += uniconv/u16-strconv-from-locale.c
 
 Include:
 "uniconv.h"
diff --git a/modules/uniconv/u16-strconv-to-enc 
b/modules/uniconv/u16-strconv-to-enc
index 6b6b551..040a90e 100644
--- a/modules/uniconv/u16-strconv-to-enc
+++ b/modules/uniconv/u16-strconv-to-enc
@@ -14,9 +14,9 @@ unistr/u16-strlen
 
 configure.ac:
 AC_REQUIRE([gl_BIGENDIAN])
+gl_LIBUNISTRING_LIBOBJ([uniconv/u16-strconv-to-enc])
 
 Makefile.am:
-lib_SOURCES += uniconv/u16-strconv-to-enc.c
 
 Include:
 "uniconv.h"
diff --git a/modules/uniconv/u16-strconv-to-locale 
b/modules/uniconv/u16-strconv-to-locale
index 264370c..691bbea 100644
--- a/modules/uniconv/u16-strconv-to-locale
+++ b/modules/uniconv/u16-strconv-to-locale
@@ -10,9 +10,9 @@ uniconv/u16-strconv-to-enc
 localcharset
 
 configure.ac:
+gl_LIBUNISTRING_LIBOBJ([uniconv/u16-strconv-to-locale])
 
 Makefile.am:
-lib_SOURCES += uniconv/u16-strconv-to-locale.c
 
 Include:
 "uniconv.h"
diff --git a/modules/uniconv/u32-conv-from-enc 
b/modules/uniconv/u32-conv-from-enc
index 2203c70..81c9db3 100644
--- a/modules/uniconv/u32-conv-from-enc
+++ b/modules/uniconv/u32-conv-from-enc
@@ -14,9 +14,9 @@ unistr/u8-mblen
 unistr/u32-mblen
 
 configure.ac:
+gl_LIBUNISTRING_LIBOBJ([uniconv/u32-conv-from-enc])
 
 Makefile.am:
-lib_SOURCES += uniconv/u32-conv-from-enc.c
 
 Include:
 "uniconv.h"
diff --git a/modules/uniconv/u32-conv-to-enc b/modules/uniconv/u32-conv-to-enc
index 798d966..07045e5 100644
--- a/modules/uniconv/u32-conv-to-enc
+++ b/modules/uniconv/u32-conv-to-enc
@@ -14,9 +14,9 @@ unistr/u32-mblen
 unistr/u8-mblen
 
 configure.ac:
+gl_LIBUNISTRING_LIBOBJ([uniconv/u32-conv-to-enc])
 
 Makefile.am:
-lib_SOURCES += uniconv/u32-conv-to-enc.c
 
 Include:
 "uniconv.h"
diff --git a/modules/uniconv/u32-strconv-from-enc 
b/modules/uniconv/u32-strconv-from-enc
index bdc2e68..e057db8 100644
--- a/modules/uniconv/u32-strconv-from-enc
+++ b/modules/uniconv/u32-strconv-from-enc
@@ -11,9 +11,9 @@ uniconv/u32-conv-from-enc
 unistr/u32-strlen
 
 configure.ac:
+gl_LIBUNISTRING_LIBOBJ([uniconv/u32-strconv-from-enc])
 
 Makefile.am:
-lib_SOURCES += uniconv/u32-strconv-from-enc.c
 
 Include:
 "uniconv.h"
diff --git a/modules/uniconv/u32-strconv-from-locale 
b/modules/uniconv/u32-strconv-from-locale
index 2569ab7..d116d9d 100644
--- a/modules/uniconv/u32-strconv-from-locale
+++ b/modules/uniconv/u32-strconv-from-locale
@@ -10,9 +10,9 @@ uniconv/u32-strconv-from-enc
 localcharset
 
 configure.ac:
+gl_LIBUNISTRING_LIBOBJ([uniconv/u32-strconv-from-locale])
 
 Makefile.am:
-lib_SOURCES += uniconv/u32-strconv-from-locale.c
 
 Include:
 "uniconv.h"
diff --git a/modules/uniconv/u32-strconv-to-enc 
b/modules/uniconv/u32-strconv-to-enc
index 27c8adc..979cce8 100644
--- a/modules/uniconv/u32-strconv-to-enc
+++ b/modules/uniconv/u32-strconv-to-enc
@@ -13,9 +13,9 @@ unistr/u32-to-u8
 unistr/u32-strlen
 
 configure.ac:
+gl_LIBUNISTRING_LIBOBJ([uniconv/u32-strconv-to-enc])
 
 Makefile.am:
-lib_SOURCES += uniconv/u32-strconv-to-enc.c
 
 Include:
 "uniconv.h"
diff --git a/modules/uniconv/u32-strconv-to-locale 
b/modules/uniconv/u32-strconv-to-locale
index 2763186..8823507 100644
--- a/modules/uniconv/u32-strconv-to-locale
+++ b/modules/uniconv/u32-strconv-to-locale
@@ -10,9 +10,9 @@ uniconv/u32-strconv-to-enc
 localcharset
 
 configure.ac:
+gl_LIBUNISTRING_LIBOBJ([uniconv/u32-strconv-to-locale])
 
 Makefile.am:
-lib_SOURCES += uniconv/u32-strconv-to-locale.c
 
 Include:
 "uniconv.h"
diff --git a/modules/uniconv/u8-conv-from-enc b/modules/uniconv/u8-conv-from-enc
index f3f9c67..a7e9d5d 100644
--- a/modules/uniconv/u8-conv-from-enc
+++ b/modules/uniconv/u8-conv-from-enc
@@ -12,9 +12,9 @@ unistr/u8-check
 unistr/u8-mblen
 
 configure.ac:
+gl_LIBUNISTRING_LIBOBJ([uniconv/u8-conv-from-enc])
 
 Makefile.am:
-lib_SOURCES += uniconv/u8-conv-from-enc.c
 
 Include:
 "uniconv.h"
diff --git a/modules/uniconv/u8-conv-to-enc b/modules/uniconv/u8-conv-to-enc
index 1d82b0e..971a50e 100644
--- a/modules/uniconv/u8-conv-to-enc
+++ b/modules/uniconv/u8-conv-to-enc
@@ -11,9 +11,9 @@ striconveha
 unistr/u8-check
 
 configure.ac:
+gl_LIBUNISTRING_LIBOBJ([uniconv/u8-conv-to-enc])
 
 Makefile.am:
-lib_SOURCES += uniconv/u8-conv-to-enc.c
 
 Include:
 "uniconv.h"
diff --git a/modules/uniconv/u8-strconv-from-enc 
b/modules/uniconv/u8-strconv-from-enc
index f3a4cdf..802db4c 100644
--- a/modules/uniconv/u8-strconv-from-enc
+++ b/modules/uniconv/u8-strconv-from-enc
@@ -11,9 +11,9 @@ uniconv/u8-conv-from-enc
 unistr/u8-strlen
 
 configure.ac:
+gl_LIBUNISTRING_LIBOBJ([uniconv/u8-strconv-from-enc])
 
 Makefile.am:
-lib_SOURCES += uniconv/u8-strconv-from-enc.c
 
 Include:
 "uniconv.h"
diff --git a/modules/uniconv/u8-strconv-from-locale 
b/modules/uniconv/u8-strconv-from-locale
index f72d5b8..970477d 100644
--- a/modules/uniconv/u8-strconv-from-locale
+++ b/modules/uniconv/u8-strconv-from-locale
@@ -10,9 +10,9 @@ uniconv/u8-strconv-from-enc
 localcharset
 
 configure.ac:
+gl_LIBUNISTRING_LIBOBJ([uniconv/u8-strconv-from-locale])
 
 Makefile.am:
-lib_SOURCES += uniconv/u8-strconv-from-locale.c
 
 Include:
 "uniconv.h"
diff --git a/modules/uniconv/u8-strconv-to-enc 
b/modules/uniconv/u8-strconv-to-enc
index bc30b8c..5190e90 100644
--- a/modules/uniconv/u8-strconv-to-enc
+++ b/modules/uniconv/u8-strconv-to-enc
@@ -12,9 +12,9 @@ unistr/u8-check
 unistr/u8-strlen
 
 configure.ac:
+gl_LIBUNISTRING_LIBOBJ([uniconv/u8-strconv-to-enc])
 
 Makefile.am:
-lib_SOURCES += uniconv/u8-strconv-to-enc.c
 
 Include:
 "uniconv.h"
diff --git a/modules/uniconv/u8-strconv-to-locale 
b/modules/uniconv/u8-strconv-to-locale
index d7f625c..394ef0c 100644
--- a/modules/uniconv/u8-strconv-to-locale
+++ b/modules/uniconv/u8-strconv-to-locale
@@ -10,9 +10,9 @@ uniconv/u8-strconv-to-enc
 localcharset
 
 configure.ac:
+gl_LIBUNISTRING_LIBOBJ([uniconv/u8-strconv-to-locale])
 
 Makefile.am:
-lib_SOURCES += uniconv/u8-strconv-to-locale.c
 
 Include:
 "uniconv.h"
-- 
1.6.6.1