summaryrefslogtreecommitdiff
path: root/modules/uninorm
diff options
context:
space:
mode:
Diffstat (limited to 'modules/uninorm')
-rw-r--r--modules/uninorm/base13
-rw-r--r--modules/uninorm/nfc3
-rw-r--r--modules/uninorm/nfd3
-rw-r--r--modules/uninorm/nfkc3
-rw-r--r--modules/uninorm/nfkd3
5 files changed, 19 insertions, 6 deletions
diff --git a/modules/uninorm/base b/modules/uninorm/base
index 65c8fe61c9..d5b8854828 100644
--- a/modules/uninorm/base
+++ b/modules/uninorm/base
@@ -4,13 +4,16 @@ Base layer for normalization forms of Unicode strings.
Files:
lib/uninorm.in.h
m4/libunistring-base.m4
+m4/uninorm_h.m4
Depends-on:
gen-header
unitypes
configure.ac:
-gl_LIBUNISTRING_LIBHEADER([0.9.11], [uninorm.h])
+gl_LIBUNISTRING_LIBHEADER([1.2], [uninorm.h])
+gl_UNINORM_H
+gl_UNINORM_H_REQUIRE_DEFAULTS
AC_PROG_MKDIR_P
Makefile.am:
@@ -18,7 +21,13 @@ BUILT_SOURCES += $(LIBUNISTRING_UNINORM_H)
uninorm.h: uninorm.in.h
@NMD@ $(AM_V_GEN)$(MKDIR_P) '%reldir%'
- $(gl_V_at)$(SED_HEADER_TO_AT_t) $(srcdir)/uninorm.in.h
+ $(gl_V_at)$(SED_HEADER_STDOUT) \
+ -e 's|@''HAVE_UNISTRING_WOE32DLL_H''@|$(HAVE_UNISTRING_WOE32DLL_H)|g' \
+ -e 's/@''GNULIB_UNINORM_NFD_DLL_VARIABLE''@/$(GNULIB_UNINORM_NFD_DLL_VARIABLE)/g' \
+ -e 's/@''GNULIB_UNINORM_NFC_DLL_VARIABLE''@/$(GNULIB_UNINORM_NFC_DLL_VARIABLE)/g' \
+ -e 's/@''GNULIB_UNINORM_NFKD_DLL_VARIABLE''@/$(GNULIB_UNINORM_NFKD_DLL_VARIABLE)/g' \
+ -e 's/@''GNULIB_UNINORM_NFKC_DLL_VARIABLE''@/$(GNULIB_UNINORM_NFKC_DLL_VARIABLE)/g' \
+ $(srcdir)/uninorm.in.h > $@-t
$(AM_V_at)mv $@-t $@
MOSTLYCLEANFILES += uninorm.h uninorm.h-t
diff --git a/modules/uninorm/nfc b/modules/uninorm/nfc
index 50ea27073e..c8696c5214 100644
--- a/modules/uninorm/nfc
+++ b/modules/uninorm/nfc
@@ -12,7 +12,8 @@ uninorm/composition
uninorm/nfd
configure.ac:
-gl_LIBUNISTRING_MODULE([1.1], [uninorm/nfc])
+gl_UNINORM_H_REQUIRE_DEFAULTS
+gl_LIBUNISTRING_MODULE_WITH_VARIABLE([1.1], [uninorm/nfc])
Makefile.am:
if LIBUNISTRING_COMPILE_UNINORM_NFC
diff --git a/modules/uninorm/nfd b/modules/uninorm/nfd
index 52a8acd1e5..50f1742da7 100644
--- a/modules/uninorm/nfd
+++ b/modules/uninorm/nfd
@@ -10,7 +10,8 @@ uninorm/base
uninorm/canonical-decomposition
configure.ac:
-gl_LIBUNISTRING_MODULE([1.1], [uninorm/nfd])
+gl_UNINORM_H_REQUIRE_DEFAULTS
+gl_LIBUNISTRING_MODULE_WITH_VARIABLE([1.1], [uninorm/nfd])
Makefile.am:
if LIBUNISTRING_COMPILE_UNINORM_NFD
diff --git a/modules/uninorm/nfkc b/modules/uninorm/nfkc
index a5cb12b1c6..5fe7dfc409 100644
--- a/modules/uninorm/nfkc
+++ b/modules/uninorm/nfkc
@@ -12,7 +12,8 @@ uninorm/composition
uninorm/nfkd
configure.ac:
-gl_LIBUNISTRING_MODULE([1.1], [uninorm/nfkc])
+gl_UNINORM_H_REQUIRE_DEFAULTS
+gl_LIBUNISTRING_MODULE_WITH_VARIABLE([1.1], [uninorm/nfkc])
Makefile.am:
if LIBUNISTRING_COMPILE_UNINORM_NFKC
diff --git a/modules/uninorm/nfkd b/modules/uninorm/nfkd
index a367ebe9be..cbc09a254b 100644
--- a/modules/uninorm/nfkd
+++ b/modules/uninorm/nfkd
@@ -10,7 +10,8 @@ uninorm/base
uninorm/compat-decomposition
configure.ac:
-gl_LIBUNISTRING_MODULE([1.1], [uninorm/nfkd])
+gl_UNINORM_H_REQUIRE_DEFAULTS
+gl_LIBUNISTRING_MODULE_WITH_VARIABLE([1.1], [uninorm/nfkd])
Makefile.am:
if LIBUNISTRING_COMPILE_UNINORM_NFKD