summaryrefslogtreecommitdiff
path: root/lib/Makefile.gnulib
diff options
context:
space:
mode:
Diffstat (limited to 'lib/Makefile.gnulib')
-rw-r--r--lib/Makefile.gnulib2495
1 files changed, 334 insertions, 2161 deletions
diff --git a/lib/Makefile.gnulib b/lib/Makefile.gnulib
index d81cead1..3c3c6f53 100644
--- a/lib/Makefile.gnulib
+++ b/lib/Makefile.gnulib
@@ -1,23 +1,11 @@
## DO NOT EDIT! GENERATED AUTOMATICALLY!
## Process this file with automake to produce Makefile.in.
-# Copyright (C) 2002-2015 Free Software Foundation, Inc.
+# Copyright (C) 2002-2010 Free Software Foundation, Inc.
#
-# This file is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 3 of the License, or
-# (at your option) any later version.
-#
-# This file is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this file. If not, see <http://www.gnu.org/licenses/>.
-#
-# As a special exception to the GNU General Public License,
-# this file may be distributed as part of a program that
-# contains a configuration script generated by Autoconf, under
+# This file is free software, distributed under the terms of the GNU
+# General Public License. As a special exception to the GNU General
+# Public License, this file may be distributed as part of a program
+# that contains a configuration script generated by Autoconf, under
# the same distribution terms as the rest of that program.
#
# Generated by gnulib-tool.
@@ -31,19 +19,6 @@ libunistring_la_LIBADD = $(gl_LTLIBOBJS)
libunistring_la_DEPENDENCIES = $(gl_LTLIBOBJS)
EXTRA_libunistring_la_SOURCES =
libunistring_la_LDFLAGS = $(AM_LDFLAGS)
-libunistring_la_LDFLAGS += -no-undefined
-libunistring_la_LDFLAGS += $(LTLIBICONV)
-libunistring_la_LDFLAGS += $(LTLIBTHREAD)
-libunistring_la_LDFLAGS += @INTL_MACOSX_LIBS@
-
-## begin gnulib module absolute-header
-
-# Use this preprocessor expression to decide whether #include_next works.
-# Do not rely on a 'configure'-time test for this, since the expression
-# might appear in an installed header, which is used by some other compiler.
-HAVE_INCLUDE_NEXT = (__GNUC__ || 60000000 <= __DECC_VER)
-
-## end gnulib module absolute-header
## begin gnulib module alloca-opt
@@ -51,30 +26,41 @@ BUILT_SOURCES += $(ALLOCA_H)
# We need the following in order to create <alloca.h> when the system
# doesn't have one that works with the given compiler.
-if GL_GENERATE_ALLOCA_H
-alloca.h: alloca.in.h $(top_builddir)/config.status
+alloca.h: alloca.in.h
$(AM_V_GEN)rm -f $@-t $@ && \
{ echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \
cat $(srcdir)/alloca.in.h; \
} > $@-t && \
mv -f $@-t $@
-else
-alloca.h: $(top_builddir)/config.status
- rm -f $@
-endif
MOSTLYCLEANFILES += alloca.h alloca.h-t
EXTRA_DIST += alloca.in.h
## end gnulib module alloca-opt
-## begin gnulib module amemxfrm
+## begin gnulib module arg-nonnull
+
+# The BUILT_SOURCES created by this Makefile snippet are not used via #include
+# statements but through direct file reference. Therefore this snippet must be
+# present in all Makefile.am that need it. This is ensured by the applicability
+# 'all' defined above.
+
+BUILT_SOURCES += arg-nonnull.h
+# The arg-nonnull.h that gets inserted into generated .h files is the same as
+# build-aux/arg-nonnull.h, except that it has the copyright header cut off.
+arg-nonnull.h: $(top_srcdir)/build-aux/arg-nonnull.h
+ $(AM_V_GEN)rm -f $@-t $@ && \
+ sed -n -e '/GL_ARG_NONNULL/,$$p' \
+ < $(top_srcdir)/build-aux/arg-nonnull.h \
+ > $@-t && \
+ mv $@-t $@
+MOSTLYCLEANFILES += arg-nonnull.h arg-nonnull.h-t
-libunistring_la_SOURCES += amemxfrm.c
+ARG_NONNULL_H=arg-nonnull.h
-EXTRA_DIST += amemxfrm.h
+EXTRA_DIST += $(top_srcdir)/build-aux/arg-nonnull.h
-## end gnulib module amemxfrm
+## end gnulib module arg-nonnull
## begin gnulib module array-mergesort
@@ -83,6 +69,30 @@ EXTRA_DIST += array-mergesort.h
## end gnulib module array-mergesort
+## begin gnulib module c++defs
+
+# The BUILT_SOURCES created by this Makefile snippet are not used via #include
+# statements but through direct file reference. Therefore this snippet must be
+# present in all Makefile.am that need it. This is ensured by the applicability
+# 'all' defined above.
+
+BUILT_SOURCES += c++defs.h
+# The c++defs.h that gets inserted into generated .h files is the same as
+# build-aux/c++defs.h, except that it has the copyright header cut off.
+c++defs.h: $(top_srcdir)/build-aux/c++defs.h
+ $(AM_V_GEN)rm -f $@-t $@ && \
+ sed -n -e '/_GL_CXXDEFS/,$$p' \
+ < $(top_srcdir)/build-aux/c++defs.h \
+ > $@-t && \
+ mv $@-t $@
+MOSTLYCLEANFILES += c++defs.h c++defs.h-t
+
+CXXDEFS_H=c++defs.h
+
+EXTRA_DIST += $(top_srcdir)/build-aux/c++defs.h
+
+## end gnulib module c++defs
+
## begin gnulib module c-ctype
libunistring_la_SOURCES += c-ctype.h c-ctype.c
@@ -104,8 +114,21 @@ EXTRA_DIST += c-strcaseeq.h
## begin gnulib module configmake
-# Listed in the same order as the GNU makefile conventions, and
-# provided by autoconf 2.59c+ or 2.70.
+# Retrieve values of the variables through 'configure' followed by
+# 'make', not directly through 'configure', so that a user who
+# sets some of these variables consistently on the 'make' command
+# line gets correct results.
+#
+# One advantage of this approach, compared to the classical
+# approach of adding -DLIBDIR=\"$(libdir)\" etc. to AM_CPPFLAGS,
+# is that it protects against the use of undefined variables.
+# If, say, $(libdir) is not set in the Makefile, LIBDIR is not
+# defined by this module, and code using LIBDIR gives a
+# compilation error.
+#
+# Another advantage is that 'make' output is shorter.
+#
+# Listed in the same order as the GNU makefile conventions.
# The Automake-defined pkg* macros are appended, in the order
# listed in the Automake 1.10a+ documentation.
configmake.h: Makefile
@@ -121,7 +144,6 @@ configmake.h: Makefile
echo '#define SYSCONFDIR "$(sysconfdir)"'; \
echo '#define SHAREDSTATEDIR "$(sharedstatedir)"'; \
echo '#define LOCALSTATEDIR "$(localstatedir)"'; \
- echo '#define RUNSTATEDIR "$(runstatedir)"'; \
echo '#define INCLUDEDIR "$(includedir)"'; \
echo '#define OLDINCLUDEDIR "$(oldincludedir)"'; \
echo '#define DOCDIR "$(docdir)"'; \
@@ -140,7 +162,11 @@ configmake.h: Makefile
echo '#define PKGLIBDIR "$(pkglibdir)"'; \
echo '#define PKGLIBEXECDIR "$(pkglibexecdir)"'; \
} | sed '/""/d' > $@-t && \
- mv -f $@-t $@
+ if test -f $@ && cmp $@-t $@ > /dev/null; then \
+ rm -f $@-t; \
+ else \
+ rm -f $@; mv $@-t $@; \
+ fi
BUILT_SOURCES += configmake.h
CLEANFILES += configmake.h configmake.h-t
@@ -153,14 +179,11 @@ BUILT_SOURCES += $(ERRNO_H)
# We need the following in order to create <errno.h> when the system
# doesn't have one that is POSIX compliant.
-if GL_GENERATE_ERRNO_H
-errno.h: errno.in.h $(top_builddir)/config.status
+errno.h: errno.in.h
$(AM_V_GEN)rm -f $@-t $@ && \
{ echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */' && \
- sed -e 's|@''GUARD_PREFIX''@|GL|g' \
- -e 's|@''INCLUDE_NEXT''@|$(INCLUDE_NEXT)|g' \
+ sed -e 's|@''INCLUDE_NEXT''@|$(INCLUDE_NEXT)|g' \
-e 's|@''PRAGMA_SYSTEM_HEADER''@|@PRAGMA_SYSTEM_HEADER@|g' \
- -e 's|@''PRAGMA_COLUMNS''@|@PRAGMA_COLUMNS@|g' \
-e 's|@''NEXT_ERRNO_H''@|$(NEXT_ERRNO_H)|g' \
-e 's|@''EMULTIHOP_HIDDEN''@|$(EMULTIHOP_HIDDEN)|g' \
-e 's|@''EMULTIHOP_VALUE''@|$(EMULTIHOP_VALUE)|g' \
@@ -171,10 +194,6 @@ errno.h: errno.in.h $(top_builddir)/config.status
< $(srcdir)/errno.in.h; \
} > $@-t && \
mv $@-t $@
-else
-errno.h: $(top_builddir)/config.status
- rm -f $@
-endif
MOSTLYCLEANFILES += errno.h errno.h-t
EXTRA_DIST += errno.in.h
@@ -187,28 +206,18 @@ BUILT_SOURCES += $(FLOAT_H)
# We need the following in order to create <float.h> when the system
# doesn't have one that works with the given compiler.
-if GL_GENERATE_FLOAT_H
-float.h: float.in.h $(top_builddir)/config.status
+float.h: float.in.h
$(AM_V_GEN)rm -f $@-t $@ && \
{ echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */' && \
- sed -e 's|@''GUARD_PREFIX''@|GL|g' \
- -e 's|@''INCLUDE_NEXT''@|$(INCLUDE_NEXT)|g' \
+ sed -e 's|@''INCLUDE_NEXT''@|$(INCLUDE_NEXT)|g' \
-e 's|@''PRAGMA_SYSTEM_HEADER''@|@PRAGMA_SYSTEM_HEADER@|g' \
- -e 's|@''PRAGMA_COLUMNS''@|@PRAGMA_COLUMNS@|g' \
-e 's|@''NEXT_FLOAT_H''@|$(NEXT_FLOAT_H)|g' \
- -e 's|@''REPLACE_ITOLD''@|$(REPLACE_ITOLD)|g' \
< $(srcdir)/float.in.h; \
} > $@-t && \
mv $@-t $@
-else
-float.h: $(top_builddir)/config.status
- rm -f $@
-endif
MOSTLYCLEANFILES += float.h float.h-t
-EXTRA_DIST += float.c float.in.h itold.c
-
-EXTRA_libunistring_la_SOURCES += float.c itold.c
+EXTRA_DIST += float.in.h
## end gnulib module float
@@ -219,15 +228,6 @@ EXTRA_DIST += fpucw.h
## end gnulib module fpucw
-## begin gnulib module frexp-nolibm
-
-
-EXTRA_DIST += frexp.c
-
-EXTRA_libunistring_la_SOURCES += frexp.c
-
-## end gnulib module frexp-nolibm
-
## begin gnulib module frexpl-nolibm
@@ -239,10 +239,9 @@ EXTRA_libunistring_la_SOURCES += frexp.c frexpl.c
## begin gnulib module fseterr
+libunistring_la_SOURCES += fseterr.c
-EXTRA_DIST += fseterr.c fseterr.h stdio-impl.h
-
-EXTRA_libunistring_la_SOURCES += fseterr.c
+EXTRA_DIST += fseterr.h stdio-impl.h
## end gnulib module fseterr
@@ -265,16 +264,12 @@ BUILT_SOURCES += $(ICONV_H)
# We need the following in order to create <iconv.h> when the system
# doesn't have one that works with the given compiler.
-if GL_GENERATE_ICONV_H
-iconv.h: iconv.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(ARG_NONNULL_H) $(WARN_ON_USE_H)
+iconv.h: iconv.in.h $(CXXDEFS_H) $(ARG_NONNULL_H) $(WARN_ON_USE_H)
$(AM_V_GEN)rm -f $@-t $@ && \
{ echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */' && \
- sed -e 's|@''GUARD_PREFIX''@|GL|g' \
- -e 's|@''INCLUDE_NEXT''@|$(INCLUDE_NEXT)|g' \
+ sed -e 's|@''INCLUDE_NEXT''@|$(INCLUDE_NEXT)|g' \
-e 's|@''PRAGMA_SYSTEM_HEADER''@|@PRAGMA_SYSTEM_HEADER@|g' \
- -e 's|@''PRAGMA_COLUMNS''@|@PRAGMA_COLUMNS@|g' \
-e 's|@''NEXT_ICONV_H''@|$(NEXT_ICONV_H)|g' \
- -e 's/@''GNULIB_ICONV''@/$(GNULIB_ICONV)/g' \
-e 's|@''ICONV_CONST''@|$(ICONV_CONST)|g' \
-e 's|@''REPLACE_ICONV''@|$(REPLACE_ICONV)|g' \
-e 's|@''REPLACE_ICONV_OPEN''@|$(REPLACE_ICONV_OPEN)|g' \
@@ -285,10 +280,6 @@ iconv.h: iconv.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(ARG_NONNULL_H)
< $(srcdir)/iconv.in.h; \
} > $@-t && \
mv $@-t $@
-else
-iconv.h: $(top_builddir)/config.status
- rm -f $@
-endif
MOSTLYCLEANFILES += iconv.h iconv.h-t
EXTRA_DIST += iconv.in.h
@@ -317,9 +308,9 @@ MOSTLYCLEANFILES += iconv_open-aix.h-t iconv_open-hpux.h-t iconv_open-irix.h
MAINTAINERCLEANFILES += iconv_open-aix.h iconv_open-hpux.h iconv_open-irix.h iconv_open-osf.h iconv_open-solaris.h
EXTRA_DIST += iconv_open-aix.h iconv_open-hpux.h iconv_open-irix.h iconv_open-osf.h iconv_open-solaris.h
-EXTRA_DIST += iconv.c iconv_close.c iconv_open-aix.gperf iconv_open-hpux.gperf iconv_open-irix.gperf iconv_open-osf.gperf iconv_open-solaris.gperf iconv_open.c
+EXTRA_DIST += iconv_open-aix.gperf iconv_open-hpux.gperf iconv_open-irix.gperf iconv_open-osf.gperf iconv_open-solaris.gperf iconv_open.c
-EXTRA_libunistring_la_SOURCES += iconv.c iconv_close.c iconv_open.c
+EXTRA_libunistring_la_SOURCES += iconv_open.c
## end gnulib module iconv_open
@@ -350,48 +341,6 @@ EXTRA_libunistring_la_SOURCES += isnan.c isnanl.c
## end gnulib module isnanl-nolibm
-## begin gnulib module iswblank
-
-
-EXTRA_DIST += iswblank.c
-
-EXTRA_libunistring_la_SOURCES += iswblank.c
-
-## end gnulib module iswblank
-
-## begin gnulib module langinfo
-
-BUILT_SOURCES += langinfo.h
-
-# We need the following in order to create an empty placeholder for
-# <langinfo.h> when the system doesn't have one.
-langinfo.h: langinfo.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(WARN_ON_USE_H)
- $(AM_V_GEN)rm -f $@-t $@ && \
- { echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \
- sed -e 's|@''GUARD_PREFIX''@|GL|g' \
- -e 's|@''HAVE_LANGINFO_H''@|$(HAVE_LANGINFO_H)|g' \
- -e 's|@''INCLUDE_NEXT''@|$(INCLUDE_NEXT)|g' \
- -e 's|@''PRAGMA_SYSTEM_HEADER''@|@PRAGMA_SYSTEM_HEADER@|g' \
- -e 's|@''PRAGMA_COLUMNS''@|@PRAGMA_COLUMNS@|g' \
- -e 's|@''NEXT_LANGINFO_H''@|$(NEXT_LANGINFO_H)|g' \
- -e 's/@''GNULIB_NL_LANGINFO''@/$(GNULIB_NL_LANGINFO)/g' \
- -e 's|@''HAVE_LANGINFO_CODESET''@|$(HAVE_LANGINFO_CODESET)|g' \
- -e 's|@''HAVE_LANGINFO_T_FMT_AMPM''@|$(HAVE_LANGINFO_T_FMT_AMPM)|g' \
- -e 's|@''HAVE_LANGINFO_ERA''@|$(HAVE_LANGINFO_ERA)|g' \
- -e 's|@''HAVE_LANGINFO_YESEXPR''@|$(HAVE_LANGINFO_YESEXPR)|g' \
- -e 's|@''HAVE_NL_LANGINFO''@|$(HAVE_NL_LANGINFO)|g' \
- -e 's|@''REPLACE_NL_LANGINFO''@|$(REPLACE_NL_LANGINFO)|g' \
- -e '/definitions of _GL_FUNCDECL_RPL/r $(CXXDEFS_H)' \
- -e '/definition of _GL_WARN_ON_USE/r $(WARN_ON_USE_H)' \
- < $(srcdir)/langinfo.in.h; \
- } > $@-t && \
- mv $@-t $@
-MOSTLYCLEANFILES += langinfo.h langinfo.h-t
-
-EXTRA_DIST += langinfo.in.h
-
-## end gnulib module langinfo
-
## begin gnulib module localcharset
libunistring_la_SOURCES += localcharset.h localcharset.c
@@ -500,202 +449,70 @@ EXTRA_DIST += malloca.h malloca.valgrind
## begin gnulib module math
BUILT_SOURCES += math.h
-libunistring_la_SOURCES += math.c
# We need the following in order to create <math.h> when the system
# doesn't have one that works with the given compiler.
-math.h: math.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(ARG_NONNULL_H) $(WARN_ON_USE_H)
+math.h: math.in.h $(CXXDEFS_H) $(ARG_NONNULL_H) $(WARN_ON_USE_H)
$(AM_V_GEN)rm -f $@-t $@ && \
{ echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */' && \
- sed -e 's|@''GUARD_PREFIX''@|GL|g' \
- -e 's|@''INCLUDE_NEXT_AS_FIRST_DIRECTIVE''@|$(INCLUDE_NEXT_AS_FIRST_DIRECTIVE)|g' \
+ sed -e 's|@''INCLUDE_NEXT_AS_FIRST_DIRECTIVE''@|$(INCLUDE_NEXT_AS_FIRST_DIRECTIVE)|g' \
-e 's|@''PRAGMA_SYSTEM_HEADER''@|@PRAGMA_SYSTEM_HEADER@|g' \
- -e 's|@''PRAGMA_COLUMNS''@|@PRAGMA_COLUMNS@|g' \
-e 's|@''NEXT_AS_FIRST_DIRECTIVE_MATH_H''@|$(NEXT_AS_FIRST_DIRECTIVE_MATH_H)|g' \
- -e 's/@''GNULIB_ACOSF''@/$(GNULIB_ACOSF)/g' \
- -e 's/@''GNULIB_ACOSL''@/$(GNULIB_ACOSL)/g' \
- -e 's/@''GNULIB_ASINF''@/$(GNULIB_ASINF)/g' \
- -e 's/@''GNULIB_ASINL''@/$(GNULIB_ASINL)/g' \
- -e 's/@''GNULIB_ATANF''@/$(GNULIB_ATANF)/g' \
- -e 's/@''GNULIB_ATANL''@/$(GNULIB_ATANL)/g' \
- -e 's/@''GNULIB_ATAN2F''@/$(GNULIB_ATAN2F)/g' \
- -e 's/@''GNULIB_CBRT''@/$(GNULIB_CBRT)/g' \
- -e 's/@''GNULIB_CBRTF''@/$(GNULIB_CBRTF)/g' \
- -e 's/@''GNULIB_CBRTL''@/$(GNULIB_CBRTL)/g' \
- -e 's/@''GNULIB_CEIL''@/$(GNULIB_CEIL)/g' \
- -e 's/@''GNULIB_CEILF''@/$(GNULIB_CEILF)/g' \
- -e 's/@''GNULIB_CEILL''@/$(GNULIB_CEILL)/g' \
- -e 's/@''GNULIB_COPYSIGN''@/$(GNULIB_COPYSIGN)/g' \
- -e 's/@''GNULIB_COPYSIGNF''@/$(GNULIB_COPYSIGNF)/g' \
- -e 's/@''GNULIB_COPYSIGNL''@/$(GNULIB_COPYSIGNL)/g' \
- -e 's/@''GNULIB_COSF''@/$(GNULIB_COSF)/g' \
- -e 's/@''GNULIB_COSL''@/$(GNULIB_COSL)/g' \
- -e 's/@''GNULIB_COSHF''@/$(GNULIB_COSHF)/g' \
- -e 's/@''GNULIB_EXPF''@/$(GNULIB_EXPF)/g' \
- -e 's/@''GNULIB_EXPL''@/$(GNULIB_EXPL)/g' \
- -e 's/@''GNULIB_EXP2''@/$(GNULIB_EXP2)/g' \
- -e 's/@''GNULIB_EXP2F''@/$(GNULIB_EXP2F)/g' \
- -e 's/@''GNULIB_EXP2L''@/$(GNULIB_EXP2L)/g' \
- -e 's/@''GNULIB_EXPM1''@/$(GNULIB_EXPM1)/g' \
- -e 's/@''GNULIB_EXPM1F''@/$(GNULIB_EXPM1F)/g' \
- -e 's/@''GNULIB_EXPM1L''@/$(GNULIB_EXPM1L)/g' \
- -e 's/@''GNULIB_FABSF''@/$(GNULIB_FABSF)/g' \
- -e 's/@''GNULIB_FABSL''@/$(GNULIB_FABSL)/g' \
- -e 's/@''GNULIB_FLOOR''@/$(GNULIB_FLOOR)/g' \
- -e 's/@''GNULIB_FLOORF''@/$(GNULIB_FLOORF)/g' \
- -e 's/@''GNULIB_FLOORL''@/$(GNULIB_FLOORL)/g' \
- -e 's/@''GNULIB_FMA''@/$(GNULIB_FMA)/g' \
- -e 's/@''GNULIB_FMAF''@/$(GNULIB_FMAF)/g' \
- -e 's/@''GNULIB_FMAL''@/$(GNULIB_FMAL)/g' \
- -e 's/@''GNULIB_FMOD''@/$(GNULIB_FMOD)/g' \
- -e 's/@''GNULIB_FMODF''@/$(GNULIB_FMODF)/g' \
- -e 's/@''GNULIB_FMODL''@/$(GNULIB_FMODL)/g' \
- -e 's/@''GNULIB_FREXPF''@/$(GNULIB_FREXPF)/g' \
- -e 's/@''GNULIB_FREXP''@/$(GNULIB_FREXP)/g' \
- -e 's/@''GNULIB_FREXPL''@/$(GNULIB_FREXPL)/g' \
- -e 's/@''GNULIB_HYPOT''@/$(GNULIB_HYPOT)/g' \
- -e 's/@''GNULIB_HYPOTF''@/$(GNULIB_HYPOTF)/g' \
- -e 's/@''GNULIB_HYPOTL''@/$(GNULIB_HYPOTL)/g' \
- < $(srcdir)/math.in.h | \
- sed -e 's/@''GNULIB_ILOGB''@/$(GNULIB_ILOGB)/g' \
- -e 's/@''GNULIB_ILOGBF''@/$(GNULIB_ILOGBF)/g' \
- -e 's/@''GNULIB_ILOGBL''@/$(GNULIB_ILOGBL)/g' \
- -e 's/@''GNULIB_ISFINITE''@/$(GNULIB_ISFINITE)/g' \
- -e 's/@''GNULIB_ISINF''@/$(GNULIB_ISINF)/g' \
- -e 's/@''GNULIB_ISNAN''@/$(GNULIB_ISNAN)/g' \
- -e 's/@''GNULIB_ISNANF''@/$(GNULIB_ISNANF)/g' \
- -e 's/@''GNULIB_ISNAND''@/$(GNULIB_ISNAND)/g' \
- -e 's/@''GNULIB_ISNANL''@/$(GNULIB_ISNANL)/g' \
- -e 's/@''GNULIB_LDEXPF''@/$(GNULIB_LDEXPF)/g' \
- -e 's/@''GNULIB_LDEXPL''@/$(GNULIB_LDEXPL)/g' \
- -e 's/@''GNULIB_LOG''@/$(GNULIB_LOG)/g' \
- -e 's/@''GNULIB_LOGF''@/$(GNULIB_LOGF)/g' \
- -e 's/@''GNULIB_LOGL''@/$(GNULIB_LOGL)/g' \
- -e 's/@''GNULIB_LOG10''@/$(GNULIB_LOG10)/g' \
- -e 's/@''GNULIB_LOG10F''@/$(GNULIB_LOG10F)/g' \
- -e 's/@''GNULIB_LOG10L''@/$(GNULIB_LOG10L)/g' \
- -e 's/@''GNULIB_LOG1P''@/$(GNULIB_LOG1P)/g' \
- -e 's/@''GNULIB_LOG1PF''@/$(GNULIB_LOG1PF)/g' \
- -e 's/@''GNULIB_LOG1PL''@/$(GNULIB_LOG1PL)/g' \
- -e 's/@''GNULIB_LOG2''@/$(GNULIB_LOG2)/g' \
- -e 's/@''GNULIB_LOG2F''@/$(GNULIB_LOG2F)/g' \
- -e 's/@''GNULIB_LOG2L''@/$(GNULIB_LOG2L)/g' \
- -e 's/@''GNULIB_LOGB''@/$(GNULIB_LOGB)/g' \
- -e 's/@''GNULIB_LOGBF''@/$(GNULIB_LOGBF)/g' \
- -e 's/@''GNULIB_LOGBL''@/$(GNULIB_LOGBL)/g' \
- -e 's/@''GNULIB_MODF''@/$(GNULIB_MODF)/g' \
- -e 's/@''GNULIB_MODFF''@/$(GNULIB_MODFF)/g' \
- -e 's/@''GNULIB_MODFL''@/$(GNULIB_MODFL)/g' \
- -e 's/@''GNULIB_POWF''@/$(GNULIB_POWF)/g' \
- -e 's/@''GNULIB_REMAINDER''@/$(GNULIB_REMAINDER)/g' \
- -e 's/@''GNULIB_REMAINDERF''@/$(GNULIB_REMAINDERF)/g' \
- -e 's/@''GNULIB_REMAINDERL''@/$(GNULIB_REMAINDERL)/g' \
- -e 's/@''GNULIB_RINT''@/$(GNULIB_RINT)/g' \
- -e 's/@''GNULIB_RINTF''@/$(GNULIB_RINTF)/g' \
- -e 's/@''GNULIB_RINTL''@/$(GNULIB_RINTL)/g' \
- -e 's/@''GNULIB_ROUND''@/$(GNULIB_ROUND)/g' \
- -e 's/@''GNULIB_ROUNDF''@/$(GNULIB_ROUNDF)/g' \
- -e 's/@''GNULIB_ROUNDL''@/$(GNULIB_ROUNDL)/g' \
- -e 's/@''GNULIB_SIGNBIT''@/$(GNULIB_SIGNBIT)/g' \
- -e 's/@''GNULIB_SINF''@/$(GNULIB_SINF)/g' \
- -e 's/@''GNULIB_SINL''@/$(GNULIB_SINL)/g' \
- -e 's/@''GNULIB_SINHF''@/$(GNULIB_SINHF)/g' \
- -e 's/@''GNULIB_SQRTF''@/$(GNULIB_SQRTF)/g' \
- -e 's/@''GNULIB_SQRTL''@/$(GNULIB_SQRTL)/g' \
- -e 's/@''GNULIB_TANF''@/$(GNULIB_TANF)/g' \
- -e 's/@''GNULIB_TANL''@/$(GNULIB_TANL)/g' \
- -e 's/@''GNULIB_TANHF''@/$(GNULIB_TANHF)/g' \
- -e 's/@''GNULIB_TRUNC''@/$(GNULIB_TRUNC)/g' \
- -e 's/@''GNULIB_TRUNCF''@/$(GNULIB_TRUNCF)/g' \
- -e 's/@''GNULIB_TRUNCL''@/$(GNULIB_TRUNCL)/g' \
- | \
- sed -e 's|@''HAVE_ACOSF''@|$(HAVE_ACOSF)|g' \
+ -e 's|@''GNULIB_ACOSL''@|$(GNULIB_ACOSL)|g' \
+ -e 's|@''GNULIB_ASINL''@|$(GNULIB_ASINL)|g' \
+ -e 's|@''GNULIB_ATANL''@|$(GNULIB_ATANL)|g' \
+ -e 's|@''GNULIB_CEILF''@|$(GNULIB_CEILF)|g' \
+ -e 's|@''GNULIB_CEILL''@|$(GNULIB_CEILL)|g' \
+ -e 's|@''GNULIB_COSL''@|$(GNULIB_COSL)|g' \
+ -e 's|@''GNULIB_EXPL''@|$(GNULIB_EXPL)|g' \
+ -e 's|@''GNULIB_FLOORF''@|$(GNULIB_FLOORF)|g' \
+ -e 's|@''GNULIB_FLOORL''@|$(GNULIB_FLOORL)|g' \
+ -e 's|@''GNULIB_FREXP''@|$(GNULIB_FREXP)|g' \
+ -e 's|@''GNULIB_FREXPL''@|$(GNULIB_FREXPL)|g' \
+ -e 's|@''GNULIB_ISFINITE''@|$(GNULIB_ISFINITE)|g' \
+ -e 's|@''GNULIB_ISINF''@|$(GNULIB_ISINF)|g' \
+ -e 's|@''GNULIB_ISNAN''@|$(GNULIB_ISNAN)|g' \
+ -e 's|@''GNULIB_ISNANF''@|$(GNULIB_ISNANF)|g' \
+ -e 's|@''GNULIB_ISNAND''@|$(GNULIB_ISNAND)|g' \
+ -e 's|@''GNULIB_ISNANL''@|$(GNULIB_ISNANL)|g' \
+ -e 's|@''GNULIB_LDEXPL''@|$(GNULIB_LDEXPL)|g' \
+ -e 's|@''GNULIB_LOGB''@|$(GNULIB_LOGB)|g' \
+ -e 's|@''GNULIB_LOGL''@|$(GNULIB_LOGL)|g' \
+ -e 's|@''GNULIB_ROUND''@|$(GNULIB_ROUND)|g' \
+ -e 's|@''GNULIB_ROUNDF''@|$(GNULIB_ROUNDF)|g' \
+ -e 's|@''GNULIB_ROUNDL''@|$(GNULIB_ROUNDL)|g' \
+ -e 's|@''GNULIB_SIGNBIT''@|$(GNULIB_SIGNBIT)|g' \
+ -e 's|@''GNULIB_SINL''@|$(GNULIB_SINL)|g' \
+ -e 's|@''GNULIB_SQRTL''@|$(GNULIB_SQRTL)|g' \
+ -e 's|@''GNULIB_TANL''@|$(GNULIB_TANL)|g' \
+ -e 's|@''GNULIB_TRUNC''@|$(GNULIB_TRUNC)|g' \
+ -e 's|@''GNULIB_TRUNCF''@|$(GNULIB_TRUNCF)|g' \
+ -e 's|@''GNULIB_TRUNCL''@|$(GNULIB_TRUNCL)|g' \
-e 's|@''HAVE_ACOSL''@|$(HAVE_ACOSL)|g' \
- -e 's|@''HAVE_ASINF''@|$(HAVE_ASINF)|g' \
-e 's|@''HAVE_ASINL''@|$(HAVE_ASINL)|g' \
- -e 's|@''HAVE_ATANF''@|$(HAVE_ATANF)|g' \
-e 's|@''HAVE_ATANL''@|$(HAVE_ATANL)|g' \
- -e 's|@''HAVE_ATAN2F''@|$(HAVE_ATAN2F)|g' \
- -e 's|@''HAVE_CBRT''@|$(HAVE_CBRT)|g' \
- -e 's|@''HAVE_CBRTF''@|$(HAVE_CBRTF)|g' \
- -e 's|@''HAVE_CBRTL''@|$(HAVE_CBRTL)|g' \
- -e 's|@''HAVE_COPYSIGN''@|$(HAVE_COPYSIGN)|g' \
- -e 's|@''HAVE_COPYSIGNL''@|$(HAVE_COPYSIGNL)|g' \
- -e 's|@''HAVE_COSF''@|$(HAVE_COSF)|g' \
-e 's|@''HAVE_COSL''@|$(HAVE_COSL)|g' \
- -e 's|@''HAVE_COSHF''@|$(HAVE_COSHF)|g' \
- -e 's|@''HAVE_EXPF''@|$(HAVE_EXPF)|g' \
-e 's|@''HAVE_EXPL''@|$(HAVE_EXPL)|g' \
- -e 's|@''HAVE_EXPM1''@|$(HAVE_EXPM1)|g' \
- -e 's|@''HAVE_EXPM1F''@|$(HAVE_EXPM1F)|g' \
- -e 's|@''HAVE_FABSF''@|$(HAVE_FABSF)|g' \
- -e 's|@''HAVE_FABSL''@|$(HAVE_FABSL)|g' \
- -e 's|@''HAVE_FMA''@|$(HAVE_FMA)|g' \
- -e 's|@''HAVE_FMAF''@|$(HAVE_FMAF)|g' \
- -e 's|@''HAVE_FMAL''@|$(HAVE_FMAL)|g' \
- -e 's|@''HAVE_FMODF''@|$(HAVE_FMODF)|g' \
- -e 's|@''HAVE_FMODL''@|$(HAVE_FMODL)|g' \
- -e 's|@''HAVE_FREXPF''@|$(HAVE_FREXPF)|g' \
- -e 's|@''HAVE_HYPOTF''@|$(HAVE_HYPOTF)|g' \
- -e 's|@''HAVE_HYPOTL''@|$(HAVE_HYPOTL)|g' \
- -e 's|@''HAVE_ILOGB''@|$(HAVE_ILOGB)|g' \
- -e 's|@''HAVE_ILOGBF''@|$(HAVE_ILOGBF)|g' \
- -e 's|@''HAVE_ILOGBL''@|$(HAVE_ILOGBL)|g' \
-e 's|@''HAVE_ISNANF''@|$(HAVE_ISNANF)|g' \
-e 's|@''HAVE_ISNAND''@|$(HAVE_ISNAND)|g' \
-e 's|@''HAVE_ISNANL''@|$(HAVE_ISNANL)|g' \
- -e 's|@''HAVE_LDEXPF''@|$(HAVE_LDEXPF)|g' \
- -e 's|@''HAVE_LOGF''@|$(HAVE_LOGF)|g' \
-e 's|@''HAVE_LOGL''@|$(HAVE_LOGL)|g' \
- -e 's|@''HAVE_LOG10F''@|$(HAVE_LOG10F)|g' \
- -e 's|@''HAVE_LOG10L''@|$(HAVE_LOG10L)|g' \
- -e 's|@''HAVE_LOG1P''@|$(HAVE_LOG1P)|g' \
- -e 's|@''HAVE_LOG1PF''@|$(HAVE_LOG1PF)|g' \
- -e 's|@''HAVE_LOG1PL''@|$(HAVE_LOG1PL)|g' \
- -e 's|@''HAVE_LOGBF''@|$(HAVE_LOGBF)|g' \
- -e 's|@''HAVE_LOGBL''@|$(HAVE_LOGBL)|g' \
- -e 's|@''HAVE_MODFF''@|$(HAVE_MODFF)|g' \
- -e 's|@''HAVE_MODFL''@|$(HAVE_MODFL)|g' \
- -e 's|@''HAVE_POWF''@|$(HAVE_POWF)|g' \
- -e 's|@''HAVE_REMAINDER''@|$(HAVE_REMAINDER)|g' \
- -e 's|@''HAVE_REMAINDERF''@|$(HAVE_REMAINDERF)|g' \
- -e 's|@''HAVE_RINT''@|$(HAVE_RINT)|g' \
- -e 's|@''HAVE_RINTL''@|$(HAVE_RINTL)|g' \
- -e 's|@''HAVE_SINF''@|$(HAVE_SINF)|g' \
-e 's|@''HAVE_SINL''@|$(HAVE_SINL)|g' \
- -e 's|@''HAVE_SINHF''@|$(HAVE_SINHF)|g' \
- -e 's|@''HAVE_SQRTF''@|$(HAVE_SQRTF)|g' \
-e 's|@''HAVE_SQRTL''@|$(HAVE_SQRTL)|g' \
- -e 's|@''HAVE_TANF''@|$(HAVE_TANF)|g' \
-e 's|@''HAVE_TANL''@|$(HAVE_TANL)|g' \
- -e 's|@''HAVE_TANHF''@|$(HAVE_TANHF)|g' \
-e 's|@''HAVE_DECL_ACOSL''@|$(HAVE_DECL_ACOSL)|g' \
-e 's|@''HAVE_DECL_ASINL''@|$(HAVE_DECL_ASINL)|g' \
-e 's|@''HAVE_DECL_ATANL''@|$(HAVE_DECL_ATANL)|g' \
- -e 's|@''HAVE_DECL_CBRTF''@|$(HAVE_DECL_CBRTF)|g' \
- -e 's|@''HAVE_DECL_CBRTL''@|$(HAVE_DECL_CBRTL)|g' \
-e 's|@''HAVE_DECL_CEILF''@|$(HAVE_DECL_CEILF)|g' \
-e 's|@''HAVE_DECL_CEILL''@|$(HAVE_DECL_CEILL)|g' \
- -e 's|@''HAVE_DECL_COPYSIGNF''@|$(HAVE_DECL_COPYSIGNF)|g' \
-e 's|@''HAVE_DECL_COSL''@|$(HAVE_DECL_COSL)|g' \
-e 's|@''HAVE_DECL_EXPL''@|$(HAVE_DECL_EXPL)|g' \
- -e 's|@''HAVE_DECL_EXP2''@|$(HAVE_DECL_EXP2)|g' \
- -e 's|@''HAVE_DECL_EXP2F''@|$(HAVE_DECL_EXP2F)|g' \
- -e 's|@''HAVE_DECL_EXP2L''@|$(HAVE_DECL_EXP2L)|g' \
- -e 's|@''HAVE_DECL_EXPM1L''@|$(HAVE_DECL_EXPM1L)|g' \
-e 's|@''HAVE_DECL_FLOORF''@|$(HAVE_DECL_FLOORF)|g' \
-e 's|@''HAVE_DECL_FLOORL''@|$(HAVE_DECL_FLOORL)|g' \
-e 's|@''HAVE_DECL_FREXPL''@|$(HAVE_DECL_FREXPL)|g' \
-e 's|@''HAVE_DECL_LDEXPL''@|$(HAVE_DECL_LDEXPL)|g' \
- -e 's|@''HAVE_DECL_LOGL''@|$(HAVE_DECL_LOGL)|g' \
- -e 's|@''HAVE_DECL_LOG10L''@|$(HAVE_DECL_LOG10L)|g' \
- -e 's|@''HAVE_DECL_LOG2''@|$(HAVE_DECL_LOG2)|g' \
- -e 's|@''HAVE_DECL_LOG2F''@|$(HAVE_DECL_LOG2F)|g' \
- -e 's|@''HAVE_DECL_LOG2L''@|$(HAVE_DECL_LOG2L)|g' \
-e 's|@''HAVE_DECL_LOGB''@|$(HAVE_DECL_LOGB)|g' \
- -e 's|@''HAVE_DECL_REMAINDER''@|$(HAVE_DECL_REMAINDER)|g' \
- -e 's|@''HAVE_DECL_REMAINDERL''@|$(HAVE_DECL_REMAINDERL)|g' \
- -e 's|@''HAVE_DECL_RINTF''@|$(HAVE_DECL_RINTF)|g' \
+ -e 's|@''HAVE_DECL_LOGL''@|$(HAVE_DECL_LOGL)|g' \
-e 's|@''HAVE_DECL_ROUND''@|$(HAVE_DECL_ROUND)|g' \
-e 's|@''HAVE_DECL_ROUNDF''@|$(HAVE_DECL_ROUNDF)|g' \
-e 's|@''HAVE_DECL_ROUNDL''@|$(HAVE_DECL_ROUNDL)|g' \
@@ -705,74 +522,28 @@ math.h: math.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(ARG_NONNULL_H) $(
-e 's|@''HAVE_DECL_TRUNC''@|$(HAVE_DECL_TRUNC)|g' \
-e 's|@''HAVE_DECL_TRUNCF''@|$(HAVE_DECL_TRUNCF)|g' \
-e 's|@''HAVE_DECL_TRUNCL''@|$(HAVE_DECL_TRUNCL)|g' \
- | \
- sed -e 's|@''REPLACE_CBRTF''@|$(REPLACE_CBRTF)|g' \
- -e 's|@''REPLACE_CBRTL''@|$(REPLACE_CBRTL)|g' \
- -e 's|@''REPLACE_CEIL''@|$(REPLACE_CEIL)|g' \
-e 's|@''REPLACE_CEILF''@|$(REPLACE_CEILF)|g' \
-e 's|@''REPLACE_CEILL''@|$(REPLACE_CEILL)|g' \
- -e 's|@''REPLACE_EXPM1''@|$(REPLACE_EXPM1)|g' \
- -e 's|@''REPLACE_EXPM1F''@|$(REPLACE_EXPM1F)|g' \
- -e 's|@''REPLACE_EXP2''@|$(REPLACE_EXP2)|g' \
- -e 's|@''REPLACE_EXP2L''@|$(REPLACE_EXP2L)|g' \
- -e 's|@''REPLACE_FABSL''@|$(REPLACE_FABSL)|g' \
- -e 's|@''REPLACE_FLOOR''@|$(REPLACE_FLOOR)|g' \
-e 's|@''REPLACE_FLOORF''@|$(REPLACE_FLOORF)|g' \
-e 's|@''REPLACE_FLOORL''@|$(REPLACE_FLOORL)|g' \
- -e 's|@''REPLACE_FMA''@|$(REPLACE_FMA)|g' \
- -e 's|@''REPLACE_FMAF''@|$(REPLACE_FMAF)|g' \
- -e 's|@''REPLACE_FMAL''@|$(REPLACE_FMAL)|g' \
- -e 's|@''REPLACE_FMOD''@|$(REPLACE_FMOD)|g' \
- -e 's|@''REPLACE_FMODF''@|$(REPLACE_FMODF)|g' \
- -e 's|@''REPLACE_FMODL''@|$(REPLACE_FMODL)|g' \
- -e 's|@''REPLACE_FREXPF''@|$(REPLACE_FREXPF)|g' \
-e 's|@''REPLACE_FREXP''@|$(REPLACE_FREXP)|g' \
-e 's|@''REPLACE_FREXPL''@|$(REPLACE_FREXPL)|g' \
-e 's|@''REPLACE_HUGE_VAL''@|$(REPLACE_HUGE_VAL)|g' \
- -e 's|@''REPLACE_HYPOT''@|$(REPLACE_HYPOT)|g' \
- -e 's|@''REPLACE_HYPOTF''@|$(REPLACE_HYPOTF)|g' \
- -e 's|@''REPLACE_HYPOTL''@|$(REPLACE_HYPOTL)|g' \
- -e 's|@''REPLACE_ILOGB''@|$(REPLACE_ILOGB)|g' \
- -e 's|@''REPLACE_ILOGBF''@|$(REPLACE_ILOGBF)|g' \
-e 's|@''REPLACE_ISFINITE''@|$(REPLACE_ISFINITE)|g' \
-e 's|@''REPLACE_ISINF''@|$(REPLACE_ISINF)|g' \
-e 's|@''REPLACE_ISNAN''@|$(REPLACE_ISNAN)|g' \
- -e 's|@''REPLACE_ITOLD''@|$(REPLACE_ITOLD)|g' \
-e 's|@''REPLACE_LDEXPL''@|$(REPLACE_LDEXPL)|g' \
- -e 's|@''REPLACE_LOG''@|$(REPLACE_LOG)|g' \
- -e 's|@''REPLACE_LOGF''@|$(REPLACE_LOGF)|g' \
- -e 's|@''REPLACE_LOGL''@|$(REPLACE_LOGL)|g' \
- -e 's|@''REPLACE_LOG10''@|$(REPLACE_LOG10)|g' \
- -e 's|@''REPLACE_LOG10F''@|$(REPLACE_LOG10F)|g' \
- -e 's|@''REPLACE_LOG10L''@|$(REPLACE_LOG10L)|g' \
- -e 's|@''REPLACE_LOG1P''@|$(REPLACE_LOG1P)|g' \
- -e 's|@''REPLACE_LOG1PF''@|$(REPLACE_LOG1PF)|g' \
- -e 's|@''REPLACE_LOG1PL''@|$(REPLACE_LOG1PL)|g' \
- -e 's|@''REPLACE_LOG2''@|$(REPLACE_LOG2)|g' \
- -e 's|@''REPLACE_LOG2F''@|$(REPLACE_LOG2F)|g' \
- -e 's|@''REPLACE_LOG2L''@|$(REPLACE_LOG2L)|g' \
- -e 's|@''REPLACE_LOGB''@|$(REPLACE_LOGB)|g' \
- -e 's|@''REPLACE_LOGBF''@|$(REPLACE_LOGBF)|g' \
- -e 's|@''REPLACE_LOGBL''@|$(REPLACE_LOGBL)|g' \
- -e 's|@''REPLACE_MODF''@|$(REPLACE_MODF)|g' \
- -e 's|@''REPLACE_MODFF''@|$(REPLACE_MODFF)|g' \
- -e 's|@''REPLACE_MODFL''@|$(REPLACE_MODFL)|g' \
-e 's|@''REPLACE_NAN''@|$(REPLACE_NAN)|g' \
- -e 's|@''REPLACE_REMAINDER''@|$(REPLACE_REMAINDER)|g' \
- -e 's|@''REPLACE_REMAINDERF''@|$(REPLACE_REMAINDERF)|g' \
- -e 's|@''REPLACE_REMAINDERL''@|$(REPLACE_REMAINDERL)|g' \
-e 's|@''REPLACE_ROUND''@|$(REPLACE_ROUND)|g' \
-e 's|@''REPLACE_ROUNDF''@|$(REPLACE_ROUNDF)|g' \
-e 's|@''REPLACE_ROUNDL''@|$(REPLACE_ROUNDL)|g' \
-e 's|@''REPLACE_SIGNBIT''@|$(REPLACE_SIGNBIT)|g' \
-e 's|@''REPLACE_SIGNBIT_USING_GCC''@|$(REPLACE_SIGNBIT_USING_GCC)|g' \
- -e 's|@''REPLACE_SQRTL''@|$(REPLACE_SQRTL)|g' \
- -e 's|@''REPLACE_TRUNC''@|$(REPLACE_TRUNC)|g' \
- -e 's|@''REPLACE_TRUNCF''@|$(REPLACE_TRUNCF)|g' \
-e 's|@''REPLACE_TRUNCL''@|$(REPLACE_TRUNCL)|g' \
-e '/definitions of _GL_FUNCDECL_RPL/r $(CXXDEFS_H)' \
-e '/definition of _GL_ARG_NONNULL/r $(ARG_NONNULL_H)' \
- -e '/definition of _GL_WARN_ON_USE/r $(WARN_ON_USE_H)'; \
+ -e '/definition of _GL_WARN_ON_USE/r $(WARN_ON_USE_H)' \
+ < $(srcdir)/math.in.h; \
} > $@-t && \
mv $@-t $@
MOSTLYCLEANFILES += math.h math.h-t
@@ -791,7 +562,7 @@ EXTRA_DIST += mbchar.h
## begin gnulib module mbiter
-libunistring_la_SOURCES += mbiter.h mbiter.c
+libunistring_la_SOURCES += mbiter.h
## end gnulib module mbiter
@@ -836,6 +607,14 @@ EXTRA_DIST += memcmp2.h
## end gnulib module memcmp2
+## begin gnulib module memxfrm
+
+libunistring_la_SOURCES += memxfrm.c
+
+EXTRA_DIST += memxfrm.h
+
+## end gnulib module memxfrm
+
## begin gnulib module minmax
libunistring_la_SOURCES += minmax.h
@@ -885,129 +664,18 @@ libunistring_la_SOURCES += size_max.h
## end gnulib module size_max
-## begin gnulib module snippet/_Noreturn
-
-# Because this Makefile snippet defines a variable used by other
-# gnulib Makefile snippets, it must be present in all Makefile.am that
-# need it. This is ensured by the applicability 'all' defined above.
-
-_NORETURN_H=$(top_srcdir)/build-aux/snippet/_Noreturn.h
-
-EXTRA_DIST += $(top_srcdir)/build-aux/snippet/_Noreturn.h
-
-## end gnulib module snippet/_Noreturn
-
-## begin gnulib module snippet/arg-nonnull
-
-# The BUILT_SOURCES created by this Makefile snippet are not used via #include
-# statements but through direct file reference. Therefore this snippet must be
-# present in all Makefile.am that need it. This is ensured by the applicability
-# 'all' defined above.
-
-BUILT_SOURCES += arg-nonnull.h
-# The arg-nonnull.h that gets inserted into generated .h files is the same as
-# build-aux/snippet/arg-nonnull.h, except that it has the copyright header cut
-# off.
-arg-nonnull.h: $(top_srcdir)/build-aux/snippet/arg-nonnull.h
- $(AM_V_GEN)rm -f $@-t $@ && \
- sed -n -e '/GL_ARG_NONNULL/,$$p' \
- < $(top_srcdir)/build-aux/snippet/arg-nonnull.h \
- > $@-t && \
- mv $@-t $@
-MOSTLYCLEANFILES += arg-nonnull.h arg-nonnull.h-t
-
-ARG_NONNULL_H=arg-nonnull.h
-
-EXTRA_DIST += $(top_srcdir)/build-aux/snippet/arg-nonnull.h
-
-## end gnulib module snippet/arg-nonnull
-
-## begin gnulib module snippet/c++defs
-
-# The BUILT_SOURCES created by this Makefile snippet are not used via #include
-# statements but through direct file reference. Therefore this snippet must be
-# present in all Makefile.am that need it. This is ensured by the applicability
-# 'all' defined above.
-
-BUILT_SOURCES += c++defs.h
-# The c++defs.h that gets inserted into generated .h files is the same as
-# build-aux/snippet/c++defs.h, except that it has the copyright header cut off.
-c++defs.h: $(top_srcdir)/build-aux/snippet/c++defs.h
- $(AM_V_GEN)rm -f $@-t $@ && \
- sed -n -e '/_GL_CXXDEFS/,$$p' \
- < $(top_srcdir)/build-aux/snippet/c++defs.h \
- > $@-t && \
- mv $@-t $@
-MOSTLYCLEANFILES += c++defs.h c++defs.h-t
-
-CXXDEFS_H=c++defs.h
-
-EXTRA_DIST += $(top_srcdir)/build-aux/snippet/c++defs.h
-
-## end gnulib module snippet/c++defs
-
-## begin gnulib module snippet/unused-parameter
-
-# The BUILT_SOURCES created by this Makefile snippet are not used via #include
-# statements but through direct file reference. Therefore this snippet must be
-# present in all Makefile.am that need it. This is ensured by the applicability
-# 'all' defined above.
-
-BUILT_SOURCES += unused-parameter.h
-# The unused-parameter.h that gets inserted into generated .h files is the same
-# as build-aux/snippet/unused-parameter.h, except that it has the copyright
-# header cut off.
-unused-parameter.h: $(top_srcdir)/build-aux/snippet/unused-parameter.h
- $(AM_V_GEN)rm -f $@-t $@ && \
- sed -n -e '/GL_UNUSED_PARAMETER/,$$p' \
- < $(top_srcdir)/build-aux/snippet/unused-parameter.h \
- > $@-t && \
- mv $@-t $@
-MOSTLYCLEANFILES += unused-parameter.h unused-parameter.h-t
-
-UNUSED_PARAMETER_H=unused-parameter.h
-
-EXTRA_DIST += $(top_srcdir)/build-aux/snippet/unused-parameter.h
-
-## end gnulib module snippet/unused-parameter
-
-## begin gnulib module snippet/warn-on-use
-
-BUILT_SOURCES += warn-on-use.h
-# The warn-on-use.h that gets inserted into generated .h files is the same as
-# build-aux/snippet/warn-on-use.h, except that it has the copyright header cut
-# off.
-warn-on-use.h: $(top_srcdir)/build-aux/snippet/warn-on-use.h
- $(AM_V_GEN)rm -f $@-t $@ && \
- sed -n -e '/^.ifndef/,$$p' \
- < $(top_srcdir)/build-aux/snippet/warn-on-use.h \
- > $@-t && \
- mv $@-t $@
-MOSTLYCLEANFILES += warn-on-use.h warn-on-use.h-t
-
-WARN_ON_USE_H=warn-on-use.h
-
-EXTRA_DIST += $(top_srcdir)/build-aux/snippet/warn-on-use.h
-
-## end gnulib module snippet/warn-on-use
-
## begin gnulib module stdbool
BUILT_SOURCES += $(STDBOOL_H)
# We need the following in order to create <stdbool.h> when the system
# doesn't have one that works.
-if GL_GENERATE_STDBOOL_H
-stdbool.h: stdbool.in.h $(top_builddir)/config.status
+stdbool.h: stdbool.in.h
$(AM_V_GEN)rm -f $@-t $@ && \
{ echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \
sed -e 's/@''HAVE__BOOL''@/$(HAVE__BOOL)/g' < $(srcdir)/stdbool.in.h; \
} > $@-t && \
mv $@-t $@
-else
-stdbool.h: $(top_builddir)/config.status
- rm -f $@
-endif
MOSTLYCLEANFILES += stdbool.h stdbool.h-t
EXTRA_DIST += stdbool.in.h
@@ -1020,25 +688,17 @@ BUILT_SOURCES += $(STDDEF_H)
# We need the following in order to create <stddef.h> when the system
# doesn't have one that works with the given compiler.
-if GL_GENERATE_STDDEF_H
-stddef.h: stddef.in.h $(top_builddir)/config.status
+stddef.h: stddef.in.h
$(AM_V_GEN)rm -f $@-t $@ && \
{ echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */' && \
- sed -e 's|@''GUARD_PREFIX''@|GL|g' \
- -e 's|@''INCLUDE_NEXT''@|$(INCLUDE_NEXT)|g' \
+ sed -e 's|@''INCLUDE_NEXT''@|$(INCLUDE_NEXT)|g' \
-e 's|@''PRAGMA_SYSTEM_HEADER''@|@PRAGMA_SYSTEM_HEADER@|g' \
- -e 's|@''PRAGMA_COLUMNS''@|@PRAGMA_COLUMNS@|g' \
-e 's|@''NEXT_STDDEF_H''@|$(NEXT_STDDEF_H)|g' \
- -e 's|@''HAVE_MAX_ALIGN_T''@|$(HAVE_MAX_ALIGN_T)|g' \
-e 's|@''HAVE_WCHAR_T''@|$(HAVE_WCHAR_T)|g' \
-e 's|@''REPLACE_NULL''@|$(REPLACE_NULL)|g' \
< $(srcdir)/stddef.in.h; \
} > $@-t && \
mv $@-t $@
-else
-stddef.h: $(top_builddir)/config.status
- rm -f $@
-endif
MOSTLYCLEANFILES += stddef.h stddef.h-t
EXTRA_DIST += stddef.in.h
@@ -1051,21 +711,17 @@ BUILT_SOURCES += $(STDINT_H)
# We need the following in order to create <stdint.h> when the system
# doesn't have one that works with the given compiler.
-if GL_GENERATE_STDINT_H
-stdint.h: stdint.in.h $(top_builddir)/config.status
+stdint.h: stdint.in.h
$(AM_V_GEN)rm -f $@-t $@ && \
{ echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \
- sed -e 's|@''GUARD_PREFIX''@|GL|g' \
- -e 's/@''HAVE_STDINT_H''@/$(HAVE_STDINT_H)/g' \
+ sed -e 's/@''HAVE_STDINT_H''@/$(HAVE_STDINT_H)/g' \
-e 's|@''INCLUDE_NEXT''@|$(INCLUDE_NEXT)|g' \
-e 's|@''PRAGMA_SYSTEM_HEADER''@|@PRAGMA_SYSTEM_HEADER@|g' \
- -e 's|@''PRAGMA_COLUMNS''@|@PRAGMA_COLUMNS@|g' \
-e 's|@''NEXT_STDINT_H''@|$(NEXT_STDINT_H)|g' \
-e 's/@''HAVE_SYS_TYPES_H''@/$(HAVE_SYS_TYPES_H)/g' \
-e 's/@''HAVE_INTTYPES_H''@/$(HAVE_INTTYPES_H)/g' \
-e 's/@''HAVE_SYS_INTTYPES_H''@/$(HAVE_SYS_INTTYPES_H)/g' \
-e 's/@''HAVE_SYS_BITYPES_H''@/$(HAVE_SYS_BITYPES_H)/g' \
- -e 's/@''HAVE_WCHAR_H''@/$(HAVE_WCHAR_H)/g' \
-e 's/@''HAVE_LONG_LONG_INT''@/$(HAVE_LONG_LONG_INT)/g' \
-e 's/@''HAVE_UNSIGNED_LONG_LONG_INT''@/$(HAVE_UNSIGNED_LONG_LONG_INT)/g' \
-e 's/@''APPLE_UNIVERSAL_BUILD''@/$(APPLE_UNIVERSAL_BUILD)/g' \
@@ -1085,10 +741,6 @@ stdint.h: stdint.in.h $(top_builddir)/config.status
< $(srcdir)/stdint.in.h; \
} > $@-t && \
mv $@-t $@
-else
-stdint.h: $(top_builddir)/config.status
- rm -f $@
-endif
MOSTLYCLEANFILES += stdint.h stdint.h-t
EXTRA_DIST += stdint.in.h
@@ -1101,97 +753,73 @@ BUILT_SOURCES += stdlib.h
# We need the following in order to create <stdlib.h> when the system
# doesn't have one that works with the given compiler.
-stdlib.h: stdlib.in.h $(top_builddir)/config.status $(CXXDEFS_H) \
- $(_NORETURN_H) $(ARG_NONNULL_H) $(WARN_ON_USE_H)
+stdlib.h: stdlib.in.h $(CXXDEFS_H) $(ARG_NONNULL_H) $(WARN_ON_USE_H)
$(AM_V_GEN)rm -f $@-t $@ && \
{ echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */' && \
- sed -e 's|@''GUARD_PREFIX''@|GL|g' \
- -e 's|@''INCLUDE_NEXT''@|$(INCLUDE_NEXT)|g' \
+ sed -e 's|@''INCLUDE_NEXT''@|$(INCLUDE_NEXT)|g' \
-e 's|@''PRAGMA_SYSTEM_HEADER''@|@PRAGMA_SYSTEM_HEADER@|g' \
- -e 's|@''PRAGMA_COLUMNS''@|@PRAGMA_COLUMNS@|g' \
-e 's|@''NEXT_STDLIB_H''@|$(NEXT_STDLIB_H)|g' \
- -e 's/@''GNULIB__EXIT''@/$(GNULIB__EXIT)/g' \
- -e 's/@''GNULIB_ATOLL''@/$(GNULIB_ATOLL)/g' \
- -e 's/@''GNULIB_CALLOC_POSIX''@/$(GNULIB_CALLOC_POSIX)/g' \
- -e 's/@''GNULIB_CANONICALIZE_FILE_NAME''@/$(GNULIB_CANONICALIZE_FILE_NAME)/g' \
- -e 's/@''GNULIB_GETLOADAVG''@/$(GNULIB_GETLOADAVG)/g' \
- -e 's/@''GNULIB_GETSUBOPT''@/$(GNULIB_GETSUBOPT)/g' \
- -e 's/@''GNULIB_GRANTPT''@/$(GNULIB_GRANTPT)/g' \
- -e 's/@''GNULIB_MALLOC_POSIX''@/$(GNULIB_MALLOC_POSIX)/g' \
- -e 's/@''GNULIB_MBTOWC''@/$(GNULIB_MBTOWC)/g' \
- -e 's/@''GNULIB_MKDTEMP''@/$(GNULIB_MKDTEMP)/g' \
- -e 's/@''GNULIB_MKOSTEMP''@/$(GNULIB_MKOSTEMP)/g' \
- -e 's/@''GNULIB_MKOSTEMPS''@/$(GNULIB_MKOSTEMPS)/g' \
- -e 's/@''GNULIB_MKSTEMP''@/$(GNULIB_MKSTEMP)/g' \
- -e 's/@''GNULIB_MKSTEMPS''@/$(GNULIB_MKSTEMPS)/g' \
- -e 's/@''GNULIB_POSIX_OPENPT''@/$(GNULIB_POSIX_OPENPT)/g' \
- -e 's/@''GNULIB_PTSNAME''@/$(GNULIB_PTSNAME)/g' \
- -e 's/@''GNULIB_PTSNAME_R''@/$(GNULIB_PTSNAME_R)/g' \
- -e 's/@''GNULIB_PUTENV''@/$(GNULIB_PUTENV)/g' \
- -e 's/@''GNULIB_QSORT_R''@/$(GNULIB_QSORT_R)/g' \
- -e 's/@''GNULIB_RANDOM''@/$(GNULIB_RANDOM)/g' \
- -e 's/@''GNULIB_RANDOM_R''@/$(GNULIB_RANDOM_R)/g' \
- -e 's/@''GNULIB_REALLOC_POSIX''@/$(GNULIB_REALLOC_POSIX)/g' \
- -e 's/@''GNULIB_REALPATH''@/$(GNULIB_REALPATH)/g' \
- -e 's/@''GNULIB_RPMATCH''@/$(GNULIB_RPMATCH)/g' \
- -e 's/@''GNULIB_SECURE_GETENV''@/$(GNULIB_SECURE_GETENV)/g' \
- -e 's/@''GNULIB_SETENV''@/$(GNULIB_SETENV)/g' \
- -e 's/@''GNULIB_STRTOD''@/$(GNULIB_STRTOD)/g' \
- -e 's/@''GNULIB_STRTOLL''@/$(GNULIB_STRTOLL)/g' \
- -e 's/@''GNULIB_STRTOULL''@/$(GNULIB_STRTOULL)/g' \
- -e 's/@''GNULIB_SYSTEM_POSIX''@/$(GNULIB_SYSTEM_POSIX)/g' \
- -e 's/@''GNULIB_UNLOCKPT''@/$(GNULIB_UNLOCKPT)/g' \
- -e 's/@''GNULIB_UNSETENV''@/$(GNULIB_UNSETENV)/g' \
- -e 's/@''GNULIB_WCTOMB''@/$(GNULIB_WCTOMB)/g' \
- < $(srcdir)/stdlib.in.h | \
- sed -e 's|@''HAVE__EXIT''@|$(HAVE__EXIT)|g' \
+ -e 's|@''GNULIB_ATOLL''@|$(GNULIB_ATOLL)|g' \
+ -e 's|@''GNULIB_CALLOC_POSIX''@|$(GNULIB_CALLOC_POSIX)|g' \
+ -e 's|@''GNULIB_CANONICALIZE_FILE_NAME''@|$(GNULIB_CANONICALIZE_FILE_NAME)|g' \
+ -e 's|@''GNULIB_GETLOADAVG''@|$(GNULIB_GETLOADAVG)|g' \
+ -e 's|@''GNULIB_GETSUBOPT''@|$(GNULIB_GETSUBOPT)|g' \
+ -e 's|@''GNULIB_GRANTPT''@|$(GNULIB_GRANTPT)|g' \
+ -e 's|@''GNULIB_MALLOC_POSIX''@|$(GNULIB_MALLOC_POSIX)|g' \
+ -e 's|@''GNULIB_MKDTEMP''@|$(GNULIB_MKDTEMP)|g' \
+ -e 's|@''GNULIB_MKOSTEMP''@|$(GNULIB_MKOSTEMP)|g' \
+ -e 's|@''GNULIB_MKOSTEMPS''@|$(GNULIB_MKOSTEMPS)|g' \
+ -e 's|@''GNULIB_MKSTEMP''@|$(GNULIB_MKSTEMP)|g' \
+ -e 's|@''GNULIB_MKSTEMPS''@|$(GNULIB_MKSTEMPS)|g' \
+ -e 's|@''GNULIB_PTSNAME''@|$(GNULIB_PTSNAME)|g' \
+ -e 's|@''GNULIB_PUTENV''@|$(GNULIB_PUTENV)|g' \
+ -e 's|@''GNULIB_RANDOM_R''@|$(GNULIB_RANDOM_R)|g' \
+ -e 's|@''GNULIB_REALLOC_POSIX''@|$(GNULIB_REALLOC_POSIX)|g' \
+ -e 's|@''GNULIB_REALPATH''@|$(GNULIB_REALPATH)|g' \
+ -e 's|@''GNULIB_RPMATCH''@|$(GNULIB_RPMATCH)|g' \
+ -e 's|@''GNULIB_SETENV''@|$(GNULIB_SETENV)|g' \
+ -e 's|@''GNULIB_STRTOD''@|$(GNULIB_STRTOD)|g' \
+ -e 's|@''GNULIB_STRTOLL''@|$(GNULIB_STRTOLL)|g' \
+ -e 's|@''GNULIB_STRTOULL''@|$(GNULIB_STRTOULL)|g' \
+ -e 's|@''GNULIB_UNLOCKPT''@|$(GNULIB_UNLOCKPT)|g' \
+ -e 's|@''GNULIB_UNSETENV''@|$(GNULIB_UNSETENV)|g' \
-e 's|@''HAVE_ATOLL''@|$(HAVE_ATOLL)|g' \
+ -e 's|@''HAVE_CALLOC_POSIX''@|$(HAVE_CALLOC_POSIX)|g' \
-e 's|@''HAVE_CANONICALIZE_FILE_NAME''@|$(HAVE_CANONICALIZE_FILE_NAME)|g' \
-e 's|@''HAVE_DECL_GETLOADAVG''@|$(HAVE_DECL_GETLOADAVG)|g' \
-e 's|@''HAVE_GETSUBOPT''@|$(HAVE_GETSUBOPT)|g' \
-e 's|@''HAVE_GRANTPT''@|$(HAVE_GRANTPT)|g' \
+ -e 's|@''HAVE_MALLOC_POSIX''@|$(HAVE_MALLOC_POSIX)|g' \
-e 's|@''HAVE_MKDTEMP''@|$(HAVE_MKDTEMP)|g' \
-e 's|@''HAVE_MKOSTEMP''@|$(HAVE_MKOSTEMP)|g' \
-e 's|@''HAVE_MKOSTEMPS''@|$(HAVE_MKOSTEMPS)|g' \
-e 's|@''HAVE_MKSTEMP''@|$(HAVE_MKSTEMP)|g' \
-e 's|@''HAVE_MKSTEMPS''@|$(HAVE_MKSTEMPS)|g' \
- -e 's|@''HAVE_POSIX_OPENPT''@|$(HAVE_POSIX_OPENPT)|g' \
-e 's|@''HAVE_PTSNAME''@|$(HAVE_PTSNAME)|g' \
- -e 's|@''HAVE_PTSNAME_R''@|$(HAVE_PTSNAME_R)|g' \
- -e 's|@''HAVE_RANDOM''@|$(HAVE_RANDOM)|g' \
-e 's|@''HAVE_RANDOM_H''@|$(HAVE_RANDOM_H)|g' \
-e 's|@''HAVE_RANDOM_R''@|$(HAVE_RANDOM_R)|g' \
+ -e 's|@''HAVE_REALLOC_POSIX''@|$(HAVE_REALLOC_POSIX)|g' \
-e 's|@''HAVE_REALPATH''@|$(HAVE_REALPATH)|g' \
-e 's|@''HAVE_RPMATCH''@|$(HAVE_RPMATCH)|g' \
- -e 's|@''HAVE_SECURE_GETENV''@|$(HAVE_SECURE_GETENV)|g' \
- -e 's|@''HAVE_DECL_SETENV''@|$(HAVE_DECL_SETENV)|g' \
+ -e 's|@''HAVE_SETENV''@|$(HAVE_SETENV)|g' \
-e 's|@''HAVE_STRTOD''@|$(HAVE_STRTOD)|g' \
-e 's|@''HAVE_STRTOLL''@|$(HAVE_STRTOLL)|g' \
-e 's|@''HAVE_STRTOULL''@|$(HAVE_STRTOULL)|g' \
-e 's|@''HAVE_STRUCT_RANDOM_DATA''@|$(HAVE_STRUCT_RANDOM_DATA)|g' \
-e 's|@''HAVE_SYS_LOADAVG_H''@|$(HAVE_SYS_LOADAVG_H)|g' \
-e 's|@''HAVE_UNLOCKPT''@|$(HAVE_UNLOCKPT)|g' \
- -e 's|@''HAVE_DECL_UNSETENV''@|$(HAVE_DECL_UNSETENV)|g' \
- -e 's|@''REPLACE_CALLOC''@|$(REPLACE_CALLOC)|g' \
+ -e 's|@''HAVE_UNSETENV''@|$(HAVE_UNSETENV)|g' \
-e 's|@''REPLACE_CANONICALIZE_FILE_NAME''@|$(REPLACE_CANONICALIZE_FILE_NAME)|g' \
- -e 's|@''REPLACE_MALLOC''@|$(REPLACE_MALLOC)|g' \
- -e 's|@''REPLACE_MBTOWC''@|$(REPLACE_MBTOWC)|g' \
-e 's|@''REPLACE_MKSTEMP''@|$(REPLACE_MKSTEMP)|g' \
- -e 's|@''REPLACE_PTSNAME''@|$(REPLACE_PTSNAME)|g' \
- -e 's|@''REPLACE_PTSNAME_R''@|$(REPLACE_PTSNAME_R)|g' \
-e 's|@''REPLACE_PUTENV''@|$(REPLACE_PUTENV)|g' \
- -e 's|@''REPLACE_QSORT_R''@|$(REPLACE_QSORT_R)|g' \
- -e 's|@''REPLACE_RANDOM_R''@|$(REPLACE_RANDOM_R)|g' \
- -e 's|@''REPLACE_REALLOC''@|$(REPLACE_REALLOC)|g' \
-e 's|@''REPLACE_REALPATH''@|$(REPLACE_REALPATH)|g' \
-e 's|@''REPLACE_SETENV''@|$(REPLACE_SETENV)|g' \
-e 's|@''REPLACE_STRTOD''@|$(REPLACE_STRTOD)|g' \
-e 's|@''REPLACE_UNSETENV''@|$(REPLACE_UNSETENV)|g' \
- -e 's|@''REPLACE_WCTOMB''@|$(REPLACE_WCTOMB)|g' \
-e '/definitions of _GL_FUNCDECL_RPL/r $(CXXDEFS_H)' \
- -e '/definition of _Noreturn/r $(_NORETURN_H)' \
-e '/definition of _GL_ARG_NONNULL/r $(ARG_NONNULL_H)' \
- -e '/definition of _GL_WARN_ON_USE/r $(WARN_ON_USE_H)'; \
+ -e '/definition of _GL_WARN_ON_USE/r $(WARN_ON_USE_H)' \
+ < $(srcdir)/stdlib.in.h; \
} > $@-t && \
mv $@-t $@
MOSTLYCLEANFILES += stdlib.h stdlib.h-t
@@ -1230,55 +858,48 @@ BUILT_SOURCES += string.h
# We need the following in order to create <string.h> when the system
# doesn't have one that works with the given compiler.
-string.h: string.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(ARG_NONNULL_H) $(WARN_ON_USE_H)
+string.h: string.in.h $(CXXDEFS_H) $(ARG_NONNULL_H) $(WARN_ON_USE_H)
$(AM_V_GEN)rm -f $@-t $@ && \
{ echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */' && \
- sed -e 's|@''GUARD_PREFIX''@|GL|g' \
- -e 's|@''INCLUDE_NEXT''@|$(INCLUDE_NEXT)|g' \
+ sed -e 's|@''INCLUDE_NEXT''@|$(INCLUDE_NEXT)|g' \
-e 's|@''PRAGMA_SYSTEM_HEADER''@|@PRAGMA_SYSTEM_HEADER@|g' \
- -e 's|@''PRAGMA_COLUMNS''@|@PRAGMA_COLUMNS@|g' \
-e 's|@''NEXT_STRING_H''@|$(NEXT_STRING_H)|g' \
- -e 's/@''GNULIB_FFSL''@/$(GNULIB_FFSL)/g' \
- -e 's/@''GNULIB_FFSLL''@/$(GNULIB_FFSLL)/g' \
- -e 's/@''GNULIB_MBSLEN''@/$(GNULIB_MBSLEN)/g' \
- -e 's/@''GNULIB_MBSNLEN''@/$(GNULIB_MBSNLEN)/g' \
- -e 's/@''GNULIB_MBSCHR''@/$(GNULIB_MBSCHR)/g' \
- -e 's/@''GNULIB_MBSRCHR''@/$(GNULIB_MBSRCHR)/g' \
- -e 's/@''GNULIB_MBSSTR''@/$(GNULIB_MBSSTR)/g' \
- -e 's/@''GNULIB_MBSCASECMP''@/$(GNULIB_MBSCASECMP)/g' \
- -e 's/@''GNULIB_MBSNCASECMP''@/$(GNULIB_MBSNCASECMP)/g' \
- -e 's/@''GNULIB_MBSPCASECMP''@/$(GNULIB_MBSPCASECMP)/g' \
- -e 's/@''GNULIB_MBSCASESTR''@/$(GNULIB_MBSCASESTR)/g' \
- -e 's/@''GNULIB_MBSCSPN''@/$(GNULIB_MBSCSPN)/g' \
- -e 's/@''GNULIB_MBSPBRK''@/$(GNULIB_MBSPBRK)/g' \
- -e 's/@''GNULIB_MBSSPN''@/$(GNULIB_MBSSPN)/g' \
- -e 's/@''GNULIB_MBSSEP''@/$(GNULIB_MBSSEP)/g' \
- -e 's/@''GNULIB_MBSTOK_R''@/$(GNULIB_MBSTOK_R)/g' \
- -e 's/@''GNULIB_MEMCHR''@/$(GNULIB_MEMCHR)/g' \
- -e 's/@''GNULIB_MEMMEM''@/$(GNULIB_MEMMEM)/g' \
- -e 's/@''GNULIB_MEMPCPY''@/$(GNULIB_MEMPCPY)/g' \
- -e 's/@''GNULIB_MEMRCHR''@/$(GNULIB_MEMRCHR)/g' \
- -e 's/@''GNULIB_RAWMEMCHR''@/$(GNULIB_RAWMEMCHR)/g' \
- -e 's/@''GNULIB_STPCPY''@/$(GNULIB_STPCPY)/g' \
- -e 's/@''GNULIB_STPNCPY''@/$(GNULIB_STPNCPY)/g' \
- -e 's/@''GNULIB_STRCHRNUL''@/$(GNULIB_STRCHRNUL)/g' \
- -e 's/@''GNULIB_STRDUP''@/$(GNULIB_STRDUP)/g' \
- -e 's/@''GNULIB_STRNCAT''@/$(GNULIB_STRNCAT)/g' \
- -e 's/@''GNULIB_STRNDUP''@/$(GNULIB_STRNDUP)/g' \
- -e 's/@''GNULIB_STRNLEN''@/$(GNULIB_STRNLEN)/g' \
- -e 's/@''GNULIB_STRPBRK''@/$(GNULIB_STRPBRK)/g' \
- -e 's/@''GNULIB_STRSEP''@/$(GNULIB_STRSEP)/g' \
- -e 's/@''GNULIB_STRSTR''@/$(GNULIB_STRSTR)/g' \
- -e 's/@''GNULIB_STRCASESTR''@/$(GNULIB_STRCASESTR)/g' \
- -e 's/@''GNULIB_STRTOK_R''@/$(GNULIB_STRTOK_R)/g' \
- -e 's/@''GNULIB_STRERROR''@/$(GNULIB_STRERROR)/g' \
- -e 's/@''GNULIB_STRERROR_R''@/$(GNULIB_STRERROR_R)/g' \
- -e 's/@''GNULIB_STRSIGNAL''@/$(GNULIB_STRSIGNAL)/g' \
- -e 's/@''GNULIB_STRVERSCMP''@/$(GNULIB_STRVERSCMP)/g' \
+ -e 's|@''GNULIB_MBSLEN''@|$(GNULIB_MBSLEN)|g' \
+ -e 's|@''GNULIB_MBSNLEN''@|$(GNULIB_MBSNLEN)|g' \
+ -e 's|@''GNULIB_MBSCHR''@|$(GNULIB_MBSCHR)|g' \
+ -e 's|@''GNULIB_MBSRCHR''@|$(GNULIB_MBSRCHR)|g' \
+ -e 's|@''GNULIB_MBSSTR''@|$(GNULIB_MBSSTR)|g' \
+ -e 's|@''GNULIB_MBSCASECMP''@|$(GNULIB_MBSCASECMP)|g' \
+ -e 's|@''GNULIB_MBSNCASECMP''@|$(GNULIB_MBSNCASECMP)|g' \
+ -e 's|@''GNULIB_MBSPCASECMP''@|$(GNULIB_MBSPCASECMP)|g' \
+ -e 's|@''GNULIB_MBSCASESTR''@|$(GNULIB_MBSCASESTR)|g' \
+ -e 's|@''GNULIB_MBSCSPN''@|$(GNULIB_MBSCSPN)|g' \
+ -e 's|@''GNULIB_MBSPBRK''@|$(GNULIB_MBSPBRK)|g' \
+ -e 's|@''GNULIB_MBSSPN''@|$(GNULIB_MBSSPN)|g' \
+ -e 's|@''GNULIB_MBSSEP''@|$(GNULIB_MBSSEP)|g' \
+ -e 's|@''GNULIB_MBSTOK_R''@|$(GNULIB_MBSTOK_R)|g' \
+ -e 's|@''GNULIB_MEMCHR''@|$(GNULIB_MEMCHR)|g' \
+ -e 's|@''GNULIB_MEMMEM''@|$(GNULIB_MEMMEM)|g' \
+ -e 's|@''GNULIB_MEMPCPY''@|$(GNULIB_MEMPCPY)|g' \
+ -e 's|@''GNULIB_MEMRCHR''@|$(GNULIB_MEMRCHR)|g' \
+ -e 's|@''GNULIB_RAWMEMCHR''@|$(GNULIB_RAWMEMCHR)|g' \
+ -e 's|@''GNULIB_STPCPY''@|$(GNULIB_STPCPY)|g' \
+ -e 's|@''GNULIB_STPNCPY''@|$(GNULIB_STPNCPY)|g' \
+ -e 's|@''GNULIB_STRCHRNUL''@|$(GNULIB_STRCHRNUL)|g' \
+ -e 's|@''GNULIB_STRDUP''@|$(GNULIB_STRDUP)|g' \
+ -e 's|@''GNULIB_STRNCAT''@|$(GNULIB_STRNCAT)|g' \
+ -e 's|@''GNULIB_STRNDUP''@|$(GNULIB_STRNDUP)|g' \
+ -e 's|@''GNULIB_STRNLEN''@|$(GNULIB_STRNLEN)|g' \
+ -e 's|@''GNULIB_STRPBRK''@|$(GNULIB_STRPBRK)|g' \
+ -e 's|@''GNULIB_STRSEP''@|$(GNULIB_STRSEP)|g' \
+ -e 's|@''GNULIB_STRSTR''@|$(GNULIB_STRSTR)|g' \
+ -e 's|@''GNULIB_STRCASESTR''@|$(GNULIB_STRCASESTR)|g' \
+ -e 's|@''GNULIB_STRTOK_R''@|$(GNULIB_STRTOK_R)|g' \
+ -e 's|@''GNULIB_STRERROR''@|$(GNULIB_STRERROR)|g' \
+ -e 's|@''GNULIB_STRSIGNAL''@|$(GNULIB_STRSIGNAL)|g' \
+ -e 's|@''GNULIB_STRVERSCMP''@|$(GNULIB_STRVERSCMP)|g' \
< $(srcdir)/string.in.h | \
- sed -e 's|@''HAVE_FFSL''@|$(HAVE_FFSL)|g' \
- -e 's|@''HAVE_FFSLL''@|$(HAVE_FFSLL)|g' \
- -e 's|@''HAVE_MBSLEN''@|$(HAVE_MBSLEN)|g' \
+ sed -e 's|@''HAVE_MBSLEN''@|$(HAVE_MBSLEN)|g' \
-e 's|@''HAVE_MEMCHR''@|$(HAVE_MEMCHR)|g' \
-e 's|@''HAVE_DECL_MEMMEM''@|$(HAVE_DECL_MEMMEM)|g' \
-e 's|@''HAVE_MEMPCPY''@|$(HAVE_MEMPCPY)|g' \
@@ -1294,18 +915,15 @@ string.h: string.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(ARG_NONNULL_H
-e 's|@''HAVE_STRSEP''@|$(HAVE_STRSEP)|g' \
-e 's|@''HAVE_STRCASESTR''@|$(HAVE_STRCASESTR)|g' \
-e 's|@''HAVE_DECL_STRTOK_R''@|$(HAVE_DECL_STRTOK_R)|g' \
- -e 's|@''HAVE_DECL_STRERROR_R''@|$(HAVE_DECL_STRERROR_R)|g' \
-e 's|@''HAVE_DECL_STRSIGNAL''@|$(HAVE_DECL_STRSIGNAL)|g' \
-e 's|@''HAVE_STRVERSCMP''@|$(HAVE_STRVERSCMP)|g' \
-e 's|@''REPLACE_STPNCPY''@|$(REPLACE_STPNCPY)|g' \
-e 's|@''REPLACE_MEMCHR''@|$(REPLACE_MEMCHR)|g' \
-e 's|@''REPLACE_MEMMEM''@|$(REPLACE_MEMMEM)|g' \
-e 's|@''REPLACE_STRCASESTR''@|$(REPLACE_STRCASESTR)|g' \
- -e 's|@''REPLACE_STRCHRNUL''@|$(REPLACE_STRCHRNUL)|g' \
-e 's|@''REPLACE_STRDUP''@|$(REPLACE_STRDUP)|g' \
-e 's|@''REPLACE_STRSTR''@|$(REPLACE_STRSTR)|g' \
-e 's|@''REPLACE_STRERROR''@|$(REPLACE_STRERROR)|g' \
- -e 's|@''REPLACE_STRERROR_R''@|$(REPLACE_STRERROR_R)|g' \
-e 's|@''REPLACE_STRNCAT''@|$(REPLACE_STRNCAT)|g' \
-e 's|@''REPLACE_STRNDUP''@|$(REPLACE_STRNDUP)|g' \
-e 's|@''REPLACE_STRNLEN''@|$(REPLACE_STRNLEN)|g' \
@@ -1333,40 +951,6 @@ EXTRA_libunistring_la_SOURCES += strncat.c
## end gnulib module strncat
-## begin gnulib module strstr-simple
-
-
-EXTRA_DIST += str-two-way.h strstr.c
-
-EXTRA_libunistring_la_SOURCES += strstr.c
-
-## end gnulib module strstr-simple
-
-## begin gnulib module sys_types
-
-BUILT_SOURCES += sys/types.h
-
-# We need the following in order to create <sys/types.h> when the system
-# doesn't have one that works with the given compiler.
-sys/types.h: sys_types.in.h $(top_builddir)/config.status
- $(AM_V_at)$(MKDIR_P) sys
- $(AM_V_GEN)rm -f $@-t $@ && \
- { echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \
- sed -e 's|@''GUARD_PREFIX''@|GL|g' \
- -e 's|@''INCLUDE_NEXT''@|$(INCLUDE_NEXT)|g' \
- -e 's|@''PRAGMA_SYSTEM_HEADER''@|@PRAGMA_SYSTEM_HEADER@|g' \
- -e 's|@''PRAGMA_COLUMNS''@|@PRAGMA_COLUMNS@|g' \
- -e 's|@''NEXT_SYS_TYPES_H''@|$(NEXT_SYS_TYPES_H)|g' \
- -e 's|@''WINDOWS_64_BIT_OFF_T''@|$(WINDOWS_64_BIT_OFF_T)|g' \
- < $(srcdir)/sys_types.in.h; \
- } > $@-t && \
- mv $@-t $@
-MOSTLYCLEANFILES += sys/types.h sys/types.h-t
-
-EXTRA_DIST += sys_types.in.h
-
-## end gnulib module sys_types
-
## begin gnulib module threadlib
libunistring_la_SOURCES += glthread/threadlib.c
@@ -1377,17 +961,8 @@ EXTRA_DIST += $(top_srcdir)/build-aux/config.rpath
## begin gnulib module unicase/base
-BUILT_SOURCES += $(LIBUNISTRING_UNICASE_H)
-
-unicase.h: unicase.in.h
- $(AM_V_GEN)rm -f $@-t $@ && \
- { echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \
- cat $(srcdir)/unicase.in.h; \
- } > $@-t && \
- mv -f $@-t $@
-MOSTLYCLEANFILES += unicase.h unicase.h-t
-EXTRA_DIST += unicase.in.h
+EXTRA_DIST += unicase.h
## end gnulib module unicase/base
@@ -1401,17 +976,13 @@ EXTRA_DIST += unicase/cased.h unicase/caseprop.h unictype/bitmap.h
## begin gnulib module unicase/empty-prefix-context
-if LIBUNISTRING_COMPILE_UNICASE_EMPTY_PREFIX_CONTEXT
libunistring_la_SOURCES += unicase/empty-prefix-context.c
-endif
## end gnulib module unicase/empty-prefix-context
## begin gnulib module unicase/empty-suffix-context
-if LIBUNISTRING_COMPILE_UNICASE_EMPTY_SUFFIX_CONTEXT
libunistring_la_SOURCES += unicase/empty-suffix-context.c
-endif
## end gnulib module unicase/empty-suffix-context
@@ -1425,9 +996,7 @@ EXTRA_DIST += unicase/caseprop.h unicase/ignorable.h unictype/bitmap.h
## begin gnulib module unicase/locale-language
-if LIBUNISTRING_COMPILE_UNICASE_LOCALE_LANGUAGE
libunistring_la_SOURCES += unicase/locale-language.c
-endif
unicase/locale-languages.h: $(srcdir)/unicase/locale-languages.gperf
$(GPERF) -m 10 $(srcdir)/unicase/locale-languages.gperf > $(srcdir)/unicase/locale-languages.h-t
@@ -1467,9 +1036,7 @@ EXTRA_DIST += unicase/casefold.h unicase/simple-mapping.h unicase/tocasefold.h
## begin gnulib module unicase/tolower
-if LIBUNISTRING_COMPILE_UNICASE_TOLOWER
libunistring_la_SOURCES += unicase/tolower.c
-endif
EXTRA_DIST += unicase/simple-mapping.h unicase/tolower.h
@@ -1477,9 +1044,7 @@ EXTRA_DIST += unicase/simple-mapping.h unicase/tolower.h
## begin gnulib module unicase/totitle
-if LIBUNISTRING_COMPILE_UNICASE_TOTITLE
libunistring_la_SOURCES += unicase/totitle.c
-endif
EXTRA_DIST += unicase/simple-mapping.h unicase/totitle.h
@@ -1487,9 +1052,7 @@ EXTRA_DIST += unicase/simple-mapping.h unicase/totitle.h
## begin gnulib module unicase/toupper
-if LIBUNISTRING_COMPILE_UNICASE_TOUPPER
libunistring_la_SOURCES += unicase/toupper.c
-endif
EXTRA_DIST += unicase/simple-mapping.h unicase/toupper.h
@@ -1497,9 +1060,7 @@ EXTRA_DIST += unicase/simple-mapping.h unicase/toupper.h
## begin gnulib module unicase/u16-casecmp
-if LIBUNISTRING_COMPILE_UNICASE_U16_CASECMP
libunistring_la_SOURCES += unicase/u16-casecmp.c
-endif
EXTRA_DIST += unicase/u-casecmp.h
@@ -1507,9 +1068,7 @@ EXTRA_DIST += unicase/u-casecmp.h
## begin gnulib module unicase/u16-casecoll
-if LIBUNISTRING_COMPILE_UNICASE_U16_CASECOLL
libunistring_la_SOURCES += unicase/u16-casecoll.c
-endif
EXTRA_DIST += unicase/u-casecoll.h
@@ -1517,9 +1076,7 @@ EXTRA_DIST += unicase/u-casecoll.h
## begin gnulib module unicase/u16-casefold
-if LIBUNISTRING_COMPILE_UNICASE_U16_CASEFOLD
libunistring_la_SOURCES += unicase/u16-casefold.c
-endif
EXTRA_DIST += unicase/u-casefold.h
@@ -1535,9 +1092,7 @@ EXTRA_DIST += unicase/context.h unicase/u-casemap.h unicase/unicasemap.h
## begin gnulib module unicase/u16-casexfrm
-if LIBUNISTRING_COMPILE_UNICASE_U16_CASEXFRM
libunistring_la_SOURCES += unicase/u16-casexfrm.c
-endif
EXTRA_DIST += unicase/u-casexfrm.h
@@ -1545,9 +1100,7 @@ EXTRA_DIST += unicase/u-casexfrm.h
## begin gnulib module unicase/u16-ct-casefold
-if LIBUNISTRING_COMPILE_UNICASE_U16_CT_CASEFOLD
libunistring_la_SOURCES += unicase/u16-ct-casefold.c
-endif
EXTRA_DIST += unicase/u-ct-casefold.h
@@ -1555,17 +1108,13 @@ EXTRA_DIST += unicase/u-ct-casefold.h
## begin gnulib module unicase/u16-ct-tolower
-if LIBUNISTRING_COMPILE_UNICASE_U16_CT_TOLOWER
libunistring_la_SOURCES += unicase/u16-ct-tolower.c
-endif
## end gnulib module unicase/u16-ct-tolower
## begin gnulib module unicase/u16-ct-totitle
-if LIBUNISTRING_COMPILE_UNICASE_U16_CT_TOTITLE
libunistring_la_SOURCES += unicase/u16-ct-totitle.c
-endif
EXTRA_DIST += unicase/context.h unicase/u-ct-totitle.h
@@ -1573,17 +1122,13 @@ EXTRA_DIST += unicase/context.h unicase/u-ct-totitle.h
## begin gnulib module unicase/u16-ct-toupper
-if LIBUNISTRING_COMPILE_UNICASE_U16_CT_TOUPPER
libunistring_la_SOURCES += unicase/u16-ct-toupper.c
-endif
## end gnulib module unicase/u16-ct-toupper
## begin gnulib module unicase/u16-is-cased
-if LIBUNISTRING_COMPILE_UNICASE_U16_IS_CASED
libunistring_la_SOURCES += unicase/u16-is-cased.c
-endif
EXTRA_DIST += unicase/u-is-cased.h
@@ -1591,9 +1136,7 @@ EXTRA_DIST += unicase/u-is-cased.h
## begin gnulib module unicase/u16-is-casefolded
-if LIBUNISTRING_COMPILE_UNICASE_U16_IS_CASEFOLDED
libunistring_la_SOURCES += unicase/u16-is-casefolded.c
-endif
## end gnulib module unicase/u16-is-casefolded
@@ -1607,41 +1150,31 @@ EXTRA_DIST += unicase/invariant.h unicase/u-is-invariant.h
## begin gnulib module unicase/u16-is-lowercase
-if LIBUNISTRING_COMPILE_UNICASE_U16_IS_LOWERCASE
libunistring_la_SOURCES += unicase/u16-is-lowercase.c
-endif
## end gnulib module unicase/u16-is-lowercase
## begin gnulib module unicase/u16-is-titlecase
-if LIBUNISTRING_COMPILE_UNICASE_U16_IS_TITLECASE
libunistring_la_SOURCES += unicase/u16-is-titlecase.c
-endif
## end gnulib module unicase/u16-is-titlecase
## begin gnulib module unicase/u16-is-uppercase
-if LIBUNISTRING_COMPILE_UNICASE_U16_IS_UPPERCASE
libunistring_la_SOURCES += unicase/u16-is-uppercase.c
-endif
## end gnulib module unicase/u16-is-uppercase
## begin gnulib module unicase/u16-tolower
-if LIBUNISTRING_COMPILE_UNICASE_U16_TOLOWER
libunistring_la_SOURCES += unicase/u16-tolower.c
-endif
## end gnulib module unicase/u16-tolower
## begin gnulib module unicase/u16-totitle
-if LIBUNISTRING_COMPILE_UNICASE_U16_TOTITLE
libunistring_la_SOURCES += unicase/u16-totitle.c
-endif
EXTRA_DIST += unicase/u-totitle.h
@@ -1649,17 +1182,13 @@ EXTRA_DIST += unicase/u-totitle.h
## begin gnulib module unicase/u16-toupper
-if LIBUNISTRING_COMPILE_UNICASE_U16_TOUPPER
libunistring_la_SOURCES += unicase/u16-toupper.c
-endif
## end gnulib module unicase/u16-toupper
## begin gnulib module unicase/u32-casecmp
-if LIBUNISTRING_COMPILE_UNICASE_U32_CASECMP
libunistring_la_SOURCES += unicase/u32-casecmp.c
-endif
EXTRA_DIST += unicase/u-casecmp.h
@@ -1667,9 +1196,7 @@ EXTRA_DIST += unicase/u-casecmp.h
## begin gnulib module unicase/u32-casecoll
-if LIBUNISTRING_COMPILE_UNICASE_U32_CASECOLL
libunistring_la_SOURCES += unicase/u32-casecoll.c
-endif
EXTRA_DIST += unicase/u-casecoll.h
@@ -1677,9 +1204,7 @@ EXTRA_DIST += unicase/u-casecoll.h
## begin gnulib module unicase/u32-casefold
-if LIBUNISTRING_COMPILE_UNICASE_U32_CASEFOLD
libunistring_la_SOURCES += unicase/u32-casefold.c
-endif
EXTRA_DIST += unicase/u-casefold.h
@@ -1695,9 +1220,7 @@ EXTRA_DIST += unicase/context.h unicase/u-casemap.h unicase/unicasemap.h
## begin gnulib module unicase/u32-casexfrm
-if LIBUNISTRING_COMPILE_UNICASE_U32_CASEXFRM
libunistring_la_SOURCES += unicase/u32-casexfrm.c
-endif
EXTRA_DIST += unicase/u-casexfrm.h
@@ -1705,9 +1228,7 @@ EXTRA_DIST += unicase/u-casexfrm.h
## begin gnulib module unicase/u32-ct-casefold
-if LIBUNISTRING_COMPILE_UNICASE_U32_CT_CASEFOLD
libunistring_la_SOURCES += unicase/u32-ct-casefold.c
-endif
EXTRA_DIST += unicase/u-ct-casefold.h
@@ -1715,17 +1236,13 @@ EXTRA_DIST += unicase/u-ct-casefold.h
## begin gnulib module unicase/u32-ct-tolower
-if LIBUNISTRING_COMPILE_UNICASE_U32_CT_TOLOWER
libunistring_la_SOURCES += unicase/u32-ct-tolower.c
-endif
## end gnulib module unicase/u32-ct-tolower
## begin gnulib module unicase/u32-ct-totitle
-if LIBUNISTRING_COMPILE_UNICASE_U32_CT_TOTITLE
libunistring_la_SOURCES += unicase/u32-ct-totitle.c
-endif
EXTRA_DIST += unicase/context.h unicase/u-ct-totitle.h
@@ -1733,17 +1250,13 @@ EXTRA_DIST += unicase/context.h unicase/u-ct-totitle.h
## begin gnulib module unicase/u32-ct-toupper
-if LIBUNISTRING_COMPILE_UNICASE_U32_CT_TOUPPER
libunistring_la_SOURCES += unicase/u32-ct-toupper.c
-endif
## end gnulib module unicase/u32-ct-toupper
## begin gnulib module unicase/u32-is-cased
-if LIBUNISTRING_COMPILE_UNICASE_U32_IS_CASED
libunistring_la_SOURCES += unicase/u32-is-cased.c
-endif
EXTRA_DIST += unicase/u-is-cased.h
@@ -1751,9 +1264,7 @@ EXTRA_DIST += unicase/u-is-cased.h
## begin gnulib module unicase/u32-is-casefolded
-if LIBUNISTRING_COMPILE_UNICASE_U32_IS_CASEFOLDED
libunistring_la_SOURCES += unicase/u32-is-casefolded.c
-endif
## end gnulib module unicase/u32-is-casefolded
@@ -1767,41 +1278,31 @@ EXTRA_DIST += unicase/invariant.h unicase/u-is-invariant.h
## begin gnulib module unicase/u32-is-lowercase
-if LIBUNISTRING_COMPILE_UNICASE_U32_IS_LOWERCASE
libunistring_la_SOURCES += unicase/u32-is-lowercase.c
-endif
## end gnulib module unicase/u32-is-lowercase
## begin gnulib module unicase/u32-is-titlecase
-if LIBUNISTRING_COMPILE_UNICASE_U32_IS_TITLECASE
libunistring_la_SOURCES += unicase/u32-is-titlecase.c
-endif
## end gnulib module unicase/u32-is-titlecase
## begin gnulib module unicase/u32-is-uppercase
-if LIBUNISTRING_COMPILE_UNICASE_U32_IS_UPPERCASE
libunistring_la_SOURCES += unicase/u32-is-uppercase.c
-endif
## end gnulib module unicase/u32-is-uppercase
## begin gnulib module unicase/u32-tolower
-if LIBUNISTRING_COMPILE_UNICASE_U32_TOLOWER
libunistring_la_SOURCES += unicase/u32-tolower.c
-endif
## end gnulib module unicase/u32-tolower
## begin gnulib module unicase/u32-totitle
-if LIBUNISTRING_COMPILE_UNICASE_U32_TOTITLE
libunistring_la_SOURCES += unicase/u32-totitle.c
-endif
EXTRA_DIST += unicase/u-totitle.h
@@ -1809,17 +1310,13 @@ EXTRA_DIST += unicase/u-totitle.h
## begin gnulib module unicase/u32-toupper
-if LIBUNISTRING_COMPILE_UNICASE_U32_TOUPPER
libunistring_la_SOURCES += unicase/u32-toupper.c
-endif
## end gnulib module unicase/u32-toupper
## begin gnulib module unicase/u8-casecmp
-if LIBUNISTRING_COMPILE_UNICASE_U8_CASECMP
libunistring_la_SOURCES += unicase/u8-casecmp.c
-endif
EXTRA_DIST += unicase/u-casecmp.h
@@ -1827,9 +1324,7 @@ EXTRA_DIST += unicase/u-casecmp.h
## begin gnulib module unicase/u8-casecoll
-if LIBUNISTRING_COMPILE_UNICASE_U8_CASECOLL
libunistring_la_SOURCES += unicase/u8-casecoll.c
-endif
EXTRA_DIST += unicase/u-casecoll.h
@@ -1837,9 +1332,7 @@ EXTRA_DIST += unicase/u-casecoll.h
## begin gnulib module unicase/u8-casefold
-if LIBUNISTRING_COMPILE_UNICASE_U8_CASEFOLD
libunistring_la_SOURCES += unicase/u8-casefold.c
-endif
EXTRA_DIST += unicase/u-casefold.h
@@ -1855,9 +1348,7 @@ EXTRA_DIST += unicase/context.h unicase/u-casemap.h unicase/unicasemap.h
## begin gnulib module unicase/u8-casexfrm
-if LIBUNISTRING_COMPILE_UNICASE_U8_CASEXFRM
libunistring_la_SOURCES += unicase/u8-casexfrm.c
-endif
EXTRA_DIST += unicase/u-casexfrm.h
@@ -1865,9 +1356,7 @@ EXTRA_DIST += unicase/u-casexfrm.h
## begin gnulib module unicase/u8-ct-casefold
-if LIBUNISTRING_COMPILE_UNICASE_U8_CT_CASEFOLD
libunistring_la_SOURCES += unicase/u8-ct-casefold.c
-endif
EXTRA_DIST += unicase/u-ct-casefold.h
@@ -1875,17 +1364,13 @@ EXTRA_DIST += unicase/u-ct-casefold.h
## begin gnulib module unicase/u8-ct-tolower
-if LIBUNISTRING_COMPILE_UNICASE_U8_CT_TOLOWER
libunistring_la_SOURCES += unicase/u8-ct-tolower.c
-endif
## end gnulib module unicase/u8-ct-tolower
## begin gnulib module unicase/u8-ct-totitle
-if LIBUNISTRING_COMPILE_UNICASE_U8_CT_TOTITLE
libunistring_la_SOURCES += unicase/u8-ct-totitle.c
-endif
EXTRA_DIST += unicase/context.h unicase/u-ct-totitle.h
@@ -1893,17 +1378,13 @@ EXTRA_DIST += unicase/context.h unicase/u-ct-totitle.h
## begin gnulib module unicase/u8-ct-toupper
-if LIBUNISTRING_COMPILE_UNICASE_U8_CT_TOUPPER
libunistring_la_SOURCES += unicase/u8-ct-toupper.c
-endif
## end gnulib module unicase/u8-ct-toupper
## begin gnulib module unicase/u8-is-cased
-if LIBUNISTRING_COMPILE_UNICASE_U8_IS_CASED
libunistring_la_SOURCES += unicase/u8-is-cased.c
-endif
EXTRA_DIST += unicase/u-is-cased.h
@@ -1911,9 +1392,7 @@ EXTRA_DIST += unicase/u-is-cased.h
## begin gnulib module unicase/u8-is-casefolded
-if LIBUNISTRING_COMPILE_UNICASE_U8_IS_CASEFOLDED
libunistring_la_SOURCES += unicase/u8-is-casefolded.c
-endif
## end gnulib module unicase/u8-is-casefolded
@@ -1927,41 +1406,31 @@ EXTRA_DIST += unicase/invariant.h unicase/u-is-invariant.h
## begin gnulib module unicase/u8-is-lowercase
-if LIBUNISTRING_COMPILE_UNICASE_U8_IS_LOWERCASE
libunistring_la_SOURCES += unicase/u8-is-lowercase.c
-endif
## end gnulib module unicase/u8-is-lowercase
## begin gnulib module unicase/u8-is-titlecase
-if LIBUNISTRING_COMPILE_UNICASE_U8_IS_TITLECASE
libunistring_la_SOURCES += unicase/u8-is-titlecase.c
-endif
## end gnulib module unicase/u8-is-titlecase
## begin gnulib module unicase/u8-is-uppercase
-if LIBUNISTRING_COMPILE_UNICASE_U8_IS_UPPERCASE
libunistring_la_SOURCES += unicase/u8-is-uppercase.c
-endif
## end gnulib module unicase/u8-is-uppercase
## begin gnulib module unicase/u8-tolower
-if LIBUNISTRING_COMPILE_UNICASE_U8_TOLOWER
libunistring_la_SOURCES += unicase/u8-tolower.c
-endif
## end gnulib module unicase/u8-tolower
## begin gnulib module unicase/u8-totitle
-if LIBUNISTRING_COMPILE_UNICASE_U8_TOTITLE
libunistring_la_SOURCES += unicase/u8-totitle.c
-endif
EXTRA_DIST += unicase/u-totitle.h
@@ -1969,17 +1438,13 @@ EXTRA_DIST += unicase/u-totitle.h
## begin gnulib module unicase/u8-toupper
-if LIBUNISTRING_COMPILE_UNICASE_U8_TOUPPER
libunistring_la_SOURCES += unicase/u8-toupper.c
-endif
## end gnulib module unicase/u8-toupper
## begin gnulib module unicase/ulc-casecmp
-if LIBUNISTRING_COMPILE_UNICASE_ULC_CASECMP
libunistring_la_SOURCES += unicase/ulc-casecmp.c
-endif
EXTRA_DIST += unicase/u-casecmp.h
@@ -1987,9 +1452,7 @@ EXTRA_DIST += unicase/u-casecmp.h
## begin gnulib module unicase/ulc-casecoll
-if LIBUNISTRING_COMPILE_UNICASE_ULC_CASECOLL
libunistring_la_SOURCES += unicase/ulc-casecoll.c
-endif
EXTRA_DIST += unicase/u-casecoll.h
@@ -1997,33 +1460,20 @@ EXTRA_DIST += unicase/u-casecoll.h
## begin gnulib module unicase/ulc-casexfrm
-if LIBUNISTRING_COMPILE_UNICASE_ULC_CASEXFRM
libunistring_la_SOURCES += unicase/ulc-casexfrm.c
-endif
## end gnulib module unicase/ulc-casexfrm
## begin gnulib module uniconv/base
-BUILT_SOURCES += $(LIBUNISTRING_UNICONV_H)
-
-uniconv.h: uniconv.in.h
- $(AM_V_GEN)rm -f $@-t $@ && \
- { echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \
- cat $(srcdir)/uniconv.in.h; \
- } > $@-t && \
- mv -f $@-t $@
-MOSTLYCLEANFILES += uniconv.h uniconv.h-t
-EXTRA_DIST += iconveh.h localcharset.h striconveha.h uniconv.in.h
+EXTRA_DIST += iconveh.h localcharset.h striconveha.h uniconv.h
## end gnulib module uniconv/base
## begin gnulib module uniconv/u16-conv-from-enc
-if LIBUNISTRING_COMPILE_UNICONV_U16_CONV_FROM_ENC
libunistring_la_SOURCES += uniconv/u16-conv-from-enc.c
-endif
EXTRA_DIST += uniconv/u-conv-from-enc.h
@@ -2031,9 +1481,7 @@ EXTRA_DIST += uniconv/u-conv-from-enc.h
## begin gnulib module uniconv/u16-conv-to-enc
-if LIBUNISTRING_COMPILE_UNICONV_U16_CONV_TO_ENC
libunistring_la_SOURCES += uniconv/u16-conv-to-enc.c
-endif
EXTRA_DIST += uniconv/u-conv-to-enc.h
@@ -2041,9 +1489,7 @@ EXTRA_DIST += uniconv/u-conv-to-enc.h
## begin gnulib module uniconv/u16-strconv-from-enc
-if LIBUNISTRING_COMPILE_UNICONV_U16_STRCONV_FROM_ENC
libunistring_la_SOURCES += uniconv/u16-strconv-from-enc.c
-endif
EXTRA_DIST += uniconv/u-strconv-from-enc.h
@@ -2051,17 +1497,13 @@ EXTRA_DIST += uniconv/u-strconv-from-enc.h
## begin gnulib module uniconv/u16-strconv-from-locale
-if LIBUNISTRING_COMPILE_UNICONV_U16_STRCONV_FROM_LOCALE
libunistring_la_SOURCES += uniconv/u16-strconv-from-locale.c
-endif
## end gnulib module uniconv/u16-strconv-from-locale
## begin gnulib module uniconv/u16-strconv-to-enc
-if LIBUNISTRING_COMPILE_UNICONV_U16_STRCONV_TO_ENC
libunistring_la_SOURCES += uniconv/u16-strconv-to-enc.c
-endif
EXTRA_DIST += uniconv/u-strconv-to-enc.h
@@ -2069,17 +1511,13 @@ EXTRA_DIST += uniconv/u-strconv-to-enc.h
## begin gnulib module uniconv/u16-strconv-to-locale
-if LIBUNISTRING_COMPILE_UNICONV_U16_STRCONV_TO_LOCALE
libunistring_la_SOURCES += uniconv/u16-strconv-to-locale.c
-endif
## end gnulib module uniconv/u16-strconv-to-locale
## begin gnulib module uniconv/u32-conv-from-enc
-if LIBUNISTRING_COMPILE_UNICONV_U32_CONV_FROM_ENC
libunistring_la_SOURCES += uniconv/u32-conv-from-enc.c
-endif
EXTRA_DIST += uniconv/u-conv-from-enc.h
@@ -2087,9 +1525,7 @@ EXTRA_DIST += uniconv/u-conv-from-enc.h
## begin gnulib module uniconv/u32-conv-to-enc
-if LIBUNISTRING_COMPILE_UNICONV_U32_CONV_TO_ENC
libunistring_la_SOURCES += uniconv/u32-conv-to-enc.c
-endif
EXTRA_DIST += uniconv/u-conv-to-enc.h
@@ -2097,9 +1533,7 @@ EXTRA_DIST += uniconv/u-conv-to-enc.h
## begin gnulib module uniconv/u32-strconv-from-enc
-if LIBUNISTRING_COMPILE_UNICONV_U32_STRCONV_FROM_ENC
libunistring_la_SOURCES += uniconv/u32-strconv-from-enc.c
-endif
EXTRA_DIST += uniconv/u-strconv-from-enc.h
@@ -2107,17 +1541,13 @@ EXTRA_DIST += uniconv/u-strconv-from-enc.h
## begin gnulib module uniconv/u32-strconv-from-locale
-if LIBUNISTRING_COMPILE_UNICONV_U32_STRCONV_FROM_LOCALE
libunistring_la_SOURCES += uniconv/u32-strconv-from-locale.c
-endif
## end gnulib module uniconv/u32-strconv-from-locale
## begin gnulib module uniconv/u32-strconv-to-enc
-if LIBUNISTRING_COMPILE_UNICONV_U32_STRCONV_TO_ENC
libunistring_la_SOURCES += uniconv/u32-strconv-to-enc.c
-endif
EXTRA_DIST += uniconv/u-strconv-to-enc.h
@@ -2125,33 +1555,25 @@ EXTRA_DIST += uniconv/u-strconv-to-enc.h
## begin gnulib module uniconv/u32-strconv-to-locale
-if LIBUNISTRING_COMPILE_UNICONV_U32_STRCONV_TO_LOCALE
libunistring_la_SOURCES += uniconv/u32-strconv-to-locale.c
-endif
## end gnulib module uniconv/u32-strconv-to-locale
## begin gnulib module uniconv/u8-conv-from-enc
-if LIBUNISTRING_COMPILE_UNICONV_U8_CONV_FROM_ENC
libunistring_la_SOURCES += uniconv/u8-conv-from-enc.c
-endif
## end gnulib module uniconv/u8-conv-from-enc
## begin gnulib module uniconv/u8-conv-to-enc
-if LIBUNISTRING_COMPILE_UNICONV_U8_CONV_TO_ENC
libunistring_la_SOURCES += uniconv/u8-conv-to-enc.c
-endif
## end gnulib module uniconv/u8-conv-to-enc
## begin gnulib module uniconv/u8-strconv-from-enc
-if LIBUNISTRING_COMPILE_UNICONV_U8_STRCONV_FROM_ENC
libunistring_la_SOURCES += uniconv/u8-strconv-from-enc.c
-endif
EXTRA_DIST += uniconv/u-strconv-from-enc.h
@@ -2159,101 +1581,58 @@ EXTRA_DIST += uniconv/u-strconv-from-enc.h
## begin gnulib module uniconv/u8-strconv-from-locale
-if LIBUNISTRING_COMPILE_UNICONV_U8_STRCONV_FROM_LOCALE
libunistring_la_SOURCES += uniconv/u8-strconv-from-locale.c
-endif
## end gnulib module uniconv/u8-strconv-from-locale
## begin gnulib module uniconv/u8-strconv-to-enc
-if LIBUNISTRING_COMPILE_UNICONV_U8_STRCONV_TO_ENC
libunistring_la_SOURCES += uniconv/u8-strconv-to-enc.c
-endif
## end gnulib module uniconv/u8-strconv-to-enc
## begin gnulib module uniconv/u8-strconv-to-locale
-if LIBUNISTRING_COMPILE_UNICONV_U8_STRCONV_TO_LOCALE
libunistring_la_SOURCES += uniconv/u8-strconv-to-locale.c
-endif
## end gnulib module uniconv/u8-strconv-to-locale
## begin gnulib module unictype/base
-BUILT_SOURCES += $(LIBUNISTRING_UNICTYPE_H)
-
-unictype.h: unictype.in.h
- $(AM_V_GEN)rm -f $@-t $@ && \
- { echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \
- cat $(srcdir)/unictype.in.h; \
- } > $@-t && \
- mv -f $@-t $@
-MOSTLYCLEANFILES += unictype.h unictype.h-t
-EXTRA_DIST += unictype.in.h
+EXTRA_DIST += unictype.h
## end gnulib module unictype/base
-## begin gnulib module unictype/bidiclass-byname
+## begin gnulib module unictype/bidicategory-byname
-if LIBUNISTRING_COMPILE_UNICTYPE_BIDICLASS_BYNAME
libunistring_la_SOURCES += unictype/bidi_byname.c
-endif
-unictype/bidi_byname.h: unictype/bidi_byname.gperf
- $(GPERF) -m 10 $(srcdir)/unictype/bidi_byname.gperf > $(srcdir)/unictype/bidi_byname.h-t
- mv $(srcdir)/unictype/bidi_byname.h-t $(srcdir)/unictype/bidi_byname.h
-BUILT_SOURCES += unictype/bidi_byname.h
-MOSTLYCLEANFILES += unictype/bidi_byname.h-t
-MAINTAINERCLEANFILES += unictype/bidi_byname.h
-EXTRA_DIST += unictype/bidi_byname.h
+## end gnulib module unictype/bidicategory-byname
-EXTRA_DIST += unictype/bidi_byname.gperf
+## begin gnulib module unictype/bidicategory-name
-## end gnulib module unictype/bidiclass-byname
-
-## begin gnulib module unictype/bidiclass-longname
-
-if LIBUNISTRING_COMPILE_UNICTYPE_BIDICLASS_LONGNAME
-libunistring_la_SOURCES += unictype/bidi_longname.c
-endif
-
-## end gnulib module unictype/bidiclass-longname
-
-## begin gnulib module unictype/bidiclass-name
-
-if LIBUNISTRING_COMPILE_UNICTYPE_BIDICLASS_NAME
libunistring_la_SOURCES += unictype/bidi_name.c
-endif
-## end gnulib module unictype/bidiclass-name
+## end gnulib module unictype/bidicategory-name
-## begin gnulib module unictype/bidiclass-of
+## begin gnulib module unictype/bidicategory-of
-if LIBUNISTRING_COMPILE_UNICTYPE_BIDICLASS_OF
libunistring_la_SOURCES += unictype/bidi_of.c
-endif
EXTRA_DIST += unictype/bidi_of.h
-## end gnulib module unictype/bidiclass-of
+## end gnulib module unictype/bidicategory-of
-## begin gnulib module unictype/bidiclass-test
+## begin gnulib module unictype/bidicategory-test
-if LIBUNISTRING_COMPILE_UNICTYPE_BIDICLASS_TEST
libunistring_la_SOURCES += unictype/bidi_test.c
-endif
-## end gnulib module unictype/bidiclass-test
+## end gnulib module unictype/bidicategory-test
## begin gnulib module unictype/block-list
-if LIBUNISTRING_COMPILE_UNICTYPE_BLOCK_LIST
libunistring_la_SOURCES += unictype/blocks.c
-endif
EXTRA_DIST += unictype/blocks.h
@@ -2261,17 +1640,13 @@ EXTRA_DIST += unictype/blocks.h
## begin gnulib module unictype/block-test
-if LIBUNISTRING_COMPILE_UNICTYPE_BLOCK_TEST
libunistring_la_SOURCES += unictype/block_test.c
-endif
## end gnulib module unictype/block-test
## begin gnulib module unictype/category-C
-if LIBUNISTRING_COMPILE_UNICTYPE_CATEGORY_C
libunistring_la_SOURCES += unictype/categ_C.c
-endif
EXTRA_DIST += unictype/categ_C.h
@@ -2279,9 +1654,7 @@ EXTRA_DIST += unictype/categ_C.h
## begin gnulib module unictype/category-Cc
-if LIBUNISTRING_COMPILE_UNICTYPE_CATEGORY_CC
libunistring_la_SOURCES += unictype/categ_Cc.c
-endif
EXTRA_DIST += unictype/categ_Cc.h
@@ -2289,9 +1662,7 @@ EXTRA_DIST += unictype/categ_Cc.h
## begin gnulib module unictype/category-Cf
-if LIBUNISTRING_COMPILE_UNICTYPE_CATEGORY_CF
libunistring_la_SOURCES += unictype/categ_Cf.c
-endif
EXTRA_DIST += unictype/categ_Cf.h
@@ -2299,9 +1670,7 @@ EXTRA_DIST += unictype/categ_Cf.h
## begin gnulib module unictype/category-Cn
-if LIBUNISTRING_COMPILE_UNICTYPE_CATEGORY_CN
libunistring_la_SOURCES += unictype/categ_Cn.c
-endif
EXTRA_DIST += unictype/categ_Cn.h
@@ -2309,9 +1678,7 @@ EXTRA_DIST += unictype/categ_Cn.h
## begin gnulib module unictype/category-Co
-if LIBUNISTRING_COMPILE_UNICTYPE_CATEGORY_CO
libunistring_la_SOURCES += unictype/categ_Co.c
-endif
EXTRA_DIST += unictype/categ_Co.h
@@ -2319,9 +1686,7 @@ EXTRA_DIST += unictype/categ_Co.h
## begin gnulib module unictype/category-Cs
-if LIBUNISTRING_COMPILE_UNICTYPE_CATEGORY_CS
libunistring_la_SOURCES += unictype/categ_Cs.c
-endif
EXTRA_DIST += unictype/categ_Cs.h
@@ -2329,29 +1694,15 @@ EXTRA_DIST += unictype/categ_Cs.h
## begin gnulib module unictype/category-L
-if LIBUNISTRING_COMPILE_UNICTYPE_CATEGORY_L
libunistring_la_SOURCES += unictype/categ_L.c
-endif
EXTRA_DIST += unictype/categ_L.h
## end gnulib module unictype/category-L
-## begin gnulib module unictype/category-LC
-
-if LIBUNISTRING_COMPILE_UNICTYPE_CATEGORY_LC
-libunistring_la_SOURCES += unictype/categ_LC.c
-endif
-
-EXTRA_DIST += unictype/categ_LC.h
-
-## end gnulib module unictype/category-LC
-
## begin gnulib module unictype/category-Ll
-if LIBUNISTRING_COMPILE_UNICTYPE_CATEGORY_LL
libunistring_la_SOURCES += unictype/categ_Ll.c
-endif
EXTRA_DIST += unictype/categ_Ll.h
@@ -2359,9 +1710,7 @@ EXTRA_DIST += unictype/categ_Ll.h
## begin gnulib module unictype/category-Lm
-if LIBUNISTRING_COMPILE_UNICTYPE_CATEGORY_LM
libunistring_la_SOURCES += unictype/categ_Lm.c
-endif
EXTRA_DIST += unictype/categ_Lm.h
@@ -2369,9 +1718,7 @@ EXTRA_DIST += unictype/categ_Lm.h
## begin gnulib module unictype/category-Lo
-if LIBUNISTRING_COMPILE_UNICTYPE_CATEGORY_LO
libunistring_la_SOURCES += unictype/categ_Lo.c
-endif
EXTRA_DIST += unictype/categ_Lo.h
@@ -2379,9 +1726,7 @@ EXTRA_DIST += unictype/categ_Lo.h
## begin gnulib module unictype/category-Lt
-if LIBUNISTRING_COMPILE_UNICTYPE_CATEGORY_LT
libunistring_la_SOURCES += unictype/categ_Lt.c
-endif
EXTRA_DIST += unictype/categ_Lt.h
@@ -2389,9 +1734,7 @@ EXTRA_DIST += unictype/categ_Lt.h
## begin gnulib module unictype/category-Lu
-if LIBUNISTRING_COMPILE_UNICTYPE_CATEGORY_LU
libunistring_la_SOURCES += unictype/categ_Lu.c
-endif
EXTRA_DIST += unictype/categ_Lu.h
@@ -2399,9 +1742,7 @@ EXTRA_DIST += unictype/categ_Lu.h
## begin gnulib module unictype/category-M
-if LIBUNISTRING_COMPILE_UNICTYPE_CATEGORY_M
libunistring_la_SOURCES += unictype/categ_M.c
-endif
EXTRA_DIST += unictype/categ_M.h
@@ -2409,9 +1750,7 @@ EXTRA_DIST += unictype/categ_M.h
## begin gnulib module unictype/category-Mc
-if LIBUNISTRING_COMPILE_UNICTYPE_CATEGORY_MC
libunistring_la_SOURCES += unictype/categ_Mc.c
-endif
EXTRA_DIST += unictype/categ_Mc.h
@@ -2419,9 +1758,7 @@ EXTRA_DIST += unictype/categ_Mc.h
## begin gnulib module unictype/category-Me
-if LIBUNISTRING_COMPILE_UNICTYPE_CATEGORY_ME
libunistring_la_SOURCES += unictype/categ_Me.c
-endif
EXTRA_DIST += unictype/categ_Me.h
@@ -2429,9 +1766,7 @@ EXTRA_DIST += unictype/categ_Me.h
## begin gnulib module unictype/category-Mn
-if LIBUNISTRING_COMPILE_UNICTYPE_CATEGORY_MN
libunistring_la_SOURCES += unictype/categ_Mn.c
-endif
EXTRA_DIST += unictype/categ_Mn.h
@@ -2439,9 +1774,7 @@ EXTRA_DIST += unictype/categ_Mn.h
## begin gnulib module unictype/category-N
-if LIBUNISTRING_COMPILE_UNICTYPE_CATEGORY_N
libunistring_la_SOURCES += unictype/categ_N.c
-endif
EXTRA_DIST += unictype/categ_N.h
@@ -2449,9 +1782,7 @@ EXTRA_DIST += unictype/categ_N.h
## begin gnulib module unictype/category-Nd
-if LIBUNISTRING_COMPILE_UNICTYPE_CATEGORY_ND
libunistring_la_SOURCES += unictype/categ_Nd.c
-endif
EXTRA_DIST += unictype/categ_Nd.h
@@ -2459,9 +1790,7 @@ EXTRA_DIST += unictype/categ_Nd.h
## begin gnulib module unictype/category-Nl
-if LIBUNISTRING_COMPILE_UNICTYPE_CATEGORY_NL
libunistring_la_SOURCES += unictype/categ_Nl.c
-endif
EXTRA_DIST += unictype/categ_Nl.h
@@ -2469,9 +1798,7 @@ EXTRA_DIST += unictype/categ_Nl.h
## begin gnulib module unictype/category-No
-if LIBUNISTRING_COMPILE_UNICTYPE_CATEGORY_NO
libunistring_la_SOURCES += unictype/categ_No.c
-endif
EXTRA_DIST += unictype/categ_No.h
@@ -2479,9 +1806,7 @@ EXTRA_DIST += unictype/categ_No.h
## begin gnulib module unictype/category-P
-if LIBUNISTRING_COMPILE_UNICTYPE_CATEGORY_P
libunistring_la_SOURCES += unictype/categ_P.c
-endif
EXTRA_DIST += unictype/categ_P.h
@@ -2489,9 +1814,7 @@ EXTRA_DIST += unictype/categ_P.h
## begin gnulib module unictype/category-Pc
-if LIBUNISTRING_COMPILE_UNICTYPE_CATEGORY_PC
libunistring_la_SOURCES += unictype/categ_Pc.c
-endif
EXTRA_DIST += unictype/categ_Pc.h
@@ -2499,9 +1822,7 @@ EXTRA_DIST += unictype/categ_Pc.h
## begin gnulib module unictype/category-Pd
-if LIBUNISTRING_COMPILE_UNICTYPE_CATEGORY_PD
libunistring_la_SOURCES += unictype/categ_Pd.c
-endif
EXTRA_DIST += unictype/categ_Pd.h
@@ -2509,9 +1830,7 @@ EXTRA_DIST += unictype/categ_Pd.h
## begin gnulib module unictype/category-Pe
-if LIBUNISTRING_COMPILE_UNICTYPE_CATEGORY_PE
libunistring_la_SOURCES += unictype/categ_Pe.c
-endif
EXTRA_DIST += unictype/categ_Pe.h
@@ -2519,9 +1838,7 @@ EXTRA_DIST += unictype/categ_Pe.h
## begin gnulib module unictype/category-Pf
-if LIBUNISTRING_COMPILE_UNICTYPE_CATEGORY_PF
libunistring_la_SOURCES += unictype/categ_Pf.c
-endif
EXTRA_DIST += unictype/categ_Pf.h
@@ -2529,9 +1846,7 @@ EXTRA_DIST += unictype/categ_Pf.h
## begin gnulib module unictype/category-Pi
-if LIBUNISTRING_COMPILE_UNICTYPE_CATEGORY_PI
libunistring_la_SOURCES += unictype/categ_Pi.c
-endif
EXTRA_DIST += unictype/categ_Pi.h
@@ -2539,9 +1854,7 @@ EXTRA_DIST += unictype/categ_Pi.h
## begin gnulib module unictype/category-Po
-if LIBUNISTRING_COMPILE_UNICTYPE_CATEGORY_PO
libunistring_la_SOURCES += unictype/categ_Po.c
-endif
EXTRA_DIST += unictype/categ_Po.h
@@ -2549,9 +1862,7 @@ EXTRA_DIST += unictype/categ_Po.h
## begin gnulib module unictype/category-Ps
-if LIBUNISTRING_COMPILE_UNICTYPE_CATEGORY_PS
libunistring_la_SOURCES += unictype/categ_Ps.c
-endif
EXTRA_DIST += unictype/categ_Ps.h
@@ -2559,9 +1870,7 @@ EXTRA_DIST += unictype/categ_Ps.h
## begin gnulib module unictype/category-S
-if LIBUNISTRING_COMPILE_UNICTYPE_CATEGORY_S
libunistring_la_SOURCES += unictype/categ_S.c
-endif
EXTRA_DIST += unictype/categ_S.h
@@ -2569,9 +1878,7 @@ EXTRA_DIST += unictype/categ_S.h
## begin gnulib module unictype/category-Sc
-if LIBUNISTRING_COMPILE_UNICTYPE_CATEGORY_SC
libunistring_la_SOURCES += unictype/categ_Sc.c
-endif
EXTRA_DIST += unictype/categ_Sc.h
@@ -2579,9 +1886,7 @@ EXTRA_DIST += unictype/categ_Sc.h
## begin gnulib module unictype/category-Sk
-if LIBUNISTRING_COMPILE_UNICTYPE_CATEGORY_SK
libunistring_la_SOURCES += unictype/categ_Sk.c
-endif
EXTRA_DIST += unictype/categ_Sk.h
@@ -2589,9 +1894,7 @@ EXTRA_DIST += unictype/categ_Sk.h
## begin gnulib module unictype/category-Sm
-if LIBUNISTRING_COMPILE_UNICTYPE_CATEGORY_SM
libunistring_la_SOURCES += unictype/categ_Sm.c
-endif
EXTRA_DIST += unictype/categ_Sm.h
@@ -2599,9 +1902,7 @@ EXTRA_DIST += unictype/categ_Sm.h
## begin gnulib module unictype/category-So
-if LIBUNISTRING_COMPILE_UNICTYPE_CATEGORY_SO
libunistring_la_SOURCES += unictype/categ_So.c
-endif
EXTRA_DIST += unictype/categ_So.h
@@ -2609,9 +1910,7 @@ EXTRA_DIST += unictype/categ_So.h
## begin gnulib module unictype/category-Z
-if LIBUNISTRING_COMPILE_UNICTYPE_CATEGORY_Z
libunistring_la_SOURCES += unictype/categ_Z.c
-endif
EXTRA_DIST += unictype/categ_Z.h
@@ -2619,9 +1918,7 @@ EXTRA_DIST += unictype/categ_Z.h
## begin gnulib module unictype/category-Zl
-if LIBUNISTRING_COMPILE_UNICTYPE_CATEGORY_ZL
libunistring_la_SOURCES += unictype/categ_Zl.c
-endif
EXTRA_DIST += unictype/categ_Zl.h
@@ -2629,9 +1926,7 @@ EXTRA_DIST += unictype/categ_Zl.h
## begin gnulib module unictype/category-Zp
-if LIBUNISTRING_COMPILE_UNICTYPE_CATEGORY_ZP
libunistring_la_SOURCES += unictype/categ_Zp.c
-endif
EXTRA_DIST += unictype/categ_Zp.h
@@ -2639,9 +1934,7 @@ EXTRA_DIST += unictype/categ_Zp.h
## begin gnulib module unictype/category-Zs
-if LIBUNISTRING_COMPILE_UNICTYPE_CATEGORY_ZS
libunistring_la_SOURCES += unictype/categ_Zs.c
-endif
EXTRA_DIST += unictype/categ_Zs.h
@@ -2649,67 +1942,37 @@ EXTRA_DIST += unictype/categ_Zs.h
## begin gnulib module unictype/category-and
-if LIBUNISTRING_COMPILE_UNICTYPE_CATEGORY_AND
libunistring_la_SOURCES += unictype/categ_and.c
-endif
## end gnulib module unictype/category-and
## begin gnulib module unictype/category-and-not
-if LIBUNISTRING_COMPILE_UNICTYPE_CATEGORY_AND_NOT
libunistring_la_SOURCES += unictype/categ_and_not.c
-endif
## end gnulib module unictype/category-and-not
## begin gnulib module unictype/category-byname
-if LIBUNISTRING_COMPILE_UNICTYPE_CATEGORY_BYNAME
libunistring_la_SOURCES += unictype/categ_byname.c
-endif
-
-unictype/categ_byname.h: unictype/categ_byname.gperf
- $(GPERF) -m 10 $(srcdir)/unictype/categ_byname.gperf > $(srcdir)/unictype/categ_byname.h-t
- mv $(srcdir)/unictype/categ_byname.h-t $(srcdir)/unictype/categ_byname.h
-BUILT_SOURCES += unictype/categ_byname.h
-MOSTLYCLEANFILES += unictype/categ_byname.h-t
-MAINTAINERCLEANFILES += unictype/categ_byname.h
-EXTRA_DIST += unictype/categ_byname.h
-
-EXTRA_DIST += unictype/categ_byname.gperf
## end gnulib module unictype/category-byname
-## begin gnulib module unictype/category-longname
-
-if LIBUNISTRING_COMPILE_UNICTYPE_CATEGORY_LONGNAME
-libunistring_la_SOURCES += unictype/categ_longname.c
-endif
-
-## end gnulib module unictype/category-longname
-
## begin gnulib module unictype/category-name
-if LIBUNISTRING_COMPILE_UNICTYPE_CATEGORY_NAME
libunistring_la_SOURCES += unictype/categ_name.c
-endif
## end gnulib module unictype/category-name
## begin gnulib module unictype/category-none
-if LIBUNISTRING_COMPILE_UNICTYPE_CATEGORY_NONE
libunistring_la_SOURCES += unictype/categ_none.c
-endif
## end gnulib module unictype/category-none
## begin gnulib module unictype/category-of
-if LIBUNISTRING_COMPILE_UNICTYPE_CATEGORY_OF
libunistring_la_SOURCES += unictype/categ_of.c
-endif
EXTRA_DIST += unictype/categ_of.h
@@ -2717,17 +1980,13 @@ EXTRA_DIST += unictype/categ_of.h
## begin gnulib module unictype/category-or
-if LIBUNISTRING_COMPILE_UNICTYPE_CATEGORY_OR
libunistring_la_SOURCES += unictype/categ_or.c
-endif
## end gnulib module unictype/category-or
## begin gnulib module unictype/category-test
-if LIBUNISTRING_COMPILE_UNICTYPE_CATEGORY_TEST
libunistring_la_SOURCES += unictype/categ_test.c
-endif
EXTRA_DIST += unictype/bitmap.h
@@ -2735,53 +1994,15 @@ EXTRA_DIST += unictype/bitmap.h
## begin gnulib module unictype/combining-class
-if LIBUNISTRING_COMPILE_UNICTYPE_COMBINING_CLASS
-libunistring_la_SOURCES += unictype/combiningclass.c
-endif
+libunistring_la_SOURCES += unictype/combining.c
-EXTRA_DIST += unictype/combiningclass.h
+EXTRA_DIST += unictype/combining.h
## end gnulib module unictype/combining-class
-## begin gnulib module unictype/combining-class-byname
-
-if LIBUNISTRING_COMPILE_UNICTYPE_COMBINING_CLASS_BYNAME
-libunistring_la_SOURCES += unictype/combiningclass_byname.c
-endif
-
-unictype/combiningclass_byname.h: unictype/combiningclass_byname.gperf
- $(GPERF) -m 10 $(srcdir)/unictype/combiningclass_byname.gperf > $(srcdir)/unictype/combiningclass_byname.h-t
- mv $(srcdir)/unictype/combiningclass_byname.h-t $(srcdir)/unictype/combiningclass_byname.h
-BUILT_SOURCES += unictype/combiningclass_byname.h
-MOSTLYCLEANFILES += unictype/combiningclass_byname.h-t
-MAINTAINERCLEANFILES += unictype/combiningclass_byname.h
-EXTRA_DIST += unictype/combiningclass_byname.h
-
-EXTRA_DIST += unictype/combiningclass_byname.gperf
-
-## end gnulib module unictype/combining-class-byname
-
-## begin gnulib module unictype/combining-class-longname
-
-if LIBUNISTRING_COMPILE_UNICTYPE_COMBINING_CLASS_LONGNAME
-libunistring_la_SOURCES += unictype/combiningclass_longname.c
-endif
-
-## end gnulib module unictype/combining-class-longname
-
-## begin gnulib module unictype/combining-class-name
-
-if LIBUNISTRING_COMPILE_UNICTYPE_COMBINING_CLASS_NAME
-libunistring_la_SOURCES += unictype/combiningclass_name.c
-endif
-
-## end gnulib module unictype/combining-class-name
-
## begin gnulib module unictype/ctype-alnum
-if LIBUNISTRING_COMPILE_UNICTYPE_CTYPE_ALNUM
libunistring_la_SOURCES += unictype/ctype_alnum.c
-endif
EXTRA_DIST += unictype/bitmap.h unictype/ctype_alnum.h
@@ -2789,9 +2010,7 @@ EXTRA_DIST += unictype/bitmap.h unictype/ctype_alnum.h
## begin gnulib module unictype/ctype-alpha
-if LIBUNISTRING_COMPILE_UNICTYPE_CTYPE_ALPHA
libunistring_la_SOURCES += unictype/ctype_alpha.c
-endif
EXTRA_DIST += unictype/bitmap.h unictype/ctype_alpha.h
@@ -2799,9 +2018,7 @@ EXTRA_DIST += unictype/bitmap.h unictype/ctype_alpha.h
## begin gnulib module unictype/ctype-blank
-if LIBUNISTRING_COMPILE_UNICTYPE_CTYPE_BLANK
libunistring_la_SOURCES += unictype/ctype_blank.c
-endif
EXTRA_DIST += unictype/bitmap.h unictype/ctype_blank.h
@@ -2809,9 +2026,7 @@ EXTRA_DIST += unictype/bitmap.h unictype/ctype_blank.h
## begin gnulib module unictype/ctype-cntrl
-if LIBUNISTRING_COMPILE_UNICTYPE_CTYPE_CNTRL
libunistring_la_SOURCES += unictype/ctype_cntrl.c
-endif
EXTRA_DIST += unictype/bitmap.h unictype/ctype_cntrl.h
@@ -2819,9 +2034,7 @@ EXTRA_DIST += unictype/bitmap.h unictype/ctype_cntrl.h
## begin gnulib module unictype/ctype-digit
-if LIBUNISTRING_COMPILE_UNICTYPE_CTYPE_DIGIT
libunistring_la_SOURCES += unictype/ctype_digit.c
-endif
EXTRA_DIST += unictype/bitmap.h unictype/ctype_digit.h
@@ -2829,9 +2042,7 @@ EXTRA_DIST += unictype/bitmap.h unictype/ctype_digit.h
## begin gnulib module unictype/ctype-graph
-if LIBUNISTRING_COMPILE_UNICTYPE_CTYPE_GRAPH
libunistring_la_SOURCES += unictype/ctype_graph.c
-endif
EXTRA_DIST += unictype/bitmap.h unictype/ctype_graph.h
@@ -2839,9 +2050,7 @@ EXTRA_DIST += unictype/bitmap.h unictype/ctype_graph.h
## begin gnulib module unictype/ctype-lower
-if LIBUNISTRING_COMPILE_UNICTYPE_CTYPE_LOWER
libunistring_la_SOURCES += unictype/ctype_lower.c
-endif
EXTRA_DIST += unictype/bitmap.h unictype/ctype_lower.h
@@ -2849,9 +2058,7 @@ EXTRA_DIST += unictype/bitmap.h unictype/ctype_lower.h
## begin gnulib module unictype/ctype-print
-if LIBUNISTRING_COMPILE_UNICTYPE_CTYPE_PRINT
libunistring_la_SOURCES += unictype/ctype_print.c
-endif
EXTRA_DIST += unictype/bitmap.h unictype/ctype_print.h
@@ -2859,9 +2066,7 @@ EXTRA_DIST += unictype/bitmap.h unictype/ctype_print.h
## begin gnulib module unictype/ctype-punct
-if LIBUNISTRING_COMPILE_UNICTYPE_CTYPE_PUNCT
libunistring_la_SOURCES += unictype/ctype_punct.c
-endif
EXTRA_DIST += unictype/bitmap.h unictype/ctype_punct.h
@@ -2869,9 +2074,7 @@ EXTRA_DIST += unictype/bitmap.h unictype/ctype_punct.h
## begin gnulib module unictype/ctype-space
-if LIBUNISTRING_COMPILE_UNICTYPE_CTYPE_SPACE
libunistring_la_SOURCES += unictype/ctype_space.c
-endif
EXTRA_DIST += unictype/bitmap.h unictype/ctype_space.h
@@ -2879,9 +2082,7 @@ EXTRA_DIST += unictype/bitmap.h unictype/ctype_space.h
## begin gnulib module unictype/ctype-upper
-if LIBUNISTRING_COMPILE_UNICTYPE_CTYPE_UPPER
libunistring_la_SOURCES += unictype/ctype_upper.c
-endif
EXTRA_DIST += unictype/bitmap.h unictype/ctype_upper.h
@@ -2889,9 +2090,7 @@ EXTRA_DIST += unictype/bitmap.h unictype/ctype_upper.h
## begin gnulib module unictype/ctype-xdigit
-if LIBUNISTRING_COMPILE_UNICTYPE_CTYPE_XDIGIT
libunistring_la_SOURCES += unictype/ctype_xdigit.c
-endif
EXTRA_DIST += unictype/bitmap.h unictype/ctype_xdigit.h
@@ -2899,9 +2098,7 @@ EXTRA_DIST += unictype/bitmap.h unictype/ctype_xdigit.h
## begin gnulib module unictype/decimal-digit
-if LIBUNISTRING_COMPILE_UNICTYPE_DECIMAL_DIGIT
libunistring_la_SOURCES += unictype/decdigit.c
-endif
EXTRA_DIST += unictype/decdigit.h
@@ -2909,101 +2106,15 @@ EXTRA_DIST += unictype/decdigit.h
## begin gnulib module unictype/digit
-if LIBUNISTRING_COMPILE_UNICTYPE_DIGIT
libunistring_la_SOURCES += unictype/digit.c
-endif
EXTRA_DIST += unictype/digit.h
## end gnulib module unictype/digit
-## begin gnulib module unictype/joininggroup-byname
-
-if LIBUNISTRING_COMPILE_UNICTYPE_JOININGGROUP_BYNAME
-libunistring_la_SOURCES += unictype/joininggroup_byname.c
-endif
-
-unictype/joininggroup_byname.h: unictype/joininggroup_byname.gperf
- $(GPERF) -m 10 $(srcdir)/unictype/joininggroup_byname.gperf > $(srcdir)/unictype/joininggroup_byname.h-t
- mv $(srcdir)/unictype/joininggroup_byname.h-t $(srcdir)/unictype/joininggroup_byname.h
-BUILT_SOURCES += unictype/joininggroup_byname.h
-MOSTLYCLEANFILES += unictype/joininggroup_byname.h-t
-MAINTAINERCLEANFILES += unictype/joininggroup_byname.h
-EXTRA_DIST += unictype/joininggroup_byname.h
-
-EXTRA_DIST += unictype/joininggroup_byname.gperf
-
-## end gnulib module unictype/joininggroup-byname
-
-## begin gnulib module unictype/joininggroup-name
-
-if LIBUNISTRING_COMPILE_UNICTYPE_JOININGGROUP_NAME
-libunistring_la_SOURCES += unictype/joininggroup_name.c
-endif
-
-EXTRA_DIST += unictype/joininggroup_name.h
-
-## end gnulib module unictype/joininggroup-name
-
-## begin gnulib module unictype/joininggroup-of
-
-if LIBUNISTRING_COMPILE_UNICTYPE_JOININGGROUP_OF
-libunistring_la_SOURCES += unictype/joininggroup_of.c
-endif
-
-EXTRA_DIST += unictype/joininggroup_of.h
-
-## end gnulib module unictype/joininggroup-of
-
-## begin gnulib module unictype/joiningtype-byname
-
-if LIBUNISTRING_COMPILE_UNICTYPE_JOININGTYPE_BYNAME
-libunistring_la_SOURCES += unictype/joiningtype_byname.c
-endif
-
-unictype/joiningtype_byname.h: unictype/joiningtype_byname.gperf
- $(GPERF) -m 10 $(srcdir)/unictype/joiningtype_byname.gperf > $(srcdir)/unictype/joiningtype_byname.h-t
- mv $(srcdir)/unictype/joiningtype_byname.h-t $(srcdir)/unictype/joiningtype_byname.h
-BUILT_SOURCES += unictype/joiningtype_byname.h
-MOSTLYCLEANFILES += unictype/joiningtype_byname.h-t
-MAINTAINERCLEANFILES += unictype/joiningtype_byname.h
-EXTRA_DIST += unictype/joiningtype_byname.h
-
-EXTRA_DIST += unictype/joiningtype_byname.gperf
-
-## end gnulib module unictype/joiningtype-byname
-
-## begin gnulib module unictype/joiningtype-longname
-
-if LIBUNISTRING_COMPILE_UNICTYPE_JOININGTYPE_LONGNAME
-libunistring_la_SOURCES += unictype/joiningtype_longname.c
-endif
-
-## end gnulib module unictype/joiningtype-longname
-
-## begin gnulib module unictype/joiningtype-name
-
-if LIBUNISTRING_COMPILE_UNICTYPE_JOININGTYPE_NAME
-libunistring_la_SOURCES += unictype/joiningtype_name.c
-endif
-
-## end gnulib module unictype/joiningtype-name
-
-## begin gnulib module unictype/joiningtype-of
-
-if LIBUNISTRING_COMPILE_UNICTYPE_JOININGTYPE_OF
-libunistring_la_SOURCES += unictype/joiningtype_of.c
-endif
-
-EXTRA_DIST += unictype/joiningtype_of.h
-
-## end gnulib module unictype/joiningtype-of
-
## begin gnulib module unictype/mirror
-if LIBUNISTRING_COMPILE_UNICTYPE_MIRROR
libunistring_la_SOURCES += unictype/mirror.c
-endif
EXTRA_DIST += unictype/mirror.h
@@ -3011,9 +2122,7 @@ EXTRA_DIST += unictype/mirror.h
## begin gnulib module unictype/numeric
-if LIBUNISTRING_COMPILE_UNICTYPE_NUMERIC
libunistring_la_SOURCES += unictype/numeric.c
-endif
EXTRA_DIST += unictype/numeric.h
@@ -3021,9 +2130,7 @@ EXTRA_DIST += unictype/numeric.h
## begin gnulib module unictype/property-alphabetic
-if LIBUNISTRING_COMPILE_UNICTYPE_PROPERTY_ALPHABETIC
libunistring_la_SOURCES += unictype/pr_alphabetic.c
-endif
EXTRA_DIST += unictype/bitmap.h unictype/pr_alphabetic.h
@@ -3031,9 +2138,7 @@ EXTRA_DIST += unictype/bitmap.h unictype/pr_alphabetic.h
## begin gnulib module unictype/property-ascii-hex-digit
-if LIBUNISTRING_COMPILE_UNICTYPE_PROPERTY_ASCII_HEX_DIGIT
libunistring_la_SOURCES += unictype/pr_ascii_hex_digit.c
-endif
EXTRA_DIST += unictype/bitmap.h unictype/pr_ascii_hex_digit.h
@@ -3041,9 +2146,7 @@ EXTRA_DIST += unictype/bitmap.h unictype/pr_ascii_hex_digit.h
## begin gnulib module unictype/property-bidi-arabic-digit
-if LIBUNISTRING_COMPILE_UNICTYPE_PROPERTY_BIDI_ARABIC_DIGIT
libunistring_la_SOURCES += unictype/pr_bidi_arabic_digit.c
-endif
EXTRA_DIST += unictype/bitmap.h unictype/pr_bidi_arabic_digit.h
@@ -3051,9 +2154,7 @@ EXTRA_DIST += unictype/bitmap.h unictype/pr_bidi_arabic_digit.h
## begin gnulib module unictype/property-bidi-arabic-right-to-left
-if LIBUNISTRING_COMPILE_UNICTYPE_PROPERTY_BIDI_ARABIC_RIGHT_TO_LEFT
libunistring_la_SOURCES += unictype/pr_bidi_arabic_right_to_left.c
-endif
EXTRA_DIST += unictype/bitmap.h unictype/pr_bidi_arabic_right_to_left.h
@@ -3061,9 +2162,7 @@ EXTRA_DIST += unictype/bitmap.h unictype/pr_bidi_arabic_right_to_left.h
## begin gnulib module unictype/property-bidi-block-separator
-if LIBUNISTRING_COMPILE_UNICTYPE_PROPERTY_BIDI_BLOCK_SEPARATOR
libunistring_la_SOURCES += unictype/pr_bidi_block_separator.c
-endif
EXTRA_DIST += unictype/bitmap.h unictype/pr_bidi_block_separator.h
@@ -3071,9 +2170,7 @@ EXTRA_DIST += unictype/bitmap.h unictype/pr_bidi_block_separator.h
## begin gnulib module unictype/property-bidi-boundary-neutral
-if LIBUNISTRING_COMPILE_UNICTYPE_PROPERTY_BIDI_BOUNDARY_NEUTRAL
libunistring_la_SOURCES += unictype/pr_bidi_boundary_neutral.c
-endif
EXTRA_DIST += unictype/bitmap.h unictype/pr_bidi_boundary_neutral.h
@@ -3081,9 +2178,7 @@ EXTRA_DIST += unictype/bitmap.h unictype/pr_bidi_boundary_neutral.h
## begin gnulib module unictype/property-bidi-common-separator
-if LIBUNISTRING_COMPILE_UNICTYPE_PROPERTY_BIDI_COMMON_SEPARATOR
libunistring_la_SOURCES += unictype/pr_bidi_common_separator.c
-endif
EXTRA_DIST += unictype/bitmap.h unictype/pr_bidi_common_separator.h
@@ -3091,9 +2186,7 @@ EXTRA_DIST += unictype/bitmap.h unictype/pr_bidi_common_separator.h
## begin gnulib module unictype/property-bidi-control
-if LIBUNISTRING_COMPILE_UNICTYPE_PROPERTY_BIDI_CONTROL
libunistring_la_SOURCES += unictype/pr_bidi_control.c
-endif
EXTRA_DIST += unictype/bitmap.h unictype/pr_bidi_control.h
@@ -3101,9 +2194,7 @@ EXTRA_DIST += unictype/bitmap.h unictype/pr_bidi_control.h
## begin gnulib module unictype/property-bidi-embedding-or-override
-if LIBUNISTRING_COMPILE_UNICTYPE_PROPERTY_BIDI_EMBEDDING_OR_OVERRIDE
libunistring_la_SOURCES += unictype/pr_bidi_embedding_or_override.c
-endif
EXTRA_DIST += unictype/bitmap.h unictype/pr_bidi_embedding_or_override.h
@@ -3111,9 +2202,7 @@ EXTRA_DIST += unictype/bitmap.h unictype/pr_bidi_embedding_or_override.h
## begin gnulib module unictype/property-bidi-eur-num-separator
-if LIBUNISTRING_COMPILE_UNICTYPE_PROPERTY_BIDI_EUR_NUM_SEPARATOR
libunistring_la_SOURCES += unictype/pr_bidi_eur_num_separator.c
-endif
EXTRA_DIST += unictype/bitmap.h unictype/pr_bidi_eur_num_separator.h
@@ -3121,9 +2210,7 @@ EXTRA_DIST += unictype/bitmap.h unictype/pr_bidi_eur_num_separator.h
## begin gnulib module unictype/property-bidi-eur-num-terminator
-if LIBUNISTRING_COMPILE_UNICTYPE_PROPERTY_BIDI_EUR_NUM_TERMINATOR
libunistring_la_SOURCES += unictype/pr_bidi_eur_num_terminator.c
-endif
EXTRA_DIST += unictype/bitmap.h unictype/pr_bidi_eur_num_terminator.h
@@ -3131,9 +2218,7 @@ EXTRA_DIST += unictype/bitmap.h unictype/pr_bidi_eur_num_terminator.h
## begin gnulib module unictype/property-bidi-european-digit
-if LIBUNISTRING_COMPILE_UNICTYPE_PROPERTY_BIDI_EUROPEAN_DIGIT
libunistring_la_SOURCES += unictype/pr_bidi_european_digit.c
-endif
EXTRA_DIST += unictype/bitmap.h unictype/pr_bidi_european_digit.h
@@ -3141,9 +2226,7 @@ EXTRA_DIST += unictype/bitmap.h unictype/pr_bidi_european_digit.h
## begin gnulib module unictype/property-bidi-hebrew-right-to-left
-if LIBUNISTRING_COMPILE_UNICTYPE_PROPERTY_BIDI_HEBREW_RIGHT_TO_LEFT
libunistring_la_SOURCES += unictype/pr_bidi_hebrew_right_to_left.c
-endif
EXTRA_DIST += unictype/bitmap.h unictype/pr_bidi_hebrew_right_to_left.h
@@ -3151,9 +2234,7 @@ EXTRA_DIST += unictype/bitmap.h unictype/pr_bidi_hebrew_right_to_left.h
## begin gnulib module unictype/property-bidi-left-to-right
-if LIBUNISTRING_COMPILE_UNICTYPE_PROPERTY_BIDI_LEFT_TO_RIGHT
libunistring_la_SOURCES += unictype/pr_bidi_left_to_right.c
-endif
EXTRA_DIST += unictype/bitmap.h unictype/pr_bidi_left_to_right.h
@@ -3161,9 +2242,7 @@ EXTRA_DIST += unictype/bitmap.h unictype/pr_bidi_left_to_right.h
## begin gnulib module unictype/property-bidi-non-spacing-mark
-if LIBUNISTRING_COMPILE_UNICTYPE_PROPERTY_BIDI_NON_SPACING_MARK
libunistring_la_SOURCES += unictype/pr_bidi_non_spacing_mark.c
-endif
EXTRA_DIST += unictype/bitmap.h unictype/pr_bidi_non_spacing_mark.h
@@ -3171,9 +2250,7 @@ EXTRA_DIST += unictype/bitmap.h unictype/pr_bidi_non_spacing_mark.h
## begin gnulib module unictype/property-bidi-other-neutral
-if LIBUNISTRING_COMPILE_UNICTYPE_PROPERTY_BIDI_OTHER_NEUTRAL
libunistring_la_SOURCES += unictype/pr_bidi_other_neutral.c
-endif
EXTRA_DIST += unictype/bitmap.h unictype/pr_bidi_other_neutral.h
@@ -3181,9 +2258,7 @@ EXTRA_DIST += unictype/bitmap.h unictype/pr_bidi_other_neutral.h
## begin gnulib module unictype/property-bidi-pdf
-if LIBUNISTRING_COMPILE_UNICTYPE_PROPERTY_BIDI_PDF
libunistring_la_SOURCES += unictype/pr_bidi_pdf.c
-endif
EXTRA_DIST += unictype/bitmap.h unictype/pr_bidi_pdf.h
@@ -3191,9 +2266,7 @@ EXTRA_DIST += unictype/bitmap.h unictype/pr_bidi_pdf.h
## begin gnulib module unictype/property-bidi-segment-separator
-if LIBUNISTRING_COMPILE_UNICTYPE_PROPERTY_BIDI_SEGMENT_SEPARATOR
libunistring_la_SOURCES += unictype/pr_bidi_segment_separator.c
-endif
EXTRA_DIST += unictype/bitmap.h unictype/pr_bidi_segment_separator.h
@@ -3201,9 +2274,7 @@ EXTRA_DIST += unictype/bitmap.h unictype/pr_bidi_segment_separator.h
## begin gnulib module unictype/property-bidi-whitespace
-if LIBUNISTRING_COMPILE_UNICTYPE_PROPERTY_BIDI_WHITESPACE
libunistring_la_SOURCES += unictype/pr_bidi_whitespace.c
-endif
EXTRA_DIST += unictype/bitmap.h unictype/pr_bidi_whitespace.h
@@ -3211,9 +2282,7 @@ EXTRA_DIST += unictype/bitmap.h unictype/pr_bidi_whitespace.h
## begin gnulib module unictype/property-byname
-if LIBUNISTRING_COMPILE_UNICTYPE_PROPERTY_BYNAME
libunistring_la_SOURCES += unictype/pr_byname.c
-endif
unictype/pr_byname.h: unictype/pr_byname.gperf
$(GPERF) -m 10 $(srcdir)/unictype/pr_byname.gperf > $(srcdir)/unictype/pr_byname.h-t
@@ -3227,81 +2296,9 @@ EXTRA_DIST += unictype/pr_byname.gperf
## end gnulib module unictype/property-byname
-## begin gnulib module unictype/property-case-ignorable
-
-if LIBUNISTRING_COMPILE_UNICTYPE_PROPERTY_CASE_IGNORABLE
-libunistring_la_SOURCES += unictype/pr_case_ignorable.c
-endif
-
-EXTRA_DIST += unictype/bitmap.h unictype/pr_case_ignorable.h
-
-## end gnulib module unictype/property-case-ignorable
-
-## begin gnulib module unictype/property-cased
-
-if LIBUNISTRING_COMPILE_UNICTYPE_PROPERTY_CASED
-libunistring_la_SOURCES += unictype/pr_cased.c
-endif
-
-EXTRA_DIST += unictype/bitmap.h unictype/pr_cased.h
-
-## end gnulib module unictype/property-cased
-
-## begin gnulib module unictype/property-changes-when-casefolded
-
-if LIBUNISTRING_COMPILE_UNICTYPE_PROPERTY_CHANGES_WHEN_CASEFOLDED
-libunistring_la_SOURCES += unictype/pr_changes_when_casefolded.c
-endif
-
-EXTRA_DIST += unictype/bitmap.h unictype/pr_changes_when_casefolded.h
-
-## end gnulib module unictype/property-changes-when-casefolded
-
-## begin gnulib module unictype/property-changes-when-casemapped
-
-if LIBUNISTRING_COMPILE_UNICTYPE_PROPERTY_CHANGES_WHEN_CASEMAPPED
-libunistring_la_SOURCES += unictype/pr_changes_when_casemapped.c
-endif
-
-EXTRA_DIST += unictype/bitmap.h unictype/pr_changes_when_casemapped.h
-
-## end gnulib module unictype/property-changes-when-casemapped
-
-## begin gnulib module unictype/property-changes-when-lowercased
-
-if LIBUNISTRING_COMPILE_UNICTYPE_PROPERTY_CHANGES_WHEN_LOWERCASED
-libunistring_la_SOURCES += unictype/pr_changes_when_lowercased.c
-endif
-
-EXTRA_DIST += unictype/bitmap.h unictype/pr_changes_when_lowercased.h
-
-## end gnulib module unictype/property-changes-when-lowercased
-
-## begin gnulib module unictype/property-changes-when-titlecased
-
-if LIBUNISTRING_COMPILE_UNICTYPE_PROPERTY_CHANGES_WHEN_TITLECASED
-libunistring_la_SOURCES += unictype/pr_changes_when_titlecased.c
-endif
-
-EXTRA_DIST += unictype/bitmap.h unictype/pr_changes_when_titlecased.h
-
-## end gnulib module unictype/property-changes-when-titlecased
-
-## begin gnulib module unictype/property-changes-when-uppercased
-
-if LIBUNISTRING_COMPILE_UNICTYPE_PROPERTY_CHANGES_WHEN_UPPERCASED
-libunistring_la_SOURCES += unictype/pr_changes_when_uppercased.c
-endif
-
-EXTRA_DIST += unictype/bitmap.h unictype/pr_changes_when_uppercased.h
-
-## end gnulib module unictype/property-changes-when-uppercased
-
## begin gnulib module unictype/property-combining
-if LIBUNISTRING_COMPILE_UNICTYPE_PROPERTY_COMBINING
libunistring_la_SOURCES += unictype/pr_combining.c
-endif
EXTRA_DIST += unictype/bitmap.h unictype/pr_combining.h
@@ -3309,9 +2306,7 @@ EXTRA_DIST += unictype/bitmap.h unictype/pr_combining.h
## begin gnulib module unictype/property-composite
-if LIBUNISTRING_COMPILE_UNICTYPE_PROPERTY_COMPOSITE
libunistring_la_SOURCES += unictype/pr_composite.c
-endif
EXTRA_DIST += unictype/bitmap.h unictype/pr_composite.h
@@ -3319,9 +2314,7 @@ EXTRA_DIST += unictype/bitmap.h unictype/pr_composite.h
## begin gnulib module unictype/property-currency-symbol
-if LIBUNISTRING_COMPILE_UNICTYPE_PROPERTY_CURRENCY_SYMBOL
libunistring_la_SOURCES += unictype/pr_currency_symbol.c
-endif
EXTRA_DIST += unictype/bitmap.h unictype/pr_currency_symbol.h
@@ -3329,9 +2322,7 @@ EXTRA_DIST += unictype/bitmap.h unictype/pr_currency_symbol.h
## begin gnulib module unictype/property-dash
-if LIBUNISTRING_COMPILE_UNICTYPE_PROPERTY_DASH
libunistring_la_SOURCES += unictype/pr_dash.c
-endif
EXTRA_DIST += unictype/bitmap.h unictype/pr_dash.h
@@ -3339,9 +2330,7 @@ EXTRA_DIST += unictype/bitmap.h unictype/pr_dash.h
## begin gnulib module unictype/property-decimal-digit
-if LIBUNISTRING_COMPILE_UNICTYPE_PROPERTY_DECIMAL_DIGIT
libunistring_la_SOURCES += unictype/pr_decimal_digit.c
-endif
EXTRA_DIST += unictype/bitmap.h unictype/pr_decimal_digit.h
@@ -3349,9 +2338,7 @@ EXTRA_DIST += unictype/bitmap.h unictype/pr_decimal_digit.h
## begin gnulib module unictype/property-default-ignorable-code-point
-if LIBUNISTRING_COMPILE_UNICTYPE_PROPERTY_DEFAULT_IGNORABLE_CODE_POINT
libunistring_la_SOURCES += unictype/pr_default_ignorable_code_point.c
-endif
EXTRA_DIST += unictype/bitmap.h unictype/pr_default_ignorable_code_point.h
@@ -3359,9 +2346,7 @@ EXTRA_DIST += unictype/bitmap.h unictype/pr_default_ignorable_code_point.h
## begin gnulib module unictype/property-deprecated
-if LIBUNISTRING_COMPILE_UNICTYPE_PROPERTY_DEPRECATED
libunistring_la_SOURCES += unictype/pr_deprecated.c
-endif
EXTRA_DIST += unictype/bitmap.h unictype/pr_deprecated.h
@@ -3369,9 +2354,7 @@ EXTRA_DIST += unictype/bitmap.h unictype/pr_deprecated.h
## begin gnulib module unictype/property-diacritic
-if LIBUNISTRING_COMPILE_UNICTYPE_PROPERTY_DIACRITIC
libunistring_la_SOURCES += unictype/pr_diacritic.c
-endif
EXTRA_DIST += unictype/bitmap.h unictype/pr_diacritic.h
@@ -3379,9 +2362,7 @@ EXTRA_DIST += unictype/bitmap.h unictype/pr_diacritic.h
## begin gnulib module unictype/property-extender
-if LIBUNISTRING_COMPILE_UNICTYPE_PROPERTY_EXTENDER
libunistring_la_SOURCES += unictype/pr_extender.c
-endif
EXTRA_DIST += unictype/bitmap.h unictype/pr_extender.h
@@ -3389,9 +2370,7 @@ EXTRA_DIST += unictype/bitmap.h unictype/pr_extender.h
## begin gnulib module unictype/property-format-control
-if LIBUNISTRING_COMPILE_UNICTYPE_PROPERTY_FORMAT_CONTROL
libunistring_la_SOURCES += unictype/pr_format_control.c
-endif
EXTRA_DIST += unictype/bitmap.h unictype/pr_format_control.h
@@ -3399,9 +2378,7 @@ EXTRA_DIST += unictype/bitmap.h unictype/pr_format_control.h
## begin gnulib module unictype/property-grapheme-base
-if LIBUNISTRING_COMPILE_UNICTYPE_PROPERTY_GRAPHEME_BASE
libunistring_la_SOURCES += unictype/pr_grapheme_base.c
-endif
EXTRA_DIST += unictype/bitmap.h unictype/pr_grapheme_base.h
@@ -3409,9 +2386,7 @@ EXTRA_DIST += unictype/bitmap.h unictype/pr_grapheme_base.h
## begin gnulib module unictype/property-grapheme-extend
-if LIBUNISTRING_COMPILE_UNICTYPE_PROPERTY_GRAPHEME_EXTEND
libunistring_la_SOURCES += unictype/pr_grapheme_extend.c
-endif
EXTRA_DIST += unictype/bitmap.h unictype/pr_grapheme_extend.h
@@ -3419,9 +2394,7 @@ EXTRA_DIST += unictype/bitmap.h unictype/pr_grapheme_extend.h
## begin gnulib module unictype/property-grapheme-link
-if LIBUNISTRING_COMPILE_UNICTYPE_PROPERTY_GRAPHEME_LINK
libunistring_la_SOURCES += unictype/pr_grapheme_link.c
-endif
EXTRA_DIST += unictype/bitmap.h unictype/pr_grapheme_link.h
@@ -3429,9 +2402,7 @@ EXTRA_DIST += unictype/bitmap.h unictype/pr_grapheme_link.h
## begin gnulib module unictype/property-hex-digit
-if LIBUNISTRING_COMPILE_UNICTYPE_PROPERTY_HEX_DIGIT
libunistring_la_SOURCES += unictype/pr_hex_digit.c
-endif
EXTRA_DIST += unictype/bitmap.h unictype/pr_hex_digit.h
@@ -3439,9 +2410,7 @@ EXTRA_DIST += unictype/bitmap.h unictype/pr_hex_digit.h
## begin gnulib module unictype/property-hyphen
-if LIBUNISTRING_COMPILE_UNICTYPE_PROPERTY_HYPHEN
libunistring_la_SOURCES += unictype/pr_hyphen.c
-endif
EXTRA_DIST += unictype/bitmap.h unictype/pr_hyphen.h
@@ -3449,9 +2418,7 @@ EXTRA_DIST += unictype/bitmap.h unictype/pr_hyphen.h
## begin gnulib module unictype/property-id-continue
-if LIBUNISTRING_COMPILE_UNICTYPE_PROPERTY_ID_CONTINUE
libunistring_la_SOURCES += unictype/pr_id_continue.c
-endif
EXTRA_DIST += unictype/bitmap.h unictype/pr_id_continue.h
@@ -3459,9 +2426,7 @@ EXTRA_DIST += unictype/bitmap.h unictype/pr_id_continue.h
## begin gnulib module unictype/property-id-start
-if LIBUNISTRING_COMPILE_UNICTYPE_PROPERTY_ID_START
libunistring_la_SOURCES += unictype/pr_id_start.c
-endif
EXTRA_DIST += unictype/bitmap.h unictype/pr_id_start.h
@@ -3469,9 +2434,7 @@ EXTRA_DIST += unictype/bitmap.h unictype/pr_id_start.h
## begin gnulib module unictype/property-ideographic
-if LIBUNISTRING_COMPILE_UNICTYPE_PROPERTY_IDEOGRAPHIC
libunistring_la_SOURCES += unictype/pr_ideographic.c
-endif
EXTRA_DIST += unictype/bitmap.h unictype/pr_ideographic.h
@@ -3479,9 +2442,7 @@ EXTRA_DIST += unictype/bitmap.h unictype/pr_ideographic.h
## begin gnulib module unictype/property-ids-binary-operator
-if LIBUNISTRING_COMPILE_UNICTYPE_PROPERTY_IDS_BINARY_OPERATOR
libunistring_la_SOURCES += unictype/pr_ids_binary_operator.c
-endif
EXTRA_DIST += unictype/bitmap.h unictype/pr_ids_binary_operator.h
@@ -3489,9 +2450,7 @@ EXTRA_DIST += unictype/bitmap.h unictype/pr_ids_binary_operator.h
## begin gnulib module unictype/property-ids-trinary-operator
-if LIBUNISTRING_COMPILE_UNICTYPE_PROPERTY_IDS_TRINARY_OPERATOR
libunistring_la_SOURCES += unictype/pr_ids_trinary_operator.c
-endif
EXTRA_DIST += unictype/bitmap.h unictype/pr_ids_trinary_operator.h
@@ -3499,9 +2458,7 @@ EXTRA_DIST += unictype/bitmap.h unictype/pr_ids_trinary_operator.h
## begin gnulib module unictype/property-ignorable-control
-if LIBUNISTRING_COMPILE_UNICTYPE_PROPERTY_IGNORABLE_CONTROL
libunistring_la_SOURCES += unictype/pr_ignorable_control.c
-endif
EXTRA_DIST += unictype/bitmap.h unictype/pr_ignorable_control.h
@@ -3509,9 +2466,7 @@ EXTRA_DIST += unictype/bitmap.h unictype/pr_ignorable_control.h
## begin gnulib module unictype/property-iso-control
-if LIBUNISTRING_COMPILE_UNICTYPE_PROPERTY_ISO_CONTROL
libunistring_la_SOURCES += unictype/pr_iso_control.c
-endif
EXTRA_DIST += unictype/bitmap.h unictype/pr_iso_control.h
@@ -3519,9 +2474,7 @@ EXTRA_DIST += unictype/bitmap.h unictype/pr_iso_control.h
## begin gnulib module unictype/property-join-control
-if LIBUNISTRING_COMPILE_UNICTYPE_PROPERTY_JOIN_CONTROL
libunistring_la_SOURCES += unictype/pr_join_control.c
-endif
EXTRA_DIST += unictype/bitmap.h unictype/pr_join_control.h
@@ -3529,9 +2482,7 @@ EXTRA_DIST += unictype/bitmap.h unictype/pr_join_control.h
## begin gnulib module unictype/property-left-of-pair
-if LIBUNISTRING_COMPILE_UNICTYPE_PROPERTY_LEFT_OF_PAIR
libunistring_la_SOURCES += unictype/pr_left_of_pair.c
-endif
EXTRA_DIST += unictype/bitmap.h unictype/pr_left_of_pair.h
@@ -3539,9 +2490,7 @@ EXTRA_DIST += unictype/bitmap.h unictype/pr_left_of_pair.h
## begin gnulib module unictype/property-line-separator
-if LIBUNISTRING_COMPILE_UNICTYPE_PROPERTY_LINE_SEPARATOR
libunistring_la_SOURCES += unictype/pr_line_separator.c
-endif
EXTRA_DIST += unictype/bitmap.h unictype/pr_line_separator.h
@@ -3549,9 +2498,7 @@ EXTRA_DIST += unictype/bitmap.h unictype/pr_line_separator.h
## begin gnulib module unictype/property-logical-order-exception
-if LIBUNISTRING_COMPILE_UNICTYPE_PROPERTY_LOGICAL_ORDER_EXCEPTION
libunistring_la_SOURCES += unictype/pr_logical_order_exception.c
-endif
EXTRA_DIST += unictype/bitmap.h unictype/pr_logical_order_exception.h
@@ -3559,9 +2506,7 @@ EXTRA_DIST += unictype/bitmap.h unictype/pr_logical_order_exception.h
## begin gnulib module unictype/property-lowercase
-if LIBUNISTRING_COMPILE_UNICTYPE_PROPERTY_LOWERCASE
libunistring_la_SOURCES += unictype/pr_lowercase.c
-endif
EXTRA_DIST += unictype/bitmap.h unictype/pr_lowercase.h
@@ -3569,9 +2514,7 @@ EXTRA_DIST += unictype/bitmap.h unictype/pr_lowercase.h
## begin gnulib module unictype/property-math
-if LIBUNISTRING_COMPILE_UNICTYPE_PROPERTY_MATH
libunistring_la_SOURCES += unictype/pr_math.c
-endif
EXTRA_DIST += unictype/bitmap.h unictype/pr_math.h
@@ -3579,9 +2522,7 @@ EXTRA_DIST += unictype/bitmap.h unictype/pr_math.h
## begin gnulib module unictype/property-non-break
-if LIBUNISTRING_COMPILE_UNICTYPE_PROPERTY_NON_BREAK
libunistring_la_SOURCES += unictype/pr_non_break.c
-endif
EXTRA_DIST += unictype/bitmap.h unictype/pr_non_break.h
@@ -3589,9 +2530,7 @@ EXTRA_DIST += unictype/bitmap.h unictype/pr_non_break.h
## begin gnulib module unictype/property-not-a-character
-if LIBUNISTRING_COMPILE_UNICTYPE_PROPERTY_NOT_A_CHARACTER
libunistring_la_SOURCES += unictype/pr_not_a_character.c
-endif
EXTRA_DIST += unictype/bitmap.h unictype/pr_not_a_character.h
@@ -3599,9 +2538,7 @@ EXTRA_DIST += unictype/bitmap.h unictype/pr_not_a_character.h
## begin gnulib module unictype/property-numeric
-if LIBUNISTRING_COMPILE_UNICTYPE_PROPERTY_NUMERIC
libunistring_la_SOURCES += unictype/pr_numeric.c
-endif
EXTRA_DIST += unictype/bitmap.h unictype/pr_numeric.h
@@ -3609,9 +2546,7 @@ EXTRA_DIST += unictype/bitmap.h unictype/pr_numeric.h
## begin gnulib module unictype/property-other-alphabetic
-if LIBUNISTRING_COMPILE_UNICTYPE_PROPERTY_OTHER_ALPHABETIC
libunistring_la_SOURCES += unictype/pr_other_alphabetic.c
-endif
EXTRA_DIST += unictype/bitmap.h unictype/pr_other_alphabetic.h
@@ -3619,9 +2554,7 @@ EXTRA_DIST += unictype/bitmap.h unictype/pr_other_alphabetic.h
## begin gnulib module unictype/property-other-default-ignorable-code-point
-if LIBUNISTRING_COMPILE_UNICTYPE_PROPERTY_OTHER_DEFAULT_IGNORABLE_CODE_POINT
libunistring_la_SOURCES += unictype/pr_other_default_ignorable_code_point.c
-endif
EXTRA_DIST += unictype/bitmap.h unictype/pr_other_default_ignorable_code_point.h
@@ -3629,9 +2562,7 @@ EXTRA_DIST += unictype/bitmap.h unictype/pr_other_default_ignorable_code_point.h
## begin gnulib module unictype/property-other-grapheme-extend
-if LIBUNISTRING_COMPILE_UNICTYPE_PROPERTY_OTHER_GRAPHEME_EXTEND
libunistring_la_SOURCES += unictype/pr_other_grapheme_extend.c
-endif
EXTRA_DIST += unictype/bitmap.h unictype/pr_other_grapheme_extend.h
@@ -3639,9 +2570,7 @@ EXTRA_DIST += unictype/bitmap.h unictype/pr_other_grapheme_extend.h
## begin gnulib module unictype/property-other-id-continue
-if LIBUNISTRING_COMPILE_UNICTYPE_PROPERTY_OTHER_ID_CONTINUE
libunistring_la_SOURCES += unictype/pr_other_id_continue.c
-endif
EXTRA_DIST += unictype/bitmap.h unictype/pr_other_id_continue.h
@@ -3649,9 +2578,7 @@ EXTRA_DIST += unictype/bitmap.h unictype/pr_other_id_continue.h
## begin gnulib module unictype/property-other-id-start
-if LIBUNISTRING_COMPILE_UNICTYPE_PROPERTY_OTHER_ID_START
libunistring_la_SOURCES += unictype/pr_other_id_start.c
-endif
EXTRA_DIST += unictype/bitmap.h unictype/pr_other_id_start.h
@@ -3659,9 +2586,7 @@ EXTRA_DIST += unictype/bitmap.h unictype/pr_other_id_start.h
## begin gnulib module unictype/property-other-lowercase
-if LIBUNISTRING_COMPILE_UNICTYPE_PROPERTY_OTHER_LOWERCASE
libunistring_la_SOURCES += unictype/pr_other_lowercase.c
-endif
EXTRA_DIST += unictype/bitmap.h unictype/pr_other_lowercase.h
@@ -3669,9 +2594,7 @@ EXTRA_DIST += unictype/bitmap.h unictype/pr_other_lowercase.h
## begin gnulib module unictype/property-other-math
-if LIBUNISTRING_COMPILE_UNICTYPE_PROPERTY_OTHER_MATH
libunistring_la_SOURCES += unictype/pr_other_math.c
-endif
EXTRA_DIST += unictype/bitmap.h unictype/pr_other_math.h
@@ -3679,9 +2602,7 @@ EXTRA_DIST += unictype/bitmap.h unictype/pr_other_math.h
## begin gnulib module unictype/property-other-uppercase
-if LIBUNISTRING_COMPILE_UNICTYPE_PROPERTY_OTHER_UPPERCASE
libunistring_la_SOURCES += unictype/pr_other_uppercase.c
-endif
EXTRA_DIST += unictype/bitmap.h unictype/pr_other_uppercase.h
@@ -3689,9 +2610,7 @@ EXTRA_DIST += unictype/bitmap.h unictype/pr_other_uppercase.h
## begin gnulib module unictype/property-paired-punctuation
-if LIBUNISTRING_COMPILE_UNICTYPE_PROPERTY_PAIRED_PUNCTUATION
libunistring_la_SOURCES += unictype/pr_paired_punctuation.c
-endif
EXTRA_DIST += unictype/bitmap.h unictype/pr_paired_punctuation.h
@@ -3699,9 +2618,7 @@ EXTRA_DIST += unictype/bitmap.h unictype/pr_paired_punctuation.h
## begin gnulib module unictype/property-paragraph-separator
-if LIBUNISTRING_COMPILE_UNICTYPE_PROPERTY_PARAGRAPH_SEPARATOR
libunistring_la_SOURCES += unictype/pr_paragraph_separator.c
-endif
EXTRA_DIST += unictype/bitmap.h unictype/pr_paragraph_separator.h
@@ -3709,9 +2626,7 @@ EXTRA_DIST += unictype/bitmap.h unictype/pr_paragraph_separator.h
## begin gnulib module unictype/property-pattern-syntax
-if LIBUNISTRING_COMPILE_UNICTYPE_PROPERTY_PATTERN_SYNTAX
libunistring_la_SOURCES += unictype/pr_pattern_syntax.c
-endif
EXTRA_DIST += unictype/bitmap.h unictype/pr_pattern_syntax.h
@@ -3719,9 +2634,7 @@ EXTRA_DIST += unictype/bitmap.h unictype/pr_pattern_syntax.h
## begin gnulib module unictype/property-pattern-white-space
-if LIBUNISTRING_COMPILE_UNICTYPE_PROPERTY_PATTERN_WHITE_SPACE
libunistring_la_SOURCES += unictype/pr_pattern_white_space.c
-endif
EXTRA_DIST += unictype/bitmap.h unictype/pr_pattern_white_space.h
@@ -3729,9 +2642,7 @@ EXTRA_DIST += unictype/bitmap.h unictype/pr_pattern_white_space.h
## begin gnulib module unictype/property-private-use
-if LIBUNISTRING_COMPILE_UNICTYPE_PROPERTY_PRIVATE_USE
libunistring_la_SOURCES += unictype/pr_private_use.c
-endif
EXTRA_DIST += unictype/bitmap.h unictype/pr_private_use.h
@@ -3739,9 +2650,7 @@ EXTRA_DIST += unictype/bitmap.h unictype/pr_private_use.h
## begin gnulib module unictype/property-punctuation
-if LIBUNISTRING_COMPILE_UNICTYPE_PROPERTY_PUNCTUATION
libunistring_la_SOURCES += unictype/pr_punctuation.c
-endif
EXTRA_DIST += unictype/bitmap.h unictype/pr_punctuation.h
@@ -3749,9 +2658,7 @@ EXTRA_DIST += unictype/bitmap.h unictype/pr_punctuation.h
## begin gnulib module unictype/property-quotation-mark
-if LIBUNISTRING_COMPILE_UNICTYPE_PROPERTY_QUOTATION_MARK
libunistring_la_SOURCES += unictype/pr_quotation_mark.c
-endif
EXTRA_DIST += unictype/bitmap.h unictype/pr_quotation_mark.h
@@ -3759,9 +2666,7 @@ EXTRA_DIST += unictype/bitmap.h unictype/pr_quotation_mark.h
## begin gnulib module unictype/property-radical
-if LIBUNISTRING_COMPILE_UNICTYPE_PROPERTY_RADICAL
libunistring_la_SOURCES += unictype/pr_radical.c
-endif
EXTRA_DIST += unictype/bitmap.h unictype/pr_radical.h
@@ -3769,9 +2674,7 @@ EXTRA_DIST += unictype/bitmap.h unictype/pr_radical.h
## begin gnulib module unictype/property-sentence-terminal
-if LIBUNISTRING_COMPILE_UNICTYPE_PROPERTY_SENTENCE_TERMINAL
libunistring_la_SOURCES += unictype/pr_sentence_terminal.c
-endif
EXTRA_DIST += unictype/bitmap.h unictype/pr_sentence_terminal.h
@@ -3779,9 +2682,7 @@ EXTRA_DIST += unictype/bitmap.h unictype/pr_sentence_terminal.h
## begin gnulib module unictype/property-soft-dotted
-if LIBUNISTRING_COMPILE_UNICTYPE_PROPERTY_SOFT_DOTTED
libunistring_la_SOURCES += unictype/pr_soft_dotted.c
-endif
EXTRA_DIST += unictype/bitmap.h unictype/pr_soft_dotted.h
@@ -3789,9 +2690,7 @@ EXTRA_DIST += unictype/bitmap.h unictype/pr_soft_dotted.h
## begin gnulib module unictype/property-space
-if LIBUNISTRING_COMPILE_UNICTYPE_PROPERTY_SPACE
libunistring_la_SOURCES += unictype/pr_space.c
-endif
EXTRA_DIST += unictype/bitmap.h unictype/pr_space.h
@@ -3799,9 +2698,7 @@ EXTRA_DIST += unictype/bitmap.h unictype/pr_space.h
## begin gnulib module unictype/property-terminal-punctuation
-if LIBUNISTRING_COMPILE_UNICTYPE_PROPERTY_TERMINAL_PUNCTUATION
libunistring_la_SOURCES += unictype/pr_terminal_punctuation.c
-endif
EXTRA_DIST += unictype/bitmap.h unictype/pr_terminal_punctuation.h
@@ -3809,17 +2706,13 @@ EXTRA_DIST += unictype/bitmap.h unictype/pr_terminal_punctuation.h
## begin gnulib module unictype/property-test
-if LIBUNISTRING_COMPILE_UNICTYPE_PROPERTY_TEST
libunistring_la_SOURCES += unictype/pr_test.c
-endif
## end gnulib module unictype/property-test
## begin gnulib module unictype/property-titlecase
-if LIBUNISTRING_COMPILE_UNICTYPE_PROPERTY_TITLECASE
libunistring_la_SOURCES += unictype/pr_titlecase.c
-endif
EXTRA_DIST += unictype/bitmap.h unictype/pr_titlecase.h
@@ -3827,9 +2720,7 @@ EXTRA_DIST += unictype/bitmap.h unictype/pr_titlecase.h
## begin gnulib module unictype/property-unassigned-code-value
-if LIBUNISTRING_COMPILE_UNICTYPE_PROPERTY_UNASSIGNED_CODE_VALUE
libunistring_la_SOURCES += unictype/pr_unassigned_code_value.c
-endif
EXTRA_DIST += unictype/bitmap.h unictype/pr_unassigned_code_value.h
@@ -3837,9 +2728,7 @@ EXTRA_DIST += unictype/bitmap.h unictype/pr_unassigned_code_value.h
## begin gnulib module unictype/property-unified-ideograph
-if LIBUNISTRING_COMPILE_UNICTYPE_PROPERTY_UNIFIED_IDEOGRAPH
libunistring_la_SOURCES += unictype/pr_unified_ideograph.c
-endif
EXTRA_DIST += unictype/bitmap.h unictype/pr_unified_ideograph.h
@@ -3847,9 +2736,7 @@ EXTRA_DIST += unictype/bitmap.h unictype/pr_unified_ideograph.h
## begin gnulib module unictype/property-uppercase
-if LIBUNISTRING_COMPILE_UNICTYPE_PROPERTY_UPPERCASE
libunistring_la_SOURCES += unictype/pr_uppercase.c
-endif
EXTRA_DIST += unictype/bitmap.h unictype/pr_uppercase.h
@@ -3857,9 +2744,7 @@ EXTRA_DIST += unictype/bitmap.h unictype/pr_uppercase.h
## begin gnulib module unictype/property-variation-selector
-if LIBUNISTRING_COMPILE_UNICTYPE_PROPERTY_VARIATION_SELECTOR
libunistring_la_SOURCES += unictype/pr_variation_selector.c
-endif
EXTRA_DIST += unictype/bitmap.h unictype/pr_variation_selector.h
@@ -3867,9 +2752,7 @@ EXTRA_DIST += unictype/bitmap.h unictype/pr_variation_selector.h
## begin gnulib module unictype/property-white-space
-if LIBUNISTRING_COMPILE_UNICTYPE_PROPERTY_WHITE_SPACE
libunistring_la_SOURCES += unictype/pr_white_space.c
-endif
EXTRA_DIST += unictype/bitmap.h unictype/pr_white_space.h
@@ -3877,9 +2760,7 @@ EXTRA_DIST += unictype/bitmap.h unictype/pr_white_space.h
## begin gnulib module unictype/property-xid-continue
-if LIBUNISTRING_COMPILE_UNICTYPE_PROPERTY_XID_CONTINUE
libunistring_la_SOURCES += unictype/pr_xid_continue.c
-endif
EXTRA_DIST += unictype/bitmap.h unictype/pr_xid_continue.h
@@ -3887,9 +2768,7 @@ EXTRA_DIST += unictype/bitmap.h unictype/pr_xid_continue.h
## begin gnulib module unictype/property-xid-start
-if LIBUNISTRING_COMPILE_UNICTYPE_PROPERTY_XID_START
libunistring_la_SOURCES += unictype/pr_xid_start.c
-endif
EXTRA_DIST += unictype/bitmap.h unictype/pr_xid_start.h
@@ -3897,9 +2776,7 @@ EXTRA_DIST += unictype/bitmap.h unictype/pr_xid_start.h
## begin gnulib module unictype/property-zero-width
-if LIBUNISTRING_COMPILE_UNICTYPE_PROPERTY_ZERO_WIDTH
libunistring_la_SOURCES += unictype/pr_zero_width.c
-endif
EXTRA_DIST += unictype/bitmap.h unictype/pr_zero_width.h
@@ -3907,9 +2784,7 @@ EXTRA_DIST += unictype/bitmap.h unictype/pr_zero_width.h
## begin gnulib module unictype/scripts
-if LIBUNISTRING_COMPILE_UNICTYPE_SCRIPTS
libunistring_la_SOURCES += unictype/scripts.c
-endif
unictype/scripts_byname.h: unictype/scripts_byname.gperf
$(GPERF) -m 10 $(srcdir)/unictype/scripts_byname.gperf > $(srcdir)/unictype/scripts_byname.h-t
@@ -3925,9 +2800,7 @@ EXTRA_DIST += unictype/scripts.h unictype/scripts_byname.gperf
## begin gnulib module unictype/syntax-c-ident
-if LIBUNISTRING_COMPILE_UNICTYPE_SYNTAX_C_IDENT
libunistring_la_SOURCES += unictype/sy_c_ident.c
-endif
EXTRA_DIST += unictype/identsyntaxmap.h unictype/sy_c_ident.h
@@ -3935,17 +2808,13 @@ EXTRA_DIST += unictype/identsyntaxmap.h unictype/sy_c_ident.h
## begin gnulib module unictype/syntax-c-whitespace
-if LIBUNISTRING_COMPILE_UNICTYPE_SYNTAX_C_WHITESPACE
libunistring_la_SOURCES += unictype/sy_c_whitespace.c
-endif
## end gnulib module unictype/syntax-c-whitespace
## begin gnulib module unictype/syntax-java-ident
-if LIBUNISTRING_COMPILE_UNICTYPE_SYNTAX_JAVA_IDENT
libunistring_la_SOURCES += unictype/sy_java_ident.c
-endif
EXTRA_DIST += unictype/identsyntaxmap.h unictype/sy_java_ident.h
@@ -3953,139 +2822,14 @@ EXTRA_DIST += unictype/identsyntaxmap.h unictype/sy_java_ident.h
## begin gnulib module unictype/syntax-java-whitespace
-if LIBUNISTRING_COMPILE_UNICTYPE_SYNTAX_JAVA_WHITESPACE
libunistring_la_SOURCES += unictype/sy_java_whitespace.c
-endif
## end gnulib module unictype/syntax-java-whitespace
-## begin gnulib module unigbrk/base
-
-BUILT_SOURCES += $(LIBUNISTRING_UNIGBRK_H)
-
-unigbrk.h: unigbrk.in.h
- $(AM_V_GEN)rm -f $@-t $@ && \
- { echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \
- cat $(srcdir)/unigbrk.in.h; \
- } > $@-t && \
- mv -f $@-t $@
-MOSTLYCLEANFILES += unigbrk.h unigbrk.h-t
-
-EXTRA_DIST += unigbrk.in.h
-
-## end gnulib module unigbrk/base
-
-## begin gnulib module unigbrk/u16-grapheme-breaks
-
-if LIBUNISTRING_COMPILE_UNIGBRK_U16_GRAPHEME_BREAKS
-libunistring_la_SOURCES += unigbrk/u16-grapheme-breaks.c
-endif
-
-## end gnulib module unigbrk/u16-grapheme-breaks
-
-## begin gnulib module unigbrk/u16-grapheme-next
-
-if LIBUNISTRING_COMPILE_UNIGBRK_U16_GRAPHEME_NEXT
-libunistring_la_SOURCES += unigbrk/u16-grapheme-next.c
-endif
-
-## end gnulib module unigbrk/u16-grapheme-next
-
-## begin gnulib module unigbrk/u16-grapheme-prev
-
-if LIBUNISTRING_COMPILE_UNIGBRK_U16_GRAPHEME_PREV
-libunistring_la_SOURCES += unigbrk/u16-grapheme-prev.c
-endif
-
-## end gnulib module unigbrk/u16-grapheme-prev
-
-## begin gnulib module unigbrk/u32-grapheme-breaks
-
-if LIBUNISTRING_COMPILE_UNIGBRK_U32_GRAPHEME_BREAKS
-libunistring_la_SOURCES += unigbrk/u32-grapheme-breaks.c
-endif
-
-## end gnulib module unigbrk/u32-grapheme-breaks
-
-## begin gnulib module unigbrk/u32-grapheme-next
-
-if LIBUNISTRING_COMPILE_UNIGBRK_U32_GRAPHEME_NEXT
-libunistring_la_SOURCES += unigbrk/u32-grapheme-next.c
-endif
-
-## end gnulib module unigbrk/u32-grapheme-next
-
-## begin gnulib module unigbrk/u32-grapheme-prev
-
-if LIBUNISTRING_COMPILE_UNIGBRK_U32_GRAPHEME_PREV
-libunistring_la_SOURCES += unigbrk/u32-grapheme-prev.c
-endif
-
-## end gnulib module unigbrk/u32-grapheme-prev
-
-## begin gnulib module unigbrk/u8-grapheme-breaks
-
-if LIBUNISTRING_COMPILE_UNIGBRK_U8_GRAPHEME_BREAKS
-libunistring_la_SOURCES += unigbrk/u8-grapheme-breaks.c
-endif
-
-## end gnulib module unigbrk/u8-grapheme-breaks
-
-## begin gnulib module unigbrk/u8-grapheme-next
-
-if LIBUNISTRING_COMPILE_UNIGBRK_U8_GRAPHEME_NEXT
-libunistring_la_SOURCES += unigbrk/u8-grapheme-next.c
-endif
-
-## end gnulib module unigbrk/u8-grapheme-next
-
-## begin gnulib module unigbrk/u8-grapheme-prev
-
-if LIBUNISTRING_COMPILE_UNIGBRK_U8_GRAPHEME_PREV
-libunistring_la_SOURCES += unigbrk/u8-grapheme-prev.c
-endif
-
-## end gnulib module unigbrk/u8-grapheme-prev
-
-## begin gnulib module unigbrk/uc-gbrk-prop
-
-if LIBUNISTRING_COMPILE_UNIGBRK_UC_GBRK_PROP
-libunistring_la_SOURCES += unigbrk/uc-gbrk-prop.c
-endif
-
-EXTRA_DIST += unigbrk/gbrkprop.h
-
-## end gnulib module unigbrk/uc-gbrk-prop
-
-## begin gnulib module unigbrk/uc-is-grapheme-break
-
-if LIBUNISTRING_COMPILE_UNIGBRK_UC_IS_GRAPHEME_BREAK
-libunistring_la_SOURCES += unigbrk/uc-is-grapheme-break.c
-endif
-
-## end gnulib module unigbrk/uc-is-grapheme-break
-
-## begin gnulib module unigbrk/ulc-grapheme-breaks
-
-if LIBUNISTRING_COMPILE_UNIGBRK_ULC_GRAPHEME_BREAKS
-libunistring_la_SOURCES += unigbrk/ulc-grapheme-breaks.c
-endif
-
-## end gnulib module unigbrk/ulc-grapheme-breaks
-
## begin gnulib module unilbrk/base
-BUILT_SOURCES += $(LIBUNISTRING_UNILBRK_H)
-
-unilbrk.h: unilbrk.in.h
- $(AM_V_GEN)rm -f $@-t $@ && \
- { echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \
- cat $(srcdir)/unilbrk.in.h; \
- } > $@-t && \
- mv -f $@-t $@
-MOSTLYCLEANFILES += unilbrk.h unilbrk.h-t
-EXTRA_DIST += unilbrk.in.h
+EXTRA_DIST += unilbrk.h
## end gnulib module unilbrk/base
@@ -4099,9 +2843,7 @@ EXTRA_DIST += unilbrk/lbrkprop1.h unilbrk/lbrkprop2.h unilbrk/lbrktables.h
## begin gnulib module unilbrk/u16-possible-linebreaks
-if LIBUNISTRING_COMPILE_UNILBRK_U16_POSSIBLE_LINEBREAKS
libunistring_la_SOURCES += unilbrk/u16-possible-linebreaks.c
-endif
EXTRA_DIST += uniwidth/cjk.h
@@ -4109,17 +2851,13 @@ EXTRA_DIST += uniwidth/cjk.h
## begin gnulib module unilbrk/u16-width-linebreaks
-if LIBUNISTRING_COMPILE_UNILBRK_U16_WIDTH_LINEBREAKS
libunistring_la_SOURCES += unilbrk/u16-width-linebreaks.c
-endif
## end gnulib module unilbrk/u16-width-linebreaks
## begin gnulib module unilbrk/u32-possible-linebreaks
-if LIBUNISTRING_COMPILE_UNILBRK_U32_POSSIBLE_LINEBREAKS
libunistring_la_SOURCES += unilbrk/u32-possible-linebreaks.c
-endif
EXTRA_DIST += uniwidth/cjk.h
@@ -4127,17 +2865,13 @@ EXTRA_DIST += uniwidth/cjk.h
## begin gnulib module unilbrk/u32-width-linebreaks
-if LIBUNISTRING_COMPILE_UNILBRK_U32_WIDTH_LINEBREAKS
libunistring_la_SOURCES += unilbrk/u32-width-linebreaks.c
-endif
## end gnulib module unilbrk/u32-width-linebreaks
## begin gnulib module unilbrk/u8-possible-linebreaks
-if LIBUNISTRING_COMPILE_UNILBRK_U8_POSSIBLE_LINEBREAKS
libunistring_la_SOURCES += unilbrk/u8-possible-linebreaks.c
-endif
EXTRA_DIST += uniwidth/cjk.h
@@ -4145,9 +2879,7 @@ EXTRA_DIST += uniwidth/cjk.h
## begin gnulib module unilbrk/u8-width-linebreaks
-if LIBUNISTRING_COMPILE_UNILBRK_U8_WIDTH_LINEBREAKS
libunistring_la_SOURCES += unilbrk/u8-width-linebreaks.c
-endif
## end gnulib module unilbrk/u8-width-linebreaks
@@ -4161,41 +2893,26 @@ EXTRA_DIST += unilbrk/ulc-common.h
## begin gnulib module unilbrk/ulc-possible-linebreaks
-if LIBUNISTRING_COMPILE_UNILBRK_ULC_POSSIBLE_LINEBREAKS
libunistring_la_SOURCES += unilbrk/ulc-possible-linebreaks.c
-endif
## end gnulib module unilbrk/ulc-possible-linebreaks
## begin gnulib module unilbrk/ulc-width-linebreaks
-if LIBUNISTRING_COMPILE_UNILBRK_ULC_WIDTH_LINEBREAKS
libunistring_la_SOURCES += unilbrk/ulc-width-linebreaks.c
-endif
## end gnulib module unilbrk/ulc-width-linebreaks
## begin gnulib module uniname/base
-BUILT_SOURCES += $(LIBUNISTRING_UNINAME_H)
-
-uniname.h: uniname.in.h
- $(AM_V_GEN)rm -f $@-t $@ && \
- { echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \
- cat $(srcdir)/uniname.in.h; \
- } > $@-t && \
- mv -f $@-t $@
-MOSTLYCLEANFILES += uniname.h uniname.h-t
-EXTRA_DIST += uniname.in.h
+EXTRA_DIST += uniname.h
## end gnulib module uniname/base
## begin gnulib module uniname/uniname
-if LIBUNISTRING_COMPILE_UNINAME_UNINAME
libunistring_la_SOURCES += uniname/uniname.c
-endif
EXTRA_DIST += uniname/gen-uninames.lisp uniname/uninames.h
@@ -4203,25 +2920,14 @@ EXTRA_DIST += uniname/gen-uninames.lisp uniname/uninames.h
## begin gnulib module uninorm/base
-BUILT_SOURCES += $(LIBUNISTRING_UNINORM_H)
-
-uninorm.h: uninorm.in.h
- $(AM_V_GEN)rm -f $@-t $@ && \
- { echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \
- cat $(srcdir)/uninorm.in.h; \
- } > $@-t && \
- mv -f $@-t $@
-MOSTLYCLEANFILES += uninorm.h uninorm.h-t
-EXTRA_DIST += uninorm.in.h
+EXTRA_DIST += uninorm.h
## end gnulib module uninorm/base
## begin gnulib module uninorm/canonical-decomposition
-if LIBUNISTRING_COMPILE_UNINORM_CANONICAL_DECOMPOSITION
libunistring_la_SOURCES += uninorm/canonical-decomposition.c
-endif
## end gnulib module uninorm/canonical-decomposition
@@ -4235,9 +2941,7 @@ EXTRA_DIST += uninorm/decompose-internal.h
## begin gnulib module uninorm/composition
-if LIBUNISTRING_COMPILE_UNINORM_COMPOSITION
libunistring_la_SOURCES += uninorm/composition.c
-endif
uninorm/composition-table.h: $(srcdir)/uninorm/composition-table.gperf
$(GPERF) -m 1 $(srcdir)/uninorm/composition-table.gperf > $(srcdir)/uninorm/composition-table.h-t
@@ -4261,9 +2965,7 @@ EXTRA_DIST += uninorm/decompose-internal.h
## begin gnulib module uninorm/decomposing-form
-if LIBUNISTRING_COMPILE_UNINORM_DECOMPOSING_FORM
libunistring_la_SOURCES += uninorm/decomposing-form.c
-endif
EXTRA_DIST += uninorm/normalize-internal.h
@@ -4271,9 +2973,7 @@ EXTRA_DIST += uninorm/normalize-internal.h
## begin gnulib module uninorm/decomposition
-if LIBUNISTRING_COMPILE_UNINORM_DECOMPOSITION
libunistring_la_SOURCES += uninorm/decomposition.c
-endif
## end gnulib module uninorm/decomposition
@@ -4287,9 +2987,7 @@ EXTRA_DIST += uninorm/decomposition-table.h uninorm/decomposition-table1.h unino
## begin gnulib module uninorm/filter
-if LIBUNISTRING_COMPILE_UNINORM_FILTER
libunistring_la_SOURCES += uninorm/uninorm-filter.c
-endif
EXTRA_DIST += uninorm/normalize-internal.h
@@ -4297,9 +2995,7 @@ EXTRA_DIST += uninorm/normalize-internal.h
## begin gnulib module uninorm/nfc
-if LIBUNISTRING_COMPILE_UNINORM_NFC
libunistring_la_SOURCES += uninorm/nfc.c
-endif
EXTRA_DIST += uninorm/normalize-internal.h
@@ -4307,9 +3003,7 @@ EXTRA_DIST += uninorm/normalize-internal.h
## begin gnulib module uninorm/nfd
-if LIBUNISTRING_COMPILE_UNINORM_NFD
libunistring_la_SOURCES += uninorm/nfd.c
-endif
EXTRA_DIST += uninorm/normalize-internal.h
@@ -4317,9 +3011,7 @@ EXTRA_DIST += uninorm/normalize-internal.h
## begin gnulib module uninorm/nfkc
-if LIBUNISTRING_COMPILE_UNINORM_NFKC
libunistring_la_SOURCES += uninorm/nfkc.c
-endif
EXTRA_DIST += uninorm/normalize-internal.h
@@ -4327,9 +3019,7 @@ EXTRA_DIST += uninorm/normalize-internal.h
## begin gnulib module uninorm/nfkd
-if LIBUNISTRING_COMPILE_UNINORM_NFKD
libunistring_la_SOURCES += uninorm/nfkd.c
-endif
EXTRA_DIST += uninorm/normalize-internal.h
@@ -4337,9 +3027,7 @@ EXTRA_DIST += uninorm/normalize-internal.h
## begin gnulib module uninorm/u16-normalize
-if LIBUNISTRING_COMPILE_UNINORM_U16_NORMALIZE
libunistring_la_SOURCES += uninorm/u16-normalize.c
-endif
EXTRA_DIST += uninorm/normalize-internal.h uninorm/u-normalize-internal.h
@@ -4347,9 +3035,7 @@ EXTRA_DIST += uninorm/normalize-internal.h uninorm/u-normalize-internal.h
## begin gnulib module uninorm/u16-normcmp
-if LIBUNISTRING_COMPILE_UNINORM_U16_NORMCMP
libunistring_la_SOURCES += uninorm/u16-normcmp.c
-endif
EXTRA_DIST += uninorm/u-normcmp.h
@@ -4357,9 +3043,7 @@ EXTRA_DIST += uninorm/u-normcmp.h
## begin gnulib module uninorm/u16-normcoll
-if LIBUNISTRING_COMPILE_UNINORM_U16_NORMCOLL
libunistring_la_SOURCES += uninorm/u16-normcoll.c
-endif
EXTRA_DIST += uninorm/u-normcoll.h
@@ -4367,9 +3051,7 @@ EXTRA_DIST += uninorm/u-normcoll.h
## begin gnulib module uninorm/u16-normxfrm
-if LIBUNISTRING_COMPILE_UNINORM_U16_NORMXFRM
libunistring_la_SOURCES += uninorm/u16-normxfrm.c
-endif
EXTRA_DIST += uninorm/u-normxfrm.h
@@ -4377,9 +3059,7 @@ EXTRA_DIST += uninorm/u-normxfrm.h
## begin gnulib module uninorm/u32-normalize
-if LIBUNISTRING_COMPILE_UNINORM_U32_NORMALIZE
libunistring_la_SOURCES += uninorm/u32-normalize.c
-endif
EXTRA_DIST += uninorm/normalize-internal.h uninorm/u-normalize-internal.h
@@ -4387,9 +3067,7 @@ EXTRA_DIST += uninorm/normalize-internal.h uninorm/u-normalize-internal.h
## begin gnulib module uninorm/u32-normcmp
-if LIBUNISTRING_COMPILE_UNINORM_U32_NORMCMP
libunistring_la_SOURCES += uninorm/u32-normcmp.c
-endif
EXTRA_DIST += uninorm/u-normcmp.h
@@ -4397,9 +3075,7 @@ EXTRA_DIST += uninorm/u-normcmp.h
## begin gnulib module uninorm/u32-normcoll
-if LIBUNISTRING_COMPILE_UNINORM_U32_NORMCOLL
libunistring_la_SOURCES += uninorm/u32-normcoll.c
-endif
EXTRA_DIST += uninorm/u-normcoll.h
@@ -4407,9 +3083,7 @@ EXTRA_DIST += uninorm/u-normcoll.h
## begin gnulib module uninorm/u32-normxfrm
-if LIBUNISTRING_COMPILE_UNINORM_U32_NORMXFRM
libunistring_la_SOURCES += uninorm/u32-normxfrm.c
-endif
EXTRA_DIST += uninorm/u-normxfrm.h
@@ -4417,9 +3091,7 @@ EXTRA_DIST += uninorm/u-normxfrm.h
## begin gnulib module uninorm/u8-normalize
-if LIBUNISTRING_COMPILE_UNINORM_U8_NORMALIZE
libunistring_la_SOURCES += uninorm/u8-normalize.c
-endif
EXTRA_DIST += uninorm/normalize-internal.h uninorm/u-normalize-internal.h
@@ -4427,9 +3099,7 @@ EXTRA_DIST += uninorm/normalize-internal.h uninorm/u-normalize-internal.h
## begin gnulib module uninorm/u8-normcmp
-if LIBUNISTRING_COMPILE_UNINORM_U8_NORMCMP
libunistring_la_SOURCES += uninorm/u8-normcmp.c
-endif
EXTRA_DIST += uninorm/u-normcmp.h
@@ -4437,9 +3107,7 @@ EXTRA_DIST += uninorm/u-normcmp.h
## begin gnulib module uninorm/u8-normcoll
-if LIBUNISTRING_COMPILE_UNINORM_U8_NORMCOLL
libunistring_la_SOURCES += uninorm/u8-normcoll.c
-endif
EXTRA_DIST += uninorm/u-normcoll.h
@@ -4447,9 +3115,7 @@ EXTRA_DIST += uninorm/u-normcoll.h
## begin gnulib module uninorm/u8-normxfrm
-if LIBUNISTRING_COMPILE_UNINORM_U8_NORMXFRM
libunistring_la_SOURCES += uninorm/u8-normxfrm.c
-endif
EXTRA_DIST += uninorm/u-normxfrm.h
@@ -4458,69 +3124,55 @@ EXTRA_DIST += uninorm/u-normxfrm.h
## begin gnulib module unistd
BUILT_SOURCES += unistd.h
-libunistring_la_SOURCES += unistd.c
# We need the following in order to create an empty placeholder for
# <unistd.h> when the system doesn't have one.
-unistd.h: unistd.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(ARG_NONNULL_H) $(WARN_ON_USE_H)
+unistd.h: unistd.in.h $(CXXDEFS_H) $(ARG_NONNULL_H) $(WARN_ON_USE_H)
$(AM_V_GEN)rm -f $@-t $@ && \
{ echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \
- sed -e 's|@''GUARD_PREFIX''@|GL|g' \
- -e 's|@''HAVE_UNISTD_H''@|$(HAVE_UNISTD_H)|g' \
+ sed -e 's|@''HAVE_UNISTD_H''@|$(HAVE_UNISTD_H)|g' \
-e 's|@''INCLUDE_NEXT''@|$(INCLUDE_NEXT)|g' \
-e 's|@''PRAGMA_SYSTEM_HEADER''@|@PRAGMA_SYSTEM_HEADER@|g' \
- -e 's|@''PRAGMA_COLUMNS''@|@PRAGMA_COLUMNS@|g' \
-e 's|@''NEXT_UNISTD_H''@|$(NEXT_UNISTD_H)|g' \
- -e 's|@''WINDOWS_64_BIT_OFF_T''@|$(WINDOWS_64_BIT_OFF_T)|g' \
- -e 's/@''GNULIB_CHDIR''@/$(GNULIB_CHDIR)/g' \
- -e 's/@''GNULIB_CHOWN''@/$(GNULIB_CHOWN)/g' \
- -e 's/@''GNULIB_CLOSE''@/$(GNULIB_CLOSE)/g' \
- -e 's/@''GNULIB_DUP''@/$(GNULIB_DUP)/g' \
- -e 's/@''GNULIB_DUP2''@/$(GNULIB_DUP2)/g' \
- -e 's/@''GNULIB_DUP3''@/$(GNULIB_DUP3)/g' \
- -e 's/@''GNULIB_ENVIRON''@/$(GNULIB_ENVIRON)/g' \
- -e 's/@''GNULIB_EUIDACCESS''@/$(GNULIB_EUIDACCESS)/g' \
- -e 's/@''GNULIB_FACCESSAT''@/$(GNULIB_FACCESSAT)/g' \
- -e 's/@''GNULIB_FCHDIR''@/$(GNULIB_FCHDIR)/g' \
- -e 's/@''GNULIB_FCHOWNAT''@/$(GNULIB_FCHOWNAT)/g' \
- -e 's/@''GNULIB_FDATASYNC''@/$(GNULIB_FDATASYNC)/g' \
- -e 's/@''GNULIB_FSYNC''@/$(GNULIB_FSYNC)/g' \
- -e 's/@''GNULIB_FTRUNCATE''@/$(GNULIB_FTRUNCATE)/g' \
- -e 's/@''GNULIB_GETCWD''@/$(GNULIB_GETCWD)/g' \
- -e 's/@''GNULIB_GETDOMAINNAME''@/$(GNULIB_GETDOMAINNAME)/g' \
- -e 's/@''GNULIB_GETDTABLESIZE''@/$(GNULIB_GETDTABLESIZE)/g' \
- -e 's/@''GNULIB_GETGROUPS''@/$(GNULIB_GETGROUPS)/g' \
- -e 's/@''GNULIB_GETHOSTNAME''@/$(GNULIB_GETHOSTNAME)/g' \
- -e 's/@''GNULIB_GETLOGIN''@/$(GNULIB_GETLOGIN)/g' \
- -e 's/@''GNULIB_GETLOGIN_R''@/$(GNULIB_GETLOGIN_R)/g' \
- -e 's/@''GNULIB_GETPAGESIZE''@/$(GNULIB_GETPAGESIZE)/g' \
- -e 's/@''GNULIB_GETUSERSHELL''@/$(GNULIB_GETUSERSHELL)/g' \
- -e 's/@''GNULIB_GROUP_MEMBER''@/$(GNULIB_GROUP_MEMBER)/g' \
- -e 's/@''GNULIB_ISATTY''@/$(GNULIB_ISATTY)/g' \
- -e 's/@''GNULIB_LCHOWN''@/$(GNULIB_LCHOWN)/g' \
- -e 's/@''GNULIB_LINK''@/$(GNULIB_LINK)/g' \
- -e 's/@''GNULIB_LINKAT''@/$(GNULIB_LINKAT)/g' \
- -e 's/@''GNULIB_LSEEK''@/$(GNULIB_LSEEK)/g' \
- -e 's/@''GNULIB_PIPE''@/$(GNULIB_PIPE)/g' \
- -e 's/@''GNULIB_PIPE2''@/$(GNULIB_PIPE2)/g' \
- -e 's/@''GNULIB_PREAD''@/$(GNULIB_PREAD)/g' \
- -e 's/@''GNULIB_PWRITE''@/$(GNULIB_PWRITE)/g' \
- -e 's/@''GNULIB_READ''@/$(GNULIB_READ)/g' \
- -e 's/@''GNULIB_READLINK''@/$(GNULIB_READLINK)/g' \
- -e 's/@''GNULIB_READLINKAT''@/$(GNULIB_READLINKAT)/g' \
- -e 's/@''GNULIB_RMDIR''@/$(GNULIB_RMDIR)/g' \
- -e 's/@''GNULIB_SETHOSTNAME''@/$(GNULIB_SETHOSTNAME)/g' \
- -e 's/@''GNULIB_SLEEP''@/$(GNULIB_SLEEP)/g' \
- -e 's/@''GNULIB_SYMLINK''@/$(GNULIB_SYMLINK)/g' \
- -e 's/@''GNULIB_SYMLINKAT''@/$(GNULIB_SYMLINKAT)/g' \
- -e 's/@''GNULIB_TTYNAME_R''@/$(GNULIB_TTYNAME_R)/g' \
- -e 's/@''GNULIB_UNISTD_H_GETOPT''@/0$(GNULIB_GL_UNISTD_H_GETOPT)/g' \
- -e 's/@''GNULIB_UNISTD_H_NONBLOCKING''@/$(GNULIB_UNISTD_H_NONBLOCKING)/g' \
- -e 's/@''GNULIB_UNISTD_H_SIGPIPE''@/$(GNULIB_UNISTD_H_SIGPIPE)/g' \
- -e 's/@''GNULIB_UNLINK''@/$(GNULIB_UNLINK)/g' \
- -e 's/@''GNULIB_UNLINKAT''@/$(GNULIB_UNLINKAT)/g' \
- -e 's/@''GNULIB_USLEEP''@/$(GNULIB_USLEEP)/g' \
- -e 's/@''GNULIB_WRITE''@/$(GNULIB_WRITE)/g' \
+ -e 's|@''GNULIB_CHOWN''@|$(GNULIB_CHOWN)|g' \
+ -e 's|@''GNULIB_CLOSE''@|$(GNULIB_CLOSE)|g' \
+ -e 's|@''GNULIB_DUP2''@|$(GNULIB_DUP2)|g' \
+ -e 's|@''GNULIB_DUP3''@|$(GNULIB_DUP3)|g' \
+ -e 's|@''GNULIB_ENVIRON''@|$(GNULIB_ENVIRON)|g' \
+ -e 's|@''GNULIB_EUIDACCESS''@|$(GNULIB_EUIDACCESS)|g' \
+ -e 's|@''GNULIB_FACCESSAT''@|$(GNULIB_FACCESSAT)|g' \
+ -e 's|@''GNULIB_FCHDIR''@|$(GNULIB_FCHDIR)|g' \
+ -e 's|@''GNULIB_FCHOWNAT''@|$(GNULIB_FCHOWNAT)|g' \
+ -e 's|@''GNULIB_FSYNC''@|$(GNULIB_FSYNC)|g' \
+ -e 's|@''GNULIB_FTRUNCATE''@|$(GNULIB_FTRUNCATE)|g' \
+ -e 's|@''GNULIB_GETCWD''@|$(GNULIB_GETCWD)|g' \
+ -e 's|@''GNULIB_GETDOMAINNAME''@|$(GNULIB_GETDOMAINNAME)|g' \
+ -e 's|@''GNULIB_GETDTABLESIZE''@|$(GNULIB_GETDTABLESIZE)|g' \
+ -e 's|@''GNULIB_GETGROUPS''@|$(GNULIB_GETGROUPS)|g' \
+ -e 's|@''GNULIB_GETHOSTNAME''@|$(GNULIB_GETHOSTNAME)|g' \
+ -e 's|@''GNULIB_GETLOGIN''@|$(GNULIB_GETLOGIN)|g' \
+ -e 's|@''GNULIB_GETLOGIN_R''@|$(GNULIB_GETLOGIN_R)|g' \
+ -e 's|@''GNULIB_GETPAGESIZE''@|$(GNULIB_GETPAGESIZE)|g' \
+ -e 's|@''GNULIB_GETUSERSHELL''@|$(GNULIB_GETUSERSHELL)|g' \
+ -e 's|@''GNULIB_LCHOWN''@|$(GNULIB_LCHOWN)|g' \
+ -e 's|@''GNULIB_LINK''@|$(GNULIB_LINK)|g' \
+ -e 's|@''GNULIB_LINKAT''@|$(GNULIB_LINKAT)|g' \
+ -e 's|@''GNULIB_LSEEK''@|$(GNULIB_LSEEK)|g' \
+ -e 's|@''GNULIB_PIPE2''@|$(GNULIB_PIPE2)|g' \
+ -e 's|@''GNULIB_PREAD''@|$(GNULIB_PREAD)|g' \
+ -e 's|@''GNULIB_READLINK''@|$(GNULIB_READLINK)|g' \
+ -e 's|@''GNULIB_READLINKAT''@|$(GNULIB_READLINKAT)|g' \
+ -e 's|@''GNULIB_RMDIR''@|$(GNULIB_RMDIR)|g' \
+ -e 's|@''GNULIB_SLEEP''@|$(GNULIB_SLEEP)|g' \
+ -e 's|@''GNULIB_SYMLINK''@|$(GNULIB_SYMLINK)|g' \
+ -e 's|@''GNULIB_SYMLINKAT''@|$(GNULIB_SYMLINKAT)|g' \
+ -e 's|@''GNULIB_TTYNAME_R''@|$(GNULIB_TTYNAME_R)|g' \
+ -e 's|@''GNULIB_UNISTD_H_GETOPT''@|$(GNULIB_UNISTD_H_GETOPT)|g' \
+ -e 's|@''GNULIB_UNISTD_H_SIGPIPE''@|$(GNULIB_UNISTD_H_SIGPIPE)|g' \
+ -e 's|@''GNULIB_UNLINK''@|$(GNULIB_UNLINK)|g' \
+ -e 's|@''GNULIB_UNLINKAT''@|$(GNULIB_UNLINKAT)|g' \
+ -e 's|@''GNULIB_USLEEP''@|$(GNULIB_USLEEP)|g' \
+ -e 's|@''GNULIB_WRITE''@|$(GNULIB_WRITE)|g' \
< $(srcdir)/unistd.in.h | \
sed -e 's|@''HAVE_CHOWN''@|$(HAVE_CHOWN)|g' \
-e 's|@''HAVE_DUP2''@|$(HAVE_DUP2)|g' \
@@ -4529,68 +3181,50 @@ unistd.h: unistd.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(ARG_NONNULL_H
-e 's|@''HAVE_FACCESSAT''@|$(HAVE_FACCESSAT)|g' \
-e 's|@''HAVE_FCHDIR''@|$(HAVE_FCHDIR)|g' \
-e 's|@''HAVE_FCHOWNAT''@|$(HAVE_FCHOWNAT)|g' \
- -e 's|@''HAVE_FDATASYNC''@|$(HAVE_FDATASYNC)|g' \
-e 's|@''HAVE_FSYNC''@|$(HAVE_FSYNC)|g' \
-e 's|@''HAVE_FTRUNCATE''@|$(HAVE_FTRUNCATE)|g' \
+ -e 's|@''HAVE_GETDOMAINNAME''@|$(HAVE_GETDOMAINNAME)|g' \
-e 's|@''HAVE_GETDTABLESIZE''@|$(HAVE_GETDTABLESIZE)|g' \
-e 's|@''HAVE_GETGROUPS''@|$(HAVE_GETGROUPS)|g' \
-e 's|@''HAVE_GETHOSTNAME''@|$(HAVE_GETHOSTNAME)|g' \
-e 's|@''HAVE_GETLOGIN''@|$(HAVE_GETLOGIN)|g' \
-e 's|@''HAVE_GETPAGESIZE''@|$(HAVE_GETPAGESIZE)|g' \
- -e 's|@''HAVE_GROUP_MEMBER''@|$(HAVE_GROUP_MEMBER)|g' \
-e 's|@''HAVE_LCHOWN''@|$(HAVE_LCHOWN)|g' \
-e 's|@''HAVE_LINK''@|$(HAVE_LINK)|g' \
-e 's|@''HAVE_LINKAT''@|$(HAVE_LINKAT)|g' \
- -e 's|@''HAVE_PIPE''@|$(HAVE_PIPE)|g' \
-e 's|@''HAVE_PIPE2''@|$(HAVE_PIPE2)|g' \
-e 's|@''HAVE_PREAD''@|$(HAVE_PREAD)|g' \
- -e 's|@''HAVE_PWRITE''@|$(HAVE_PWRITE)|g' \
-e 's|@''HAVE_READLINK''@|$(HAVE_READLINK)|g' \
-e 's|@''HAVE_READLINKAT''@|$(HAVE_READLINKAT)|g' \
- -e 's|@''HAVE_SETHOSTNAME''@|$(HAVE_SETHOSTNAME)|g' \
-e 's|@''HAVE_SLEEP''@|$(HAVE_SLEEP)|g' \
-e 's|@''HAVE_SYMLINK''@|$(HAVE_SYMLINK)|g' \
-e 's|@''HAVE_SYMLINKAT''@|$(HAVE_SYMLINKAT)|g' \
+ -e 's|@''HAVE_TTYNAME_R''@|$(HAVE_TTYNAME_R)|g' \
-e 's|@''HAVE_UNLINKAT''@|$(HAVE_UNLINKAT)|g' \
-e 's|@''HAVE_USLEEP''@|$(HAVE_USLEEP)|g' \
-e 's|@''HAVE_DECL_ENVIRON''@|$(HAVE_DECL_ENVIRON)|g' \
- -e 's|@''HAVE_DECL_FCHDIR''@|$(HAVE_DECL_FCHDIR)|g' \
- -e 's|@''HAVE_DECL_FDATASYNC''@|$(HAVE_DECL_FDATASYNC)|g' \
- -e 's|@''HAVE_DECL_GETDOMAINNAME''@|$(HAVE_DECL_GETDOMAINNAME)|g' \
-e 's|@''HAVE_DECL_GETLOGIN_R''@|$(HAVE_DECL_GETLOGIN_R)|g' \
-e 's|@''HAVE_DECL_GETPAGESIZE''@|$(HAVE_DECL_GETPAGESIZE)|g' \
-e 's|@''HAVE_DECL_GETUSERSHELL''@|$(HAVE_DECL_GETUSERSHELL)|g' \
- -e 's|@''HAVE_DECL_SETHOSTNAME''@|$(HAVE_DECL_SETHOSTNAME)|g' \
- -e 's|@''HAVE_DECL_TTYNAME_R''@|$(HAVE_DECL_TTYNAME_R)|g' \
-e 's|@''HAVE_OS_H''@|$(HAVE_OS_H)|g' \
-e 's|@''HAVE_SYS_PARAM_H''@|$(HAVE_SYS_PARAM_H)|g' \
- | \
- sed -e 's|@''REPLACE_CHOWN''@|$(REPLACE_CHOWN)|g' \
+ -e 's|@''REPLACE_CHOWN''@|$(REPLACE_CHOWN)|g' \
-e 's|@''REPLACE_CLOSE''@|$(REPLACE_CLOSE)|g' \
-e 's|@''REPLACE_DUP''@|$(REPLACE_DUP)|g' \
-e 's|@''REPLACE_DUP2''@|$(REPLACE_DUP2)|g' \
-e 's|@''REPLACE_FCHOWNAT''@|$(REPLACE_FCHOWNAT)|g' \
- -e 's|@''REPLACE_FTRUNCATE''@|$(REPLACE_FTRUNCATE)|g' \
-e 's|@''REPLACE_GETCWD''@|$(REPLACE_GETCWD)|g' \
- -e 's|@''REPLACE_GETDOMAINNAME''@|$(REPLACE_GETDOMAINNAME)|g' \
- -e 's|@''REPLACE_GETDTABLESIZE''@|$(REPLACE_GETDTABLESIZE)|g' \
- -e 's|@''REPLACE_GETLOGIN_R''@|$(REPLACE_GETLOGIN_R)|g' \
-e 's|@''REPLACE_GETGROUPS''@|$(REPLACE_GETGROUPS)|g' \
-e 's|@''REPLACE_GETPAGESIZE''@|$(REPLACE_GETPAGESIZE)|g' \
- -e 's|@''REPLACE_ISATTY''@|$(REPLACE_ISATTY)|g' \
-e 's|@''REPLACE_LCHOWN''@|$(REPLACE_LCHOWN)|g' \
-e 's|@''REPLACE_LINK''@|$(REPLACE_LINK)|g' \
-e 's|@''REPLACE_LINKAT''@|$(REPLACE_LINKAT)|g' \
-e 's|@''REPLACE_LSEEK''@|$(REPLACE_LSEEK)|g' \
-e 's|@''REPLACE_PREAD''@|$(REPLACE_PREAD)|g' \
- -e 's|@''REPLACE_PWRITE''@|$(REPLACE_PWRITE)|g' \
- -e 's|@''REPLACE_READ''@|$(REPLACE_READ)|g' \
-e 's|@''REPLACE_READLINK''@|$(REPLACE_READLINK)|g' \
- -e 's|@''REPLACE_READLINKAT''@|$(REPLACE_READLINKAT)|g' \
-e 's|@''REPLACE_RMDIR''@|$(REPLACE_RMDIR)|g' \
-e 's|@''REPLACE_SLEEP''@|$(REPLACE_SLEEP)|g' \
-e 's|@''REPLACE_SYMLINK''@|$(REPLACE_SYMLINK)|g' \
- -e 's|@''REPLACE_SYMLINKAT''@|$(REPLACE_SYMLINKAT)|g' \
-e 's|@''REPLACE_TTYNAME_R''@|$(REPLACE_TTYNAME_R)|g' \
-e 's|@''REPLACE_UNLINK''@|$(REPLACE_UNLINK)|g' \
-e 's|@''REPLACE_UNLINKAT''@|$(REPLACE_UNLINKAT)|g' \
@@ -4611,17 +3245,8 @@ EXTRA_DIST += unistd.in.h
## begin gnulib module unistdio/base
-BUILT_SOURCES += $(LIBUNISTRING_UNISTDIO_H)
-unistdio.h: unistdio.in.h
- $(AM_V_GEN)rm -f $@-t $@ && \
- { echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \
- cat $(srcdir)/unistdio.in.h; \
- } > $@-t && \
- mv -f $@-t $@
-MOSTLYCLEANFILES += unistdio.h unistdio.h-t
-
-EXTRA_DIST += unistdio.in.h
+EXTRA_DIST += unistdio.h
## end gnulib module unistdio/base
@@ -4637,9 +3262,7 @@ EXTRA_libunistring_la_SOURCES += printf-args.c
## begin gnulib module unistdio/u16-asnprintf
-if LIBUNISTRING_COMPILE_UNISTDIO_U16_ASNPRINTF
libunistring_la_SOURCES += unistdio/u16-asnprintf.c
-endif
EXTRA_DIST += unistdio/u-asnprintf.h
@@ -4647,9 +3270,7 @@ EXTRA_DIST += unistdio/u-asnprintf.h
## begin gnulib module unistdio/u16-asprintf
-if LIBUNISTRING_COMPILE_UNISTDIO_U16_ASPRINTF
libunistring_la_SOURCES += unistdio/u16-asprintf.c
-endif
EXTRA_DIST += unistdio/u-asprintf.h
@@ -4667,9 +3288,7 @@ EXTRA_libunistring_la_SOURCES += printf-parse.c
## begin gnulib module unistdio/u16-snprintf
-if LIBUNISTRING_COMPILE_UNISTDIO_U16_SNPRINTF
libunistring_la_SOURCES += unistdio/u16-snprintf.c
-endif
EXTRA_DIST += unistdio/u-snprintf.h
@@ -4677,9 +3296,7 @@ EXTRA_DIST += unistdio/u-snprintf.h
## begin gnulib module unistdio/u16-sprintf
-if LIBUNISTRING_COMPILE_UNISTDIO_U16_SPRINTF
libunistring_la_SOURCES += unistdio/u16-sprintf.c
-endif
EXTRA_DIST += unistdio/u-sprintf.h
@@ -4687,9 +3304,7 @@ EXTRA_DIST += unistdio/u-sprintf.h
## begin gnulib module unistdio/u16-u16-asnprintf
-if LIBUNISTRING_COMPILE_UNISTDIO_U16_U16_ASNPRINTF
libunistring_la_SOURCES += unistdio/u16-u16-asnprintf.c
-endif
EXTRA_DIST += unistdio/u-asnprintf.h
@@ -4697,9 +3312,7 @@ EXTRA_DIST += unistdio/u-asnprintf.h
## begin gnulib module unistdio/u16-u16-asprintf
-if LIBUNISTRING_COMPILE_UNISTDIO_U16_U16_ASPRINTF
libunistring_la_SOURCES += unistdio/u16-u16-asprintf.c
-endif
EXTRA_DIST += unistdio/u-asprintf.h
@@ -4707,9 +3320,7 @@ EXTRA_DIST += unistdio/u-asprintf.h
## begin gnulib module unistdio/u16-u16-snprintf
-if LIBUNISTRING_COMPILE_UNISTDIO_U16_U16_SNPRINTF
libunistring_la_SOURCES += unistdio/u16-u16-snprintf.c
-endif
EXTRA_DIST += unistdio/u-snprintf.h
@@ -4717,9 +3328,7 @@ EXTRA_DIST += unistdio/u-snprintf.h
## begin gnulib module unistdio/u16-u16-sprintf
-if LIBUNISTRING_COMPILE_UNISTDIO_U16_U16_SPRINTF
libunistring_la_SOURCES += unistdio/u16-u16-sprintf.c
-endif
EXTRA_DIST += unistdio/u-sprintf.h
@@ -4727,9 +3336,7 @@ EXTRA_DIST += unistdio/u-sprintf.h
## begin gnulib module unistdio/u16-u16-vasnprintf
-if LIBUNISTRING_COMPILE_UNISTDIO_U16_U16_VASNPRINTF
libunistring_la_SOURCES += unistdio/u16-u16-vasnprintf.c
-endif
EXTRA_DIST += vasnprintf.c
@@ -4739,9 +3346,7 @@ EXTRA_libunistring_la_SOURCES += vasnprintf.c
## begin gnulib module unistdio/u16-u16-vasprintf
-if LIBUNISTRING_COMPILE_UNISTDIO_U16_U16_VASPRINTF
libunistring_la_SOURCES += unistdio/u16-u16-vasprintf.c
-endif
EXTRA_DIST += unistdio/u-vasprintf.h
@@ -4749,9 +3354,7 @@ EXTRA_DIST += unistdio/u-vasprintf.h
## begin gnulib module unistdio/u16-u16-vsnprintf
-if LIBUNISTRING_COMPILE_UNISTDIO_U16_U16_VSNPRINTF
libunistring_la_SOURCES += unistdio/u16-u16-vsnprintf.c
-endif
EXTRA_DIST += unistdio/u-vsnprintf.h
@@ -4759,9 +3362,7 @@ EXTRA_DIST += unistdio/u-vsnprintf.h
## begin gnulib module unistdio/u16-u16-vsprintf
-if LIBUNISTRING_COMPILE_UNISTDIO_U16_U16_VSPRINTF
libunistring_la_SOURCES += unistdio/u16-u16-vsprintf.c
-endif
EXTRA_DIST += unistdio/u-vsprintf.h
@@ -4769,9 +3370,7 @@ EXTRA_DIST += unistdio/u-vsprintf.h
## begin gnulib module unistdio/u16-vasnprintf
-if LIBUNISTRING_COMPILE_UNISTDIO_U16_VASNPRINTF
libunistring_la_SOURCES += unistdio/u16-vasnprintf.c
-endif
EXTRA_DIST += vasnprintf.c
@@ -4781,9 +3380,7 @@ EXTRA_libunistring_la_SOURCES += vasnprintf.c
## begin gnulib module unistdio/u16-vasprintf
-if LIBUNISTRING_COMPILE_UNISTDIO_U16_VASPRINTF
libunistring_la_SOURCES += unistdio/u16-vasprintf.c
-endif
EXTRA_DIST += unistdio/u-vasprintf.h
@@ -4791,9 +3388,7 @@ EXTRA_DIST += unistdio/u-vasprintf.h
## begin gnulib module unistdio/u16-vsnprintf
-if LIBUNISTRING_COMPILE_UNISTDIO_U16_VSNPRINTF
libunistring_la_SOURCES += unistdio/u16-vsnprintf.c
-endif
EXTRA_DIST += unistdio/u-vsnprintf.h
@@ -4801,9 +3396,7 @@ EXTRA_DIST += unistdio/u-vsnprintf.h
## begin gnulib module unistdio/u16-vsprintf
-if LIBUNISTRING_COMPILE_UNISTDIO_U16_VSPRINTF
libunistring_la_SOURCES += unistdio/u16-vsprintf.c
-endif
EXTRA_DIST += unistdio/u-vsprintf.h
@@ -4811,9 +3404,7 @@ EXTRA_DIST += unistdio/u-vsprintf.h
## begin gnulib module unistdio/u32-asnprintf
-if LIBUNISTRING_COMPILE_UNISTDIO_U32_ASNPRINTF
libunistring_la_SOURCES += unistdio/u32-asnprintf.c
-endif
EXTRA_DIST += unistdio/u-asnprintf.h
@@ -4821,9 +3412,7 @@ EXTRA_DIST += unistdio/u-asnprintf.h
## begin gnulib module unistdio/u32-asprintf
-if LIBUNISTRING_COMPILE_UNISTDIO_U32_ASPRINTF
libunistring_la_SOURCES += unistdio/u32-asprintf.c
-endif
EXTRA_DIST += unistdio/u-asprintf.h
@@ -4841,9 +3430,7 @@ EXTRA_libunistring_la_SOURCES += printf-parse.c
## begin gnulib module unistdio/u32-snprintf
-if LIBUNISTRING_COMPILE_UNISTDIO_U32_SNPRINTF
libunistring_la_SOURCES += unistdio/u32-snprintf.c
-endif
EXTRA_DIST += unistdio/u-snprintf.h
@@ -4851,9 +3438,7 @@ EXTRA_DIST += unistdio/u-snprintf.h
## begin gnulib module unistdio/u32-sprintf
-if LIBUNISTRING_COMPILE_UNISTDIO_U32_SPRINTF
libunistring_la_SOURCES += unistdio/u32-sprintf.c
-endif
EXTRA_DIST += unistdio/u-sprintf.h
@@ -4861,9 +3446,7 @@ EXTRA_DIST += unistdio/u-sprintf.h
## begin gnulib module unistdio/u32-u32-asnprintf
-if LIBUNISTRING_COMPILE_UNISTDIO_U32_U32_ASNPRINTF
libunistring_la_SOURCES += unistdio/u32-u32-asnprintf.c
-endif
EXTRA_DIST += unistdio/u-asnprintf.h
@@ -4871,9 +3454,7 @@ EXTRA_DIST += unistdio/u-asnprintf.h
## begin gnulib module unistdio/u32-u32-asprintf
-if LIBUNISTRING_COMPILE_UNISTDIO_U32_U32_ASPRINTF
libunistring_la_SOURCES += unistdio/u32-u32-asprintf.c
-endif
EXTRA_DIST += unistdio/u-asprintf.h
@@ -4881,9 +3462,7 @@ EXTRA_DIST += unistdio/u-asprintf.h
## begin gnulib module unistdio/u32-u32-snprintf
-if LIBUNISTRING_COMPILE_UNISTDIO_U32_U32_SNPRINTF
libunistring_la_SOURCES += unistdio/u32-u32-snprintf.c
-endif
EXTRA_DIST += unistdio/u-snprintf.h
@@ -4891,9 +3470,7 @@ EXTRA_DIST += unistdio/u-snprintf.h
## begin gnulib module unistdio/u32-u32-sprintf
-if LIBUNISTRING_COMPILE_UNISTDIO_U32_U32_SPRINTF
libunistring_la_SOURCES += unistdio/u32-u32-sprintf.c
-endif
EXTRA_DIST += unistdio/u-sprintf.h
@@ -4901,9 +3478,7 @@ EXTRA_DIST += unistdio/u-sprintf.h
## begin gnulib module unistdio/u32-u32-vasnprintf
-if LIBUNISTRING_COMPILE_UNISTDIO_U32_U32_VASNPRINTF
libunistring_la_SOURCES += unistdio/u32-u32-vasnprintf.c
-endif
EXTRA_DIST += vasnprintf.c
@@ -4913,9 +3488,7 @@ EXTRA_libunistring_la_SOURCES += vasnprintf.c
## begin gnulib module unistdio/u32-u32-vasprintf
-if LIBUNISTRING_COMPILE_UNISTDIO_U32_U32_VASPRINTF
libunistring_la_SOURCES += unistdio/u32-u32-vasprintf.c
-endif
EXTRA_DIST += unistdio/u-vasprintf.h
@@ -4923,9 +3496,7 @@ EXTRA_DIST += unistdio/u-vasprintf.h
## begin gnulib module unistdio/u32-u32-vsnprintf
-if LIBUNISTRING_COMPILE_UNISTDIO_U32_U32_VSNPRINTF
libunistring_la_SOURCES += unistdio/u32-u32-vsnprintf.c
-endif
EXTRA_DIST += unistdio/u-vsnprintf.h
@@ -4933,9 +3504,7 @@ EXTRA_DIST += unistdio/u-vsnprintf.h
## begin gnulib module unistdio/u32-u32-vsprintf
-if LIBUNISTRING_COMPILE_UNISTDIO_U32_U32_VSPRINTF
libunistring_la_SOURCES += unistdio/u32-u32-vsprintf.c
-endif
EXTRA_DIST += unistdio/u-vsprintf.h
@@ -4943,9 +3512,7 @@ EXTRA_DIST += unistdio/u-vsprintf.h
## begin gnulib module unistdio/u32-vasnprintf
-if LIBUNISTRING_COMPILE_UNISTDIO_U32_VASNPRINTF
libunistring_la_SOURCES += unistdio/u32-vasnprintf.c
-endif
EXTRA_DIST += vasnprintf.c
@@ -4955,9 +3522,7 @@ EXTRA_libunistring_la_SOURCES += vasnprintf.c
## begin gnulib module unistdio/u32-vasprintf
-if LIBUNISTRING_COMPILE_UNISTDIO_U32_VASPRINTF
libunistring_la_SOURCES += unistdio/u32-vasprintf.c
-endif
EXTRA_DIST += unistdio/u-vasprintf.h
@@ -4965,9 +3530,7 @@ EXTRA_DIST += unistdio/u-vasprintf.h
## begin gnulib module unistdio/u32-vsnprintf
-if LIBUNISTRING_COMPILE_UNISTDIO_U32_VSNPRINTF
libunistring_la_SOURCES += unistdio/u32-vsnprintf.c
-endif
EXTRA_DIST += unistdio/u-vsnprintf.h
@@ -4975,9 +3538,7 @@ EXTRA_DIST += unistdio/u-vsnprintf.h
## begin gnulib module unistdio/u32-vsprintf
-if LIBUNISTRING_COMPILE_UNISTDIO_U32_VSPRINTF
libunistring_la_SOURCES += unistdio/u32-vsprintf.c
-endif
EXTRA_DIST += unistdio/u-vsprintf.h
@@ -4985,9 +3546,7 @@ EXTRA_DIST += unistdio/u-vsprintf.h
## begin gnulib module unistdio/u8-asnprintf
-if LIBUNISTRING_COMPILE_UNISTDIO_U8_ASNPRINTF
libunistring_la_SOURCES += unistdio/u8-asnprintf.c
-endif
EXTRA_DIST += unistdio/u-asnprintf.h
@@ -4995,9 +3554,7 @@ EXTRA_DIST += unistdio/u-asnprintf.h
## begin gnulib module unistdio/u8-asprintf
-if LIBUNISTRING_COMPILE_UNISTDIO_U8_ASPRINTF
libunistring_la_SOURCES += unistdio/u8-asprintf.c
-endif
EXTRA_DIST += unistdio/u-asprintf.h
@@ -5015,9 +3572,7 @@ EXTRA_libunistring_la_SOURCES += printf-parse.c
## begin gnulib module unistdio/u8-snprintf
-if LIBUNISTRING_COMPILE_UNISTDIO_U8_SNPRINTF
libunistring_la_SOURCES += unistdio/u8-snprintf.c
-endif
EXTRA_DIST += unistdio/u-snprintf.h
@@ -5025,9 +3580,7 @@ EXTRA_DIST += unistdio/u-snprintf.h
## begin gnulib module unistdio/u8-sprintf
-if LIBUNISTRING_COMPILE_UNISTDIO_U8_SPRINTF
libunistring_la_SOURCES += unistdio/u8-sprintf.c
-endif
EXTRA_DIST += unistdio/u-sprintf.h
@@ -5035,9 +3588,7 @@ EXTRA_DIST += unistdio/u-sprintf.h
## begin gnulib module unistdio/u8-u8-asnprintf
-if LIBUNISTRING_COMPILE_UNISTDIO_U8_U8_ASNPRINTF
libunistring_la_SOURCES += unistdio/u8-u8-asnprintf.c
-endif
EXTRA_DIST += unistdio/u-asnprintf.h
@@ -5045,9 +3596,7 @@ EXTRA_DIST += unistdio/u-asnprintf.h
## begin gnulib module unistdio/u8-u8-asprintf
-if LIBUNISTRING_COMPILE_UNISTDIO_U8_U8_ASPRINTF
libunistring_la_SOURCES += unistdio/u8-u8-asprintf.c
-endif
EXTRA_DIST += unistdio/u-asprintf.h
@@ -5055,9 +3604,7 @@ EXTRA_DIST += unistdio/u-asprintf.h
## begin gnulib module unistdio/u8-u8-snprintf
-if LIBUNISTRING_COMPILE_UNISTDIO_U8_U8_SNPRINTF
libunistring_la_SOURCES += unistdio/u8-u8-snprintf.c
-endif
EXTRA_DIST += unistdio/u-snprintf.h
@@ -5065,9 +3612,7 @@ EXTRA_DIST += unistdio/u-snprintf.h
## begin gnulib module unistdio/u8-u8-sprintf
-if LIBUNISTRING_COMPILE_UNISTDIO_U8_U8_SPRINTF
libunistring_la_SOURCES += unistdio/u8-u8-sprintf.c
-endif
EXTRA_DIST += unistdio/u-sprintf.h
@@ -5075,9 +3620,7 @@ EXTRA_DIST += unistdio/u-sprintf.h
## begin gnulib module unistdio/u8-u8-vasnprintf
-if LIBUNISTRING_COMPILE_UNISTDIO_U8_U8_VASNPRINTF
libunistring_la_SOURCES += unistdio/u8-u8-vasnprintf.c
-endif
EXTRA_DIST += vasnprintf.c
@@ -5087,9 +3630,7 @@ EXTRA_libunistring_la_SOURCES += vasnprintf.c
## begin gnulib module unistdio/u8-u8-vasprintf
-if LIBUNISTRING_COMPILE_UNISTDIO_U8_U8_VASPRINTF
libunistring_la_SOURCES += unistdio/u8-u8-vasprintf.c
-endif
EXTRA_DIST += unistdio/u-vasprintf.h
@@ -5097,9 +3638,7 @@ EXTRA_DIST += unistdio/u-vasprintf.h
## begin gnulib module unistdio/u8-u8-vsnprintf
-if LIBUNISTRING_COMPILE_UNISTDIO_U8_U8_VSNPRINTF
libunistring_la_SOURCES += unistdio/u8-u8-vsnprintf.c
-endif
EXTRA_DIST += unistdio/u-vsnprintf.h
@@ -5107,9 +3646,7 @@ EXTRA_DIST += unistdio/u-vsnprintf.h
## begin gnulib module unistdio/u8-u8-vsprintf
-if LIBUNISTRING_COMPILE_UNISTDIO_U8_U8_VSPRINTF
libunistring_la_SOURCES += unistdio/u8-u8-vsprintf.c
-endif
EXTRA_DIST += unistdio/u-vsprintf.h
@@ -5117,9 +3654,7 @@ EXTRA_DIST += unistdio/u-vsprintf.h
## begin gnulib module unistdio/u8-vasnprintf
-if LIBUNISTRING_COMPILE_UNISTDIO_U8_VASNPRINTF
libunistring_la_SOURCES += unistdio/u8-vasnprintf.c
-endif
EXTRA_DIST += vasnprintf.c
@@ -5129,9 +3664,7 @@ EXTRA_libunistring_la_SOURCES += vasnprintf.c
## begin gnulib module unistdio/u8-vasprintf
-if LIBUNISTRING_COMPILE_UNISTDIO_U8_VASPRINTF
libunistring_la_SOURCES += unistdio/u8-vasprintf.c
-endif
EXTRA_DIST += unistdio/u-vasprintf.h
@@ -5139,9 +3672,7 @@ EXTRA_DIST += unistdio/u-vasprintf.h
## begin gnulib module unistdio/u8-vsnprintf
-if LIBUNISTRING_COMPILE_UNISTDIO_U8_VSNPRINTF
libunistring_la_SOURCES += unistdio/u8-vsnprintf.c
-endif
EXTRA_DIST += unistdio/u-vsnprintf.h
@@ -5149,9 +3680,7 @@ EXTRA_DIST += unistdio/u-vsnprintf.h
## begin gnulib module unistdio/u8-vsprintf
-if LIBUNISTRING_COMPILE_UNISTDIO_U8_VSPRINTF
libunistring_la_SOURCES += unistdio/u8-vsprintf.c
-endif
EXTRA_DIST += unistdio/u-vsprintf.h
@@ -5159,9 +3688,7 @@ EXTRA_DIST += unistdio/u-vsprintf.h
## begin gnulib module unistdio/ulc-asnprintf
-if LIBUNISTRING_COMPILE_UNISTDIO_ULC_ASNPRINTF
libunistring_la_SOURCES += unistdio/ulc-asnprintf.c
-endif
EXTRA_DIST += unistdio/u-asnprintf.h
@@ -5169,9 +3696,7 @@ EXTRA_DIST += unistdio/u-asnprintf.h
## begin gnulib module unistdio/ulc-asprintf
-if LIBUNISTRING_COMPILE_UNISTDIO_ULC_ASPRINTF
libunistring_la_SOURCES += unistdio/ulc-asprintf.c
-endif
EXTRA_DIST += unistdio/u-asprintf.h
@@ -5179,9 +3704,7 @@ EXTRA_DIST += unistdio/u-asprintf.h
## begin gnulib module unistdio/ulc-fprintf
-if LIBUNISTRING_COMPILE_UNISTDIO_ULC_FPRINTF
libunistring_la_SOURCES += unistdio/ulc-fprintf.c
-endif
## end gnulib module unistdio/ulc-fprintf
@@ -5197,9 +3720,7 @@ EXTRA_libunistring_la_SOURCES += printf-parse.c
## begin gnulib module unistdio/ulc-snprintf
-if LIBUNISTRING_COMPILE_UNISTDIO_ULC_SNPRINTF
libunistring_la_SOURCES += unistdio/ulc-snprintf.c
-endif
EXTRA_DIST += unistdio/u-snprintf.h
@@ -5207,9 +3728,7 @@ EXTRA_DIST += unistdio/u-snprintf.h
## begin gnulib module unistdio/ulc-sprintf
-if LIBUNISTRING_COMPILE_UNISTDIO_ULC_SPRINTF
libunistring_la_SOURCES += unistdio/ulc-sprintf.c
-endif
EXTRA_DIST += unistdio/u-sprintf.h
@@ -5217,9 +3736,7 @@ EXTRA_DIST += unistdio/u-sprintf.h
## begin gnulib module unistdio/ulc-vasnprintf
-if LIBUNISTRING_COMPILE_UNISTDIO_ULC_VASNPRINTF
libunistring_la_SOURCES += unistdio/ulc-vasnprintf.c
-endif
EXTRA_DIST += vasnprintf.c
@@ -5229,9 +3746,7 @@ EXTRA_libunistring_la_SOURCES += vasnprintf.c
## begin gnulib module unistdio/ulc-vasprintf
-if LIBUNISTRING_COMPILE_UNISTDIO_ULC_VASPRINTF
libunistring_la_SOURCES += unistdio/ulc-vasprintf.c
-endif
EXTRA_DIST += unistdio/u-vasprintf.h
@@ -5239,17 +3754,13 @@ EXTRA_DIST += unistdio/u-vasprintf.h
## begin gnulib module unistdio/ulc-vfprintf
-if LIBUNISTRING_COMPILE_UNISTDIO_ULC_VFPRINTF
libunistring_la_SOURCES += unistdio/ulc-vfprintf.c
-endif
## end gnulib module unistdio/ulc-vfprintf
## begin gnulib module unistdio/ulc-vsnprintf
-if LIBUNISTRING_COMPILE_UNISTDIO_ULC_VSNPRINTF
libunistring_la_SOURCES += unistdio/ulc-vsnprintf.c
-endif
EXTRA_DIST += unistdio/u-vsnprintf.h
@@ -5257,9 +3768,7 @@ EXTRA_DIST += unistdio/u-vsnprintf.h
## begin gnulib module unistdio/ulc-vsprintf
-if LIBUNISTRING_COMPILE_UNISTDIO_ULC_VSPRINTF
libunistring_la_SOURCES += unistdio/ulc-vsprintf.c
-endif
EXTRA_DIST += unistdio/u-vsprintf.h
@@ -5267,49 +3776,32 @@ EXTRA_DIST += unistdio/u-vsprintf.h
## begin gnulib module unistr/base
-BUILT_SOURCES += $(LIBUNISTRING_UNISTR_H)
-unistr.h: unistr.in.h
- $(AM_V_GEN)rm -f $@-t $@ && \
- { echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \
- cat $(srcdir)/unistr.in.h; \
- } > $@-t && \
- mv -f $@-t $@
-MOSTLYCLEANFILES += unistr.h unistr.h-t
-
-EXTRA_DIST += unistr.in.h
+EXTRA_DIST += unistr.h
## end gnulib module unistr/base
## begin gnulib module unistr/u16-check
-if LIBUNISTRING_COMPILE_UNISTR_U16_CHECK
libunistring_la_SOURCES += unistr/u16-check.c
-endif
## end gnulib module unistr/u16-check
## begin gnulib module unistr/u16-chr
-if LIBUNISTRING_COMPILE_UNISTR_U16_CHR
libunistring_la_SOURCES += unistr/u16-chr.c
-endif
## end gnulib module unistr/u16-chr
## begin gnulib module unistr/u16-cmp
-if LIBUNISTRING_COMPILE_UNISTR_U16_CMP
libunistring_la_SOURCES += unistr/u16-cmp.c
-endif
## end gnulib module unistr/u16-cmp
## begin gnulib module unistr/u16-cmp2
-if LIBUNISTRING_COMPILE_UNISTR_U16_CMP2
libunistring_la_SOURCES += unistr/u16-cmp2.c
-endif
EXTRA_DIST += unistr/u-cmp2.h
@@ -5317,9 +3809,7 @@ EXTRA_DIST += unistr/u-cmp2.h
## begin gnulib module unistr/u16-cpy
-if LIBUNISTRING_COMPILE_UNISTR_U16_CPY
libunistring_la_SOURCES += unistr/u16-cpy.c
-endif
EXTRA_DIST += unistr/u-cpy.h
@@ -5327,9 +3817,7 @@ EXTRA_DIST += unistr/u-cpy.h
## begin gnulib module unistr/u16-cpy-alloc
-if LIBUNISTRING_COMPILE_UNISTR_U16_CPY_ALLOC
libunistring_la_SOURCES += unistr/u16-cpy-alloc.c
-endif
EXTRA_DIST += unistr/u-cpy-alloc.h
@@ -5337,9 +3825,7 @@ EXTRA_DIST += unistr/u-cpy-alloc.h
## begin gnulib module unistr/u16-endswith
-if LIBUNISTRING_COMPILE_UNISTR_U16_ENDSWITH
libunistring_la_SOURCES += unistr/u16-endswith.c
-endif
EXTRA_DIST += unistr/u-endswith.h
@@ -5347,49 +3833,37 @@ EXTRA_DIST += unistr/u-endswith.h
## begin gnulib module unistr/u16-mblen
-if LIBUNISTRING_COMPILE_UNISTR_U16_MBLEN
libunistring_la_SOURCES += unistr/u16-mblen.c
-endif
## end gnulib module unistr/u16-mblen
## begin gnulib module unistr/u16-mbsnlen
-if LIBUNISTRING_COMPILE_UNISTR_U16_MBSNLEN
libunistring_la_SOURCES += unistr/u16-mbsnlen.c
-endif
## end gnulib module unistr/u16-mbsnlen
## begin gnulib module unistr/u16-mbtouc
-if LIBUNISTRING_COMPILE_UNISTR_U16_MBTOUC
libunistring_la_SOURCES += unistr/u16-mbtouc.c unistr/u16-mbtouc-aux.c
-endif
## end gnulib module unistr/u16-mbtouc
## begin gnulib module unistr/u16-mbtouc-unsafe
-if LIBUNISTRING_COMPILE_UNISTR_U16_MBTOUC_UNSAFE
libunistring_la_SOURCES += unistr/u16-mbtouc-unsafe.c unistr/u16-mbtouc-unsafe-aux.c
-endif
## end gnulib module unistr/u16-mbtouc-unsafe
## begin gnulib module unistr/u16-mbtoucr
-if LIBUNISTRING_COMPILE_UNISTR_U16_MBTOUCR
libunistring_la_SOURCES += unistr/u16-mbtoucr.c
-endif
## end gnulib module unistr/u16-mbtoucr
## begin gnulib module unistr/u16-move
-if LIBUNISTRING_COMPILE_UNISTR_U16_MOVE
libunistring_la_SOURCES += unistr/u16-move.c
-endif
EXTRA_DIST += unistr/u-move.h
@@ -5397,25 +3871,19 @@ EXTRA_DIST += unistr/u-move.h
## begin gnulib module unistr/u16-next
-if LIBUNISTRING_COMPILE_UNISTR_U16_NEXT
libunistring_la_SOURCES += unistr/u16-next.c
-endif
## end gnulib module unistr/u16-next
## begin gnulib module unistr/u16-prev
-if LIBUNISTRING_COMPILE_UNISTR_U16_PREV
libunistring_la_SOURCES += unistr/u16-prev.c
-endif
## end gnulib module unistr/u16-prev
## begin gnulib module unistr/u16-set
-if LIBUNISTRING_COMPILE_UNISTR_U16_SET
libunistring_la_SOURCES += unistr/u16-set.c
-endif
EXTRA_DIST += unistr/u-set.h
@@ -5423,9 +3891,7 @@ EXTRA_DIST += unistr/u-set.h
## begin gnulib module unistr/u16-startswith
-if LIBUNISTRING_COMPILE_UNISTR_U16_STARTSWITH
libunistring_la_SOURCES += unistr/u16-startswith.c
-endif
EXTRA_DIST += unistr/u-startswith.h
@@ -5433,9 +3899,7 @@ EXTRA_DIST += unistr/u-startswith.h
## begin gnulib module unistr/u16-stpcpy
-if LIBUNISTRING_COMPILE_UNISTR_U16_STPCPY
libunistring_la_SOURCES += unistr/u16-stpcpy.c
-endif
EXTRA_DIST += unistr/u-stpcpy.h
@@ -5443,9 +3907,7 @@ EXTRA_DIST += unistr/u-stpcpy.h
## begin gnulib module unistr/u16-stpncpy
-if LIBUNISTRING_COMPILE_UNISTR_U16_STPNCPY
libunistring_la_SOURCES += unistr/u16-stpncpy.c
-endif
EXTRA_DIST += unistr/u-stpncpy.h
@@ -5453,9 +3915,7 @@ EXTRA_DIST += unistr/u-stpncpy.h
## begin gnulib module unistr/u16-strcat
-if LIBUNISTRING_COMPILE_UNISTR_U16_STRCAT
libunistring_la_SOURCES += unistr/u16-strcat.c
-endif
EXTRA_DIST += unistr/u-strcat.h
@@ -5463,25 +3923,19 @@ EXTRA_DIST += unistr/u-strcat.h
## begin gnulib module unistr/u16-strchr
-if LIBUNISTRING_COMPILE_UNISTR_U16_STRCHR
libunistring_la_SOURCES += unistr/u16-strchr.c
-endif
## end gnulib module unistr/u16-strchr
## begin gnulib module unistr/u16-strcmp
-if LIBUNISTRING_COMPILE_UNISTR_U16_STRCMP
libunistring_la_SOURCES += unistr/u16-strcmp.c
-endif
## end gnulib module unistr/u16-strcmp
## begin gnulib module unistr/u16-strcoll
-if LIBUNISTRING_COMPILE_UNISTR_U16_STRCOLL
libunistring_la_SOURCES += unistr/u16-strcoll.c
-endif
EXTRA_DIST += unistr/u-strcoll.h
@@ -5489,9 +3943,7 @@ EXTRA_DIST += unistr/u-strcoll.h
## begin gnulib module unistr/u16-strcpy
-if LIBUNISTRING_COMPILE_UNISTR_U16_STRCPY
libunistring_la_SOURCES += unistr/u16-strcpy.c
-endif
EXTRA_DIST += unistr/u-strcpy.h
@@ -5499,9 +3951,7 @@ EXTRA_DIST += unistr/u-strcpy.h
## begin gnulib module unistr/u16-strcspn
-if LIBUNISTRING_COMPILE_UNISTR_U16_STRCSPN
libunistring_la_SOURCES += unistr/u16-strcspn.c
-endif
EXTRA_DIST += unistr/u-strcspn.h
@@ -5509,9 +3959,7 @@ EXTRA_DIST += unistr/u-strcspn.h
## begin gnulib module unistr/u16-strdup
-if LIBUNISTRING_COMPILE_UNISTR_U16_STRDUP
libunistring_la_SOURCES += unistr/u16-strdup.c
-endif
EXTRA_DIST += unistr/u-strdup.h
@@ -5519,9 +3967,7 @@ EXTRA_DIST += unistr/u-strdup.h
## begin gnulib module unistr/u16-strlen
-if LIBUNISTRING_COMPILE_UNISTR_U16_STRLEN
libunistring_la_SOURCES += unistr/u16-strlen.c
-endif
EXTRA_DIST += unistr/u-strlen.h
@@ -5529,25 +3975,19 @@ EXTRA_DIST += unistr/u-strlen.h
## begin gnulib module unistr/u16-strmblen
-if LIBUNISTRING_COMPILE_UNISTR_U16_STRMBLEN
libunistring_la_SOURCES += unistr/u16-strmblen.c
-endif
## end gnulib module unistr/u16-strmblen
## begin gnulib module unistr/u16-strmbtouc
-if LIBUNISTRING_COMPILE_UNISTR_U16_STRMBTOUC
libunistring_la_SOURCES += unistr/u16-strmbtouc.c
-endif
## end gnulib module unistr/u16-strmbtouc
## begin gnulib module unistr/u16-strncat
-if LIBUNISTRING_COMPILE_UNISTR_U16_STRNCAT
libunistring_la_SOURCES += unistr/u16-strncat.c
-endif
EXTRA_DIST += unistr/u-strncat.h
@@ -5555,17 +3995,13 @@ EXTRA_DIST += unistr/u-strncat.h
## begin gnulib module unistr/u16-strncmp
-if LIBUNISTRING_COMPILE_UNISTR_U16_STRNCMP
libunistring_la_SOURCES += unistr/u16-strncmp.c
-endif
## end gnulib module unistr/u16-strncmp
## begin gnulib module unistr/u16-strncpy
-if LIBUNISTRING_COMPILE_UNISTR_U16_STRNCPY
libunistring_la_SOURCES += unistr/u16-strncpy.c
-endif
EXTRA_DIST += unistr/u-strncpy.h
@@ -5573,9 +4009,7 @@ EXTRA_DIST += unistr/u-strncpy.h
## begin gnulib module unistr/u16-strnlen
-if LIBUNISTRING_COMPILE_UNISTR_U16_STRNLEN
libunistring_la_SOURCES += unistr/u16-strnlen.c
-endif
EXTRA_DIST += unistr/u-strnlen.h
@@ -5583,9 +4017,7 @@ EXTRA_DIST += unistr/u-strnlen.h
## begin gnulib module unistr/u16-strpbrk
-if LIBUNISTRING_COMPILE_UNISTR_U16_STRPBRK
libunistring_la_SOURCES += unistr/u16-strpbrk.c
-endif
EXTRA_DIST += unistr/u-strpbrk.h
@@ -5593,17 +4025,13 @@ EXTRA_DIST += unistr/u-strpbrk.h
## begin gnulib module unistr/u16-strrchr
-if LIBUNISTRING_COMPILE_UNISTR_U16_STRRCHR
libunistring_la_SOURCES += unistr/u16-strrchr.c
-endif
## end gnulib module unistr/u16-strrchr
## begin gnulib module unistr/u16-strspn
-if LIBUNISTRING_COMPILE_UNISTR_U16_STRSPN
libunistring_la_SOURCES += unistr/u16-strspn.c
-endif
EXTRA_DIST += unistr/u-strspn.h
@@ -5611,19 +4039,15 @@ EXTRA_DIST += unistr/u-strspn.h
## begin gnulib module unistr/u16-strstr
-if LIBUNISTRING_COMPILE_UNISTR_U16_STRSTR
libunistring_la_SOURCES += unistr/u16-strstr.c
-endif
-EXTRA_DIST += str-kmp.h unistr/u-strstr.h
+EXTRA_DIST += unistr/u-strstr.h
## end gnulib module unistr/u16-strstr
## begin gnulib module unistr/u16-strtok
-if LIBUNISTRING_COMPILE_UNISTR_U16_STRTOK
libunistring_la_SOURCES += unistr/u16-strtok.c
-endif
EXTRA_DIST += unistr/u-strtok.h
@@ -5631,57 +4055,43 @@ EXTRA_DIST += unistr/u-strtok.h
## begin gnulib module unistr/u16-to-u32
-if LIBUNISTRING_COMPILE_UNISTR_U16_TO_U32
libunistring_la_SOURCES += unistr/u16-to-u32.c
-endif
## end gnulib module unistr/u16-to-u32
## begin gnulib module unistr/u16-to-u8
-if LIBUNISTRING_COMPILE_UNISTR_U16_TO_U8
libunistring_la_SOURCES += unistr/u16-to-u8.c
-endif
## end gnulib module unistr/u16-to-u8
## begin gnulib module unistr/u16-uctomb
-if LIBUNISTRING_COMPILE_UNISTR_U16_UCTOMB
libunistring_la_SOURCES += unistr/u16-uctomb.c unistr/u16-uctomb-aux.c
-endif
## end gnulib module unistr/u16-uctomb
## begin gnulib module unistr/u32-check
-if LIBUNISTRING_COMPILE_UNISTR_U32_CHECK
libunistring_la_SOURCES += unistr/u32-check.c
-endif
## end gnulib module unistr/u32-check
## begin gnulib module unistr/u32-chr
-if LIBUNISTRING_COMPILE_UNISTR_U32_CHR
libunistring_la_SOURCES += unistr/u32-chr.c
-endif
## end gnulib module unistr/u32-chr
## begin gnulib module unistr/u32-cmp
-if LIBUNISTRING_COMPILE_UNISTR_U32_CMP
libunistring_la_SOURCES += unistr/u32-cmp.c
-endif
## end gnulib module unistr/u32-cmp
## begin gnulib module unistr/u32-cmp2
-if LIBUNISTRING_COMPILE_UNISTR_U32_CMP2
libunistring_la_SOURCES += unistr/u32-cmp2.c
-endif
EXTRA_DIST += unistr/u-cmp2.h
@@ -5689,9 +4099,7 @@ EXTRA_DIST += unistr/u-cmp2.h
## begin gnulib module unistr/u32-cpy
-if LIBUNISTRING_COMPILE_UNISTR_U32_CPY
libunistring_la_SOURCES += unistr/u32-cpy.c
-endif
EXTRA_DIST += unistr/u-cpy.h
@@ -5699,9 +4107,7 @@ EXTRA_DIST += unistr/u-cpy.h
## begin gnulib module unistr/u32-cpy-alloc
-if LIBUNISTRING_COMPILE_UNISTR_U32_CPY_ALLOC
libunistring_la_SOURCES += unistr/u32-cpy-alloc.c
-endif
EXTRA_DIST += unistr/u-cpy-alloc.h
@@ -5709,9 +4115,7 @@ EXTRA_DIST += unistr/u-cpy-alloc.h
## begin gnulib module unistr/u32-endswith
-if LIBUNISTRING_COMPILE_UNISTR_U32_ENDSWITH
libunistring_la_SOURCES += unistr/u32-endswith.c
-endif
EXTRA_DIST += unistr/u-endswith.h
@@ -5719,49 +4123,37 @@ EXTRA_DIST += unistr/u-endswith.h
## begin gnulib module unistr/u32-mblen
-if LIBUNISTRING_COMPILE_UNISTR_U32_MBLEN
libunistring_la_SOURCES += unistr/u32-mblen.c
-endif
## end gnulib module unistr/u32-mblen
## begin gnulib module unistr/u32-mbsnlen
-if LIBUNISTRING_COMPILE_UNISTR_U32_MBSNLEN
libunistring_la_SOURCES += unistr/u32-mbsnlen.c
-endif
## end gnulib module unistr/u32-mbsnlen
## begin gnulib module unistr/u32-mbtouc
-if LIBUNISTRING_COMPILE_UNISTR_U32_MBTOUC
libunistring_la_SOURCES += unistr/u32-mbtouc.c
-endif
## end gnulib module unistr/u32-mbtouc
## begin gnulib module unistr/u32-mbtouc-unsafe
-if LIBUNISTRING_COMPILE_UNISTR_U32_MBTOUC_UNSAFE
libunistring_la_SOURCES += unistr/u32-mbtouc-unsafe.c
-endif
## end gnulib module unistr/u32-mbtouc-unsafe
## begin gnulib module unistr/u32-mbtoucr
-if LIBUNISTRING_COMPILE_UNISTR_U32_MBTOUCR
libunistring_la_SOURCES += unistr/u32-mbtoucr.c
-endif
## end gnulib module unistr/u32-mbtoucr
## begin gnulib module unistr/u32-move
-if LIBUNISTRING_COMPILE_UNISTR_U32_MOVE
libunistring_la_SOURCES += unistr/u32-move.c
-endif
EXTRA_DIST += unistr/u-move.h
@@ -5769,25 +4161,19 @@ EXTRA_DIST += unistr/u-move.h
## begin gnulib module unistr/u32-next
-if LIBUNISTRING_COMPILE_UNISTR_U32_NEXT
libunistring_la_SOURCES += unistr/u32-next.c
-endif
## end gnulib module unistr/u32-next
## begin gnulib module unistr/u32-prev
-if LIBUNISTRING_COMPILE_UNISTR_U32_PREV
libunistring_la_SOURCES += unistr/u32-prev.c
-endif
## end gnulib module unistr/u32-prev
## begin gnulib module unistr/u32-set
-if LIBUNISTRING_COMPILE_UNISTR_U32_SET
libunistring_la_SOURCES += unistr/u32-set.c
-endif
EXTRA_DIST += unistr/u-set.h
@@ -5795,9 +4181,7 @@ EXTRA_DIST += unistr/u-set.h
## begin gnulib module unistr/u32-startswith
-if LIBUNISTRING_COMPILE_UNISTR_U32_STARTSWITH
libunistring_la_SOURCES += unistr/u32-startswith.c
-endif
EXTRA_DIST += unistr/u-startswith.h
@@ -5805,9 +4189,7 @@ EXTRA_DIST += unistr/u-startswith.h
## begin gnulib module unistr/u32-stpcpy
-if LIBUNISTRING_COMPILE_UNISTR_U32_STPCPY
libunistring_la_SOURCES += unistr/u32-stpcpy.c
-endif
EXTRA_DIST += unistr/u-stpcpy.h
@@ -5815,9 +4197,7 @@ EXTRA_DIST += unistr/u-stpcpy.h
## begin gnulib module unistr/u32-stpncpy
-if LIBUNISTRING_COMPILE_UNISTR_U32_STPNCPY
libunistring_la_SOURCES += unistr/u32-stpncpy.c
-endif
EXTRA_DIST += unistr/u-stpncpy.h
@@ -5825,9 +4205,7 @@ EXTRA_DIST += unistr/u-stpncpy.h
## begin gnulib module unistr/u32-strcat
-if LIBUNISTRING_COMPILE_UNISTR_U32_STRCAT
libunistring_la_SOURCES += unistr/u32-strcat.c
-endif
EXTRA_DIST += unistr/u-strcat.h
@@ -5835,25 +4213,19 @@ EXTRA_DIST += unistr/u-strcat.h
## begin gnulib module unistr/u32-strchr
-if LIBUNISTRING_COMPILE_UNISTR_U32_STRCHR
libunistring_la_SOURCES += unistr/u32-strchr.c
-endif
## end gnulib module unistr/u32-strchr
## begin gnulib module unistr/u32-strcmp
-if LIBUNISTRING_COMPILE_UNISTR_U32_STRCMP
libunistring_la_SOURCES += unistr/u32-strcmp.c
-endif
## end gnulib module unistr/u32-strcmp
## begin gnulib module unistr/u32-strcoll
-if LIBUNISTRING_COMPILE_UNISTR_U32_STRCOLL
libunistring_la_SOURCES += unistr/u32-strcoll.c
-endif
EXTRA_DIST += unistr/u-strcoll.h
@@ -5861,9 +4233,7 @@ EXTRA_DIST += unistr/u-strcoll.h
## begin gnulib module unistr/u32-strcpy
-if LIBUNISTRING_COMPILE_UNISTR_U32_STRCPY
libunistring_la_SOURCES += unistr/u32-strcpy.c
-endif
EXTRA_DIST += unistr/u-strcpy.h
@@ -5871,17 +4241,13 @@ EXTRA_DIST += unistr/u-strcpy.h
## begin gnulib module unistr/u32-strcspn
-if LIBUNISTRING_COMPILE_UNISTR_U32_STRCSPN
libunistring_la_SOURCES += unistr/u32-strcspn.c
-endif
## end gnulib module unistr/u32-strcspn
## begin gnulib module unistr/u32-strdup
-if LIBUNISTRING_COMPILE_UNISTR_U32_STRDUP
libunistring_la_SOURCES += unistr/u32-strdup.c
-endif
EXTRA_DIST += unistr/u-strdup.h
@@ -5889,9 +4255,7 @@ EXTRA_DIST += unistr/u-strdup.h
## begin gnulib module unistr/u32-strlen
-if LIBUNISTRING_COMPILE_UNISTR_U32_STRLEN
libunistring_la_SOURCES += unistr/u32-strlen.c
-endif
EXTRA_DIST += unistr/u-strlen.h
@@ -5899,25 +4263,19 @@ EXTRA_DIST += unistr/u-strlen.h
## begin gnulib module unistr/u32-strmblen
-if LIBUNISTRING_COMPILE_UNISTR_U32_STRMBLEN
libunistring_la_SOURCES += unistr/u32-strmblen.c
-endif
## end gnulib module unistr/u32-strmblen
## begin gnulib module unistr/u32-strmbtouc
-if LIBUNISTRING_COMPILE_UNISTR_U32_STRMBTOUC
libunistring_la_SOURCES += unistr/u32-strmbtouc.c
-endif
## end gnulib module unistr/u32-strmbtouc
## begin gnulib module unistr/u32-strncat
-if LIBUNISTRING_COMPILE_UNISTR_U32_STRNCAT
libunistring_la_SOURCES += unistr/u32-strncat.c
-endif
EXTRA_DIST += unistr/u-strncat.h
@@ -5925,17 +4283,13 @@ EXTRA_DIST += unistr/u-strncat.h
## begin gnulib module unistr/u32-strncmp
-if LIBUNISTRING_COMPILE_UNISTR_U32_STRNCMP
libunistring_la_SOURCES += unistr/u32-strncmp.c
-endif
## end gnulib module unistr/u32-strncmp
## begin gnulib module unistr/u32-strncpy
-if LIBUNISTRING_COMPILE_UNISTR_U32_STRNCPY
libunistring_la_SOURCES += unistr/u32-strncpy.c
-endif
EXTRA_DIST += unistr/u-strncpy.h
@@ -5943,9 +4297,7 @@ EXTRA_DIST += unistr/u-strncpy.h
## begin gnulib module unistr/u32-strnlen
-if LIBUNISTRING_COMPILE_UNISTR_U32_STRNLEN
libunistring_la_SOURCES += unistr/u32-strnlen.c
-endif
EXTRA_DIST += unistr/u-strnlen.h
@@ -5953,43 +4305,33 @@ EXTRA_DIST += unistr/u-strnlen.h
## begin gnulib module unistr/u32-strpbrk
-if LIBUNISTRING_COMPILE_UNISTR_U32_STRPBRK
libunistring_la_SOURCES += unistr/u32-strpbrk.c
-endif
## end gnulib module unistr/u32-strpbrk
## begin gnulib module unistr/u32-strrchr
-if LIBUNISTRING_COMPILE_UNISTR_U32_STRRCHR
libunistring_la_SOURCES += unistr/u32-strrchr.c
-endif
## end gnulib module unistr/u32-strrchr
## begin gnulib module unistr/u32-strspn
-if LIBUNISTRING_COMPILE_UNISTR_U32_STRSPN
libunistring_la_SOURCES += unistr/u32-strspn.c
-endif
## end gnulib module unistr/u32-strspn
## begin gnulib module unistr/u32-strstr
-if LIBUNISTRING_COMPILE_UNISTR_U32_STRSTR
libunistring_la_SOURCES += unistr/u32-strstr.c
-endif
-EXTRA_DIST += str-kmp.h unistr/u-strstr.h
+EXTRA_DIST += unistr/u-strstr.h
## end gnulib module unistr/u32-strstr
## begin gnulib module unistr/u32-strtok
-if LIBUNISTRING_COMPILE_UNISTR_U32_STRTOK
libunistring_la_SOURCES += unistr/u32-strtok.c
-endif
EXTRA_DIST += unistr/u-strtok.h
@@ -5997,57 +4339,43 @@ EXTRA_DIST += unistr/u-strtok.h
## begin gnulib module unistr/u32-to-u16
-if LIBUNISTRING_COMPILE_UNISTR_U32_TO_U16
libunistring_la_SOURCES += unistr/u32-to-u16.c
-endif
## end gnulib module unistr/u32-to-u16
## begin gnulib module unistr/u32-to-u8
-if LIBUNISTRING_COMPILE_UNISTR_U32_TO_U8
libunistring_la_SOURCES += unistr/u32-to-u8.c
-endif
## end gnulib module unistr/u32-to-u8
## begin gnulib module unistr/u32-uctomb
-if LIBUNISTRING_COMPILE_UNISTR_U32_UCTOMB
libunistring_la_SOURCES += unistr/u32-uctomb.c
-endif
## end gnulib module unistr/u32-uctomb
## begin gnulib module unistr/u8-check
-if LIBUNISTRING_COMPILE_UNISTR_U8_CHECK
libunistring_la_SOURCES += unistr/u8-check.c
-endif
## end gnulib module unistr/u8-check
## begin gnulib module unistr/u8-chr
-if LIBUNISTRING_COMPILE_UNISTR_U8_CHR
libunistring_la_SOURCES += unistr/u8-chr.c
-endif
## end gnulib module unistr/u8-chr
## begin gnulib module unistr/u8-cmp
-if LIBUNISTRING_COMPILE_UNISTR_U8_CMP
libunistring_la_SOURCES += unistr/u8-cmp.c
-endif
## end gnulib module unistr/u8-cmp
## begin gnulib module unistr/u8-cmp2
-if LIBUNISTRING_COMPILE_UNISTR_U8_CMP2
libunistring_la_SOURCES += unistr/u8-cmp2.c
-endif
EXTRA_DIST += unistr/u-cmp2.h
@@ -6055,9 +4383,7 @@ EXTRA_DIST += unistr/u-cmp2.h
## begin gnulib module unistr/u8-cpy
-if LIBUNISTRING_COMPILE_UNISTR_U8_CPY
libunistring_la_SOURCES += unistr/u8-cpy.c
-endif
EXTRA_DIST += unistr/u-cpy.h
@@ -6065,9 +4391,7 @@ EXTRA_DIST += unistr/u-cpy.h
## begin gnulib module unistr/u8-cpy-alloc
-if LIBUNISTRING_COMPILE_UNISTR_U8_CPY_ALLOC
libunistring_la_SOURCES += unistr/u8-cpy-alloc.c
-endif
EXTRA_DIST += unistr/u-cpy-alloc.h
@@ -6075,9 +4399,7 @@ EXTRA_DIST += unistr/u-cpy-alloc.h
## begin gnulib module unistr/u8-endswith
-if LIBUNISTRING_COMPILE_UNISTR_U8_ENDSWITH
libunistring_la_SOURCES += unistr/u8-endswith.c
-endif
EXTRA_DIST += unistr/u-endswith.h
@@ -6085,49 +4407,37 @@ EXTRA_DIST += unistr/u-endswith.h
## begin gnulib module unistr/u8-mblen
-if LIBUNISTRING_COMPILE_UNISTR_U8_MBLEN
libunistring_la_SOURCES += unistr/u8-mblen.c
-endif
## end gnulib module unistr/u8-mblen
## begin gnulib module unistr/u8-mbsnlen
-if LIBUNISTRING_COMPILE_UNISTR_U8_MBSNLEN
libunistring_la_SOURCES += unistr/u8-mbsnlen.c
-endif
## end gnulib module unistr/u8-mbsnlen
## begin gnulib module unistr/u8-mbtouc
-if LIBUNISTRING_COMPILE_UNISTR_U8_MBTOUC
libunistring_la_SOURCES += unistr/u8-mbtouc.c unistr/u8-mbtouc-aux.c
-endif
## end gnulib module unistr/u8-mbtouc
## begin gnulib module unistr/u8-mbtouc-unsafe
-if LIBUNISTRING_COMPILE_UNISTR_U8_MBTOUC_UNSAFE
libunistring_la_SOURCES += unistr/u8-mbtouc-unsafe.c unistr/u8-mbtouc-unsafe-aux.c
-endif
## end gnulib module unistr/u8-mbtouc-unsafe
## begin gnulib module unistr/u8-mbtoucr
-if LIBUNISTRING_COMPILE_UNISTR_U8_MBTOUCR
libunistring_la_SOURCES += unistr/u8-mbtoucr.c
-endif
## end gnulib module unistr/u8-mbtoucr
## begin gnulib module unistr/u8-move
-if LIBUNISTRING_COMPILE_UNISTR_U8_MOVE
libunistring_la_SOURCES += unistr/u8-move.c
-endif
EXTRA_DIST += unistr/u-move.h
@@ -6135,33 +4445,25 @@ EXTRA_DIST += unistr/u-move.h
## begin gnulib module unistr/u8-next
-if LIBUNISTRING_COMPILE_UNISTR_U8_NEXT
libunistring_la_SOURCES += unistr/u8-next.c
-endif
## end gnulib module unistr/u8-next
## begin gnulib module unistr/u8-prev
-if LIBUNISTRING_COMPILE_UNISTR_U8_PREV
libunistring_la_SOURCES += unistr/u8-prev.c
-endif
## end gnulib module unistr/u8-prev
## begin gnulib module unistr/u8-set
-if LIBUNISTRING_COMPILE_UNISTR_U8_SET
libunistring_la_SOURCES += unistr/u8-set.c
-endif
## end gnulib module unistr/u8-set
## begin gnulib module unistr/u8-startswith
-if LIBUNISTRING_COMPILE_UNISTR_U8_STARTSWITH
libunistring_la_SOURCES += unistr/u8-startswith.c
-endif
EXTRA_DIST += unistr/u-startswith.h
@@ -6169,9 +4471,7 @@ EXTRA_DIST += unistr/u-startswith.h
## begin gnulib module unistr/u8-stpcpy
-if LIBUNISTRING_COMPILE_UNISTR_U8_STPCPY
libunistring_la_SOURCES += unistr/u8-stpcpy.c
-endif
EXTRA_DIST += unistr/u-stpcpy.h
@@ -6179,9 +4479,7 @@ EXTRA_DIST += unistr/u-stpcpy.h
## begin gnulib module unistr/u8-stpncpy
-if LIBUNISTRING_COMPILE_UNISTR_U8_STPNCPY
libunistring_la_SOURCES += unistr/u8-stpncpy.c
-endif
EXTRA_DIST += unistr/u-stpncpy.h
@@ -6189,33 +4487,25 @@ EXTRA_DIST += unistr/u-stpncpy.h
## begin gnulib module unistr/u8-strcat
-if LIBUNISTRING_COMPILE_UNISTR_U8_STRCAT
libunistring_la_SOURCES += unistr/u8-strcat.c
-endif
## end gnulib module unistr/u8-strcat
## begin gnulib module unistr/u8-strchr
-if LIBUNISTRING_COMPILE_UNISTR_U8_STRCHR
libunistring_la_SOURCES += unistr/u8-strchr.c
-endif
## end gnulib module unistr/u8-strchr
## begin gnulib module unistr/u8-strcmp
-if LIBUNISTRING_COMPILE_UNISTR_U8_STRCMP
libunistring_la_SOURCES += unistr/u8-strcmp.c
-endif
## end gnulib module unistr/u8-strcmp
## begin gnulib module unistr/u8-strcoll
-if LIBUNISTRING_COMPILE_UNISTR_U8_STRCOLL
libunistring_la_SOURCES += unistr/u8-strcoll.c
-endif
EXTRA_DIST += unistr/u-strcoll.h
@@ -6223,17 +4513,13 @@ EXTRA_DIST += unistr/u-strcoll.h
## begin gnulib module unistr/u8-strcpy
-if LIBUNISTRING_COMPILE_UNISTR_U8_STRCPY
libunistring_la_SOURCES += unistr/u8-strcpy.c
-endif
## end gnulib module unistr/u8-strcpy
## begin gnulib module unistr/u8-strcspn
-if LIBUNISTRING_COMPILE_UNISTR_U8_STRCSPN
libunistring_la_SOURCES += unistr/u8-strcspn.c
-endif
EXTRA_DIST += unistr/u-strcspn.h
@@ -6241,9 +4527,7 @@ EXTRA_DIST += unistr/u-strcspn.h
## begin gnulib module unistr/u8-strdup
-if LIBUNISTRING_COMPILE_UNISTR_U8_STRDUP
libunistring_la_SOURCES += unistr/u8-strdup.c
-endif
EXTRA_DIST += unistr/u-strdup.h
@@ -6251,57 +4535,43 @@ EXTRA_DIST += unistr/u-strdup.h
## begin gnulib module unistr/u8-strlen
-if LIBUNISTRING_COMPILE_UNISTR_U8_STRLEN
libunistring_la_SOURCES += unistr/u8-strlen.c
-endif
## end gnulib module unistr/u8-strlen
## begin gnulib module unistr/u8-strmblen
-if LIBUNISTRING_COMPILE_UNISTR_U8_STRMBLEN
libunistring_la_SOURCES += unistr/u8-strmblen.c
-endif
## end gnulib module unistr/u8-strmblen
## begin gnulib module unistr/u8-strmbtouc
-if LIBUNISTRING_COMPILE_UNISTR_U8_STRMBTOUC
libunistring_la_SOURCES += unistr/u8-strmbtouc.c
-endif
## end gnulib module unistr/u8-strmbtouc
## begin gnulib module unistr/u8-strncat
-if LIBUNISTRING_COMPILE_UNISTR_U8_STRNCAT
libunistring_la_SOURCES += unistr/u8-strncat.c
-endif
## end gnulib module unistr/u8-strncat
## begin gnulib module unistr/u8-strncmp
-if LIBUNISTRING_COMPILE_UNISTR_U8_STRNCMP
libunistring_la_SOURCES += unistr/u8-strncmp.c
-endif
## end gnulib module unistr/u8-strncmp
## begin gnulib module unistr/u8-strncpy
-if LIBUNISTRING_COMPILE_UNISTR_U8_STRNCPY
libunistring_la_SOURCES += unistr/u8-strncpy.c
-endif
## end gnulib module unistr/u8-strncpy
## begin gnulib module unistr/u8-strnlen
-if LIBUNISTRING_COMPILE_UNISTR_U8_STRNLEN
libunistring_la_SOURCES += unistr/u8-strnlen.c
-endif
EXTRA_DIST += unistr/u-strnlen.h
@@ -6309,9 +4579,7 @@ EXTRA_DIST += unistr/u-strnlen.h
## begin gnulib module unistr/u8-strpbrk
-if LIBUNISTRING_COMPILE_UNISTR_U8_STRPBRK
libunistring_la_SOURCES += unistr/u8-strpbrk.c
-endif
EXTRA_DIST += unistr/u-strpbrk.h
@@ -6319,17 +4587,13 @@ EXTRA_DIST += unistr/u-strpbrk.h
## begin gnulib module unistr/u8-strrchr
-if LIBUNISTRING_COMPILE_UNISTR_U8_STRRCHR
libunistring_la_SOURCES += unistr/u8-strrchr.c
-endif
## end gnulib module unistr/u8-strrchr
## begin gnulib module unistr/u8-strspn
-if LIBUNISTRING_COMPILE_UNISTR_U8_STRSPN
libunistring_la_SOURCES += unistr/u8-strspn.c
-endif
EXTRA_DIST += unistr/u-strspn.h
@@ -6337,9 +4601,7 @@ EXTRA_DIST += unistr/u-strspn.h
## begin gnulib module unistr/u8-strstr
-if LIBUNISTRING_COMPILE_UNISTR_U8_STRSTR
libunistring_la_SOURCES += unistr/u8-strstr.c
-endif
EXTRA_DIST += unistr/u-strstr.h
@@ -6347,9 +4609,7 @@ EXTRA_DIST += unistr/u-strstr.h
## begin gnulib module unistr/u8-strtok
-if LIBUNISTRING_COMPILE_UNISTR_U8_STRTOK
libunistring_la_SOURCES += unistr/u8-strtok.c
-endif
EXTRA_DIST += unistr/u-strtok.h
@@ -6357,57 +4617,33 @@ EXTRA_DIST += unistr/u-strtok.h
## begin gnulib module unistr/u8-to-u16
-if LIBUNISTRING_COMPILE_UNISTR_U8_TO_U16
libunistring_la_SOURCES += unistr/u8-to-u16.c
-endif
## end gnulib module unistr/u8-to-u16
## begin gnulib module unistr/u8-to-u32
-if LIBUNISTRING_COMPILE_UNISTR_U8_TO_U32
libunistring_la_SOURCES += unistr/u8-to-u32.c
-endif
## end gnulib module unistr/u8-to-u32
## begin gnulib module unistr/u8-uctomb
-if LIBUNISTRING_COMPILE_UNISTR_U8_UCTOMB
libunistring_la_SOURCES += unistr/u8-uctomb.c unistr/u8-uctomb-aux.c
-endif
## end gnulib module unistr/u8-uctomb
## begin gnulib module unitypes
-BUILT_SOURCES += $(LIBUNISTRING_UNITYPES_H)
-
-unitypes.h: unitypes.in.h
- $(AM_V_GEN)rm -f $@-t $@ && \
- { echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \
- cat $(srcdir)/unitypes.in.h; \
- } > $@-t && \
- mv -f $@-t $@
-MOSTLYCLEANFILES += unitypes.h unitypes.h-t
-EXTRA_DIST += unitypes.in.h
+EXTRA_DIST += unitypes.h
## end gnulib module unitypes
## begin gnulib module uniwbrk/base
-BUILT_SOURCES += $(LIBUNISTRING_UNIWBRK_H)
-uniwbrk.h: uniwbrk.in.h
- $(AM_V_GEN)rm -f $@-t $@ && \
- { echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \
- cat $(srcdir)/uniwbrk.in.h; \
- } > $@-t && \
- mv -f $@-t $@
-MOSTLYCLEANFILES += uniwbrk.h uniwbrk.h-t
-
-EXTRA_DIST += uniwbrk.in.h
+EXTRA_DIST += uniwbrk.h
## end gnulib module uniwbrk/base
@@ -6421,9 +4657,7 @@ EXTRA_DIST += uniwbrk/wbrktable.h
## begin gnulib module uniwbrk/u16-wordbreaks
-if LIBUNISTRING_COMPILE_UNIWBRK_U16_WORDBREAKS
libunistring_la_SOURCES += uniwbrk/u16-wordbreaks.c
-endif
EXTRA_DIST += uniwbrk/u-wordbreaks.h
@@ -6431,9 +4665,7 @@ EXTRA_DIST += uniwbrk/u-wordbreaks.h
## begin gnulib module uniwbrk/u32-wordbreaks
-if LIBUNISTRING_COMPILE_UNIWBRK_U32_WORDBREAKS
libunistring_la_SOURCES += uniwbrk/u32-wordbreaks.c
-endif
EXTRA_DIST += uniwbrk/u-wordbreaks.h
@@ -6441,9 +4673,7 @@ EXTRA_DIST += uniwbrk/u-wordbreaks.h
## begin gnulib module uniwbrk/u8-wordbreaks
-if LIBUNISTRING_COMPILE_UNIWBRK_U8_WORDBREAKS
libunistring_la_SOURCES += uniwbrk/u8-wordbreaks.c
-endif
EXTRA_DIST += uniwbrk/u-wordbreaks.h
@@ -6451,17 +4681,13 @@ EXTRA_DIST += uniwbrk/u-wordbreaks.h
## begin gnulib module uniwbrk/ulc-wordbreaks
-if LIBUNISTRING_COMPILE_UNIWBRK_ULC_WORDBREAKS
libunistring_la_SOURCES += uniwbrk/ulc-wordbreaks.c
-endif
## end gnulib module uniwbrk/ulc-wordbreaks
## begin gnulib module uniwbrk/wordbreak-property
-if LIBUNISTRING_COMPILE_UNIWBRK_WORDBREAK_PROPERTY
libunistring_la_SOURCES += uniwbrk/wordbreak-property.c
-endif
EXTRA_DIST += uniwbrk/wbrkprop.h
@@ -6469,142 +4695,130 @@ EXTRA_DIST += uniwbrk/wbrkprop.h
## begin gnulib module uniwidth/base
-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
-
-EXTRA_DIST += localcharset.h uniwidth.in.h
+EXTRA_DIST += localcharset.h uniwidth.h
## end gnulib module uniwidth/base
## begin gnulib module uniwidth/u16-strwidth
-if LIBUNISTRING_COMPILE_UNIWIDTH_U16_STRWIDTH
libunistring_la_SOURCES += uniwidth/u16-strwidth.c
-endif
## end gnulib module uniwidth/u16-strwidth
## begin gnulib module uniwidth/u16-width
-if LIBUNISTRING_COMPILE_UNIWIDTH_U16_WIDTH
libunistring_la_SOURCES += uniwidth/u16-width.c
-endif
## end gnulib module uniwidth/u16-width
## begin gnulib module uniwidth/u32-strwidth
-if LIBUNISTRING_COMPILE_UNIWIDTH_U32_STRWIDTH
libunistring_la_SOURCES += uniwidth/u32-strwidth.c
-endif
## end gnulib module uniwidth/u32-strwidth
## begin gnulib module uniwidth/u32-width
-if LIBUNISTRING_COMPILE_UNIWIDTH_U32_WIDTH
libunistring_la_SOURCES += uniwidth/u32-width.c
-endif
## end gnulib module uniwidth/u32-width
## begin gnulib module uniwidth/u8-strwidth
-if LIBUNISTRING_COMPILE_UNIWIDTH_U8_STRWIDTH
libunistring_la_SOURCES += uniwidth/u8-strwidth.c
-endif
## end gnulib module uniwidth/u8-strwidth
## begin gnulib module uniwidth/u8-width
-if LIBUNISTRING_COMPILE_UNIWIDTH_U8_WIDTH
libunistring_la_SOURCES += uniwidth/u8-width.c
-endif
## end gnulib module uniwidth/u8-width
## begin gnulib module uniwidth/width
-if LIBUNISTRING_COMPILE_UNIWIDTH_WIDTH
libunistring_la_SOURCES += uniwidth/width.c
-endif
EXTRA_DIST += uniwidth/cjk.h
## end gnulib module uniwidth/width
-## begin gnulib module verify
+## begin gnulib module unused-parameter
+# The BUILT_SOURCES created by this Makefile snippet are not used via #include
+# statements but through direct file reference. Therefore this snippet must be
+# present in all Makefile.am that need it. This is ensured by the applicability
+# 'all' defined above.
-EXTRA_DIST += verify.h
+BUILT_SOURCES += unused-parameter.h
+# The unused-parameter.h that gets inserted into generated .h files is the same
+# as build-aux/unused-parameter.h, except that it has the copyright header cut
+# off.
+unused-parameter.h: $(top_srcdir)/build-aux/unused-parameter.h
+ $(AM_V_GEN)rm -f $@-t $@ && \
+ sed -n -e '/GL_UNUSED_PARAMETER/,$$p' \
+ < $(top_srcdir)/build-aux/unused-parameter.h \
+ > $@-t && \
+ mv $@-t $@
+MOSTLYCLEANFILES += unused-parameter.h unused-parameter.h-t
+
+UNUSED_PARAMETER_H=unused-parameter.h
+
+EXTRA_DIST += $(top_srcdir)/build-aux/unused-parameter.h
+
+## end gnulib module unused-parameter
+
+## begin gnulib module verify
+
+libunistring_la_SOURCES += verify.h
## end gnulib module verify
+## begin gnulib module warn-on-use
+
+BUILT_SOURCES += warn-on-use.h
+# The warn-on-use.h that gets inserted into generated .h files is the same as
+# build-aux/warn-on-use.h, except that it has the copyright header cut off.
+warn-on-use.h: $(top_srcdir)/build-aux/warn-on-use.h
+ $(AM_V_GEN)rm -f $@-t $@ && \
+ sed -n -e '/^.ifndef/,$$p' \
+ < $(top_srcdir)/build-aux/warn-on-use.h \
+ > $@-t && \
+ mv $@-t $@
+MOSTLYCLEANFILES += warn-on-use.h warn-on-use.h-t
+
+WARN_ON_USE_H=warn-on-use.h
+
+EXTRA_DIST += $(top_srcdir)/build-aux/warn-on-use.h
+
+## end gnulib module warn-on-use
+
## begin gnulib module wchar
BUILT_SOURCES += wchar.h
# We need the following in order to create <wchar.h> when the system
# version does not work standalone.
-wchar.h: wchar.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(ARG_NONNULL_H) $(WARN_ON_USE_H)
+wchar.h: wchar.in.h $(CXXDEFS_H) $(ARG_NONNULL_H) $(WARN_ON_USE_H)
$(AM_V_GEN)rm -f $@-t $@ && \
{ echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \
- sed -e 's|@''GUARD_PREFIX''@|GL|g' \
- -e 's|@''INCLUDE_NEXT''@|$(INCLUDE_NEXT)|g' \
+ sed -e 's|@''INCLUDE_NEXT''@|$(INCLUDE_NEXT)|g' \
-e 's|@''PRAGMA_SYSTEM_HEADER''@|@PRAGMA_SYSTEM_HEADER@|g' \
- -e 's|@''PRAGMA_COLUMNS''@|@PRAGMA_COLUMNS@|g' \
- -e 's|@''HAVE_FEATURES_H''@|$(HAVE_FEATURES_H)|g' \
-e 's|@''NEXT_WCHAR_H''@|$(NEXT_WCHAR_H)|g' \
-e 's|@''HAVE_WCHAR_H''@|$(HAVE_WCHAR_H)|g' \
- -e 's/@''GNULIB_BTOWC''@/$(GNULIB_BTOWC)/g' \
- -e 's/@''GNULIB_WCTOB''@/$(GNULIB_WCTOB)/g' \
- -e 's/@''GNULIB_MBSINIT''@/$(GNULIB_MBSINIT)/g' \
- -e 's/@''GNULIB_MBRTOWC''@/$(GNULIB_MBRTOWC)/g' \
- -e 's/@''GNULIB_MBRLEN''@/$(GNULIB_MBRLEN)/g' \
- -e 's/@''GNULIB_MBSRTOWCS''@/$(GNULIB_MBSRTOWCS)/g' \
- -e 's/@''GNULIB_MBSNRTOWCS''@/$(GNULIB_MBSNRTOWCS)/g' \
- -e 's/@''GNULIB_WCRTOMB''@/$(GNULIB_WCRTOMB)/g' \
- -e 's/@''GNULIB_WCSRTOMBS''@/$(GNULIB_WCSRTOMBS)/g' \
- -e 's/@''GNULIB_WCSNRTOMBS''@/$(GNULIB_WCSNRTOMBS)/g' \
- -e 's/@''GNULIB_WCWIDTH''@/$(GNULIB_WCWIDTH)/g' \
- -e 's/@''GNULIB_WMEMCHR''@/$(GNULIB_WMEMCHR)/g' \
- -e 's/@''GNULIB_WMEMCMP''@/$(GNULIB_WMEMCMP)/g' \
- -e 's/@''GNULIB_WMEMCPY''@/$(GNULIB_WMEMCPY)/g' \
- -e 's/@''GNULIB_WMEMMOVE''@/$(GNULIB_WMEMMOVE)/g' \
- -e 's/@''GNULIB_WMEMSET''@/$(GNULIB_WMEMSET)/g' \
- -e 's/@''GNULIB_WCSLEN''@/$(GNULIB_WCSLEN)/g' \
- -e 's/@''GNULIB_WCSNLEN''@/$(GNULIB_WCSNLEN)/g' \
- -e 's/@''GNULIB_WCSCPY''@/$(GNULIB_WCSCPY)/g' \
- -e 's/@''GNULIB_WCPCPY''@/$(GNULIB_WCPCPY)/g' \
- -e 's/@''GNULIB_WCSNCPY''@/$(GNULIB_WCSNCPY)/g' \
- -e 's/@''GNULIB_WCPNCPY''@/$(GNULIB_WCPNCPY)/g' \
- -e 's/@''GNULIB_WCSCAT''@/$(GNULIB_WCSCAT)/g' \
- -e 's/@''GNULIB_WCSNCAT''@/$(GNULIB_WCSNCAT)/g' \
- -e 's/@''GNULIB_WCSCMP''@/$(GNULIB_WCSCMP)/g' \
- -e 's/@''GNULIB_WCSNCMP''@/$(GNULIB_WCSNCMP)/g' \
- -e 's/@''GNULIB_WCSCASECMP''@/$(GNULIB_WCSCASECMP)/g' \
- -e 's/@''GNULIB_WCSNCASECMP''@/$(GNULIB_WCSNCASECMP)/g' \
- -e 's/@''GNULIB_WCSCOLL''@/$(GNULIB_WCSCOLL)/g' \
- -e 's/@''GNULIB_WCSXFRM''@/$(GNULIB_WCSXFRM)/g' \
- -e 's/@''GNULIB_WCSDUP''@/$(GNULIB_WCSDUP)/g' \
- -e 's/@''GNULIB_WCSCHR''@/$(GNULIB_WCSCHR)/g' \
- -e 's/@''GNULIB_WCSRCHR''@/$(GNULIB_WCSRCHR)/g' \
- -e 's/@''GNULIB_WCSCSPN''@/$(GNULIB_WCSCSPN)/g' \
- -e 's/@''GNULIB_WCSSPN''@/$(GNULIB_WCSSPN)/g' \
- -e 's/@''GNULIB_WCSPBRK''@/$(GNULIB_WCSPBRK)/g' \
- -e 's/@''GNULIB_WCSSTR''@/$(GNULIB_WCSSTR)/g' \
- -e 's/@''GNULIB_WCSTOK''@/$(GNULIB_WCSTOK)/g' \
- -e 's/@''GNULIB_WCSWIDTH''@/$(GNULIB_WCSWIDTH)/g' \
- < $(srcdir)/wchar.in.h | \
- sed -e 's|@''HAVE_WINT_T''@|$(HAVE_WINT_T)|g' \
+ -e 's|@''GNULIB_BTOWC''@|$(GNULIB_BTOWC)|g' \
+ -e 's|@''GNULIB_WCTOB''@|$(GNULIB_WCTOB)|g' \
+ -e 's|@''GNULIB_MBSINIT''@|$(GNULIB_MBSINIT)|g' \
+ -e 's|@''GNULIB_MBRTOWC''@|$(GNULIB_MBRTOWC)|g' \
+ -e 's|@''GNULIB_MBRLEN''@|$(GNULIB_MBRLEN)|g' \
+ -e 's|@''GNULIB_MBSRTOWCS''@|$(GNULIB_MBSRTOWCS)|g' \
+ -e 's|@''GNULIB_MBSNRTOWCS''@|$(GNULIB_MBSNRTOWCS)|g' \
+ -e 's|@''GNULIB_WCRTOMB''@|$(GNULIB_WCRTOMB)|g' \
+ -e 's|@''GNULIB_WCSRTOMBS''@|$(GNULIB_WCSRTOMBS)|g' \
+ -e 's|@''GNULIB_WCSNRTOMBS''@|$(GNULIB_WCSNRTOMBS)|g' \
+ -e 's|@''GNULIB_WCWIDTH''@|$(GNULIB_WCWIDTH)|g' \
+ -e 's|@''HAVE_WINT_T''@|$(HAVE_WINT_T)|g' \
-e 's|@''HAVE_BTOWC''@|$(HAVE_BTOWC)|g' \
-e 's|@''HAVE_MBSINIT''@|$(HAVE_MBSINIT)|g' \
-e 's|@''HAVE_MBRTOWC''@|$(HAVE_MBRTOWC)|g' \
@@ -6614,38 +4828,9 @@ wchar.h: wchar.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(ARG_NONNULL_H)
-e 's|@''HAVE_WCRTOMB''@|$(HAVE_WCRTOMB)|g' \
-e 's|@''HAVE_WCSRTOMBS''@|$(HAVE_WCSRTOMBS)|g' \
-e 's|@''HAVE_WCSNRTOMBS''@|$(HAVE_WCSNRTOMBS)|g' \
- -e 's|@''HAVE_WMEMCHR''@|$(HAVE_WMEMCHR)|g' \
- -e 's|@''HAVE_WMEMCMP''@|$(HAVE_WMEMCMP)|g' \
- -e 's|@''HAVE_WMEMCPY''@|$(HAVE_WMEMCPY)|g' \
- -e 's|@''HAVE_WMEMMOVE''@|$(HAVE_WMEMMOVE)|g' \
- -e 's|@''HAVE_WMEMSET''@|$(HAVE_WMEMSET)|g' \
- -e 's|@''HAVE_WCSLEN''@|$(HAVE_WCSLEN)|g' \
- -e 's|@''HAVE_WCSNLEN''@|$(HAVE_WCSNLEN)|g' \
- -e 's|@''HAVE_WCSCPY''@|$(HAVE_WCSCPY)|g' \
- -e 's|@''HAVE_WCPCPY''@|$(HAVE_WCPCPY)|g' \
- -e 's|@''HAVE_WCSNCPY''@|$(HAVE_WCSNCPY)|g' \
- -e 's|@''HAVE_WCPNCPY''@|$(HAVE_WCPNCPY)|g' \
- -e 's|@''HAVE_WCSCAT''@|$(HAVE_WCSCAT)|g' \
- -e 's|@''HAVE_WCSNCAT''@|$(HAVE_WCSNCAT)|g' \
- -e 's|@''HAVE_WCSCMP''@|$(HAVE_WCSCMP)|g' \
- -e 's|@''HAVE_WCSNCMP''@|$(HAVE_WCSNCMP)|g' \
- -e 's|@''HAVE_WCSCASECMP''@|$(HAVE_WCSCASECMP)|g' \
- -e 's|@''HAVE_WCSNCASECMP''@|$(HAVE_WCSNCASECMP)|g' \
- -e 's|@''HAVE_WCSCOLL''@|$(HAVE_WCSCOLL)|g' \
- -e 's|@''HAVE_WCSXFRM''@|$(HAVE_WCSXFRM)|g' \
- -e 's|@''HAVE_WCSDUP''@|$(HAVE_WCSDUP)|g' \
- -e 's|@''HAVE_WCSCHR''@|$(HAVE_WCSCHR)|g' \
- -e 's|@''HAVE_WCSRCHR''@|$(HAVE_WCSRCHR)|g' \
- -e 's|@''HAVE_WCSCSPN''@|$(HAVE_WCSCSPN)|g' \
- -e 's|@''HAVE_WCSSPN''@|$(HAVE_WCSSPN)|g' \
- -e 's|@''HAVE_WCSPBRK''@|$(HAVE_WCSPBRK)|g' \
- -e 's|@''HAVE_WCSSTR''@|$(HAVE_WCSSTR)|g' \
- -e 's|@''HAVE_WCSTOK''@|$(HAVE_WCSTOK)|g' \
- -e 's|@''HAVE_WCSWIDTH''@|$(HAVE_WCSWIDTH)|g' \
-e 's|@''HAVE_DECL_WCTOB''@|$(HAVE_DECL_WCTOB)|g' \
-e 's|@''HAVE_DECL_WCWIDTH''@|$(HAVE_DECL_WCWIDTH)|g' \
- | \
- sed -e 's|@''REPLACE_MBSTATE_T''@|$(REPLACE_MBSTATE_T)|g' \
+ -e 's|@''REPLACE_MBSTATE_T''@|$(REPLACE_MBSTATE_T)|g' \
-e 's|@''REPLACE_BTOWC''@|$(REPLACE_BTOWC)|g' \
-e 's|@''REPLACE_WCTOB''@|$(REPLACE_WCTOB)|g' \
-e 's|@''REPLACE_MBSINIT''@|$(REPLACE_MBSINIT)|g' \
@@ -6657,10 +4842,10 @@ wchar.h: wchar.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(ARG_NONNULL_H)
-e 's|@''REPLACE_WCSRTOMBS''@|$(REPLACE_WCSRTOMBS)|g' \
-e 's|@''REPLACE_WCSNRTOMBS''@|$(REPLACE_WCSNRTOMBS)|g' \
-e 's|@''REPLACE_WCWIDTH''@|$(REPLACE_WCWIDTH)|g' \
- -e 's|@''REPLACE_WCSWIDTH''@|$(REPLACE_WCSWIDTH)|g' \
-e '/definitions of _GL_FUNCDECL_RPL/r $(CXXDEFS_H)' \
-e '/definition of _GL_ARG_NONNULL/r $(ARG_NONNULL_H)' \
- -e '/definition of _GL_WARN_ON_USE/r $(WARN_ON_USE_H)'; \
+ -e '/definition of _GL_WARN_ON_USE/r $(WARN_ON_USE_H)' \
+ < $(srcdir)/wchar.in.h; \
} > $@-t && \
mv $@-t $@
MOSTLYCLEANFILES += wchar.h wchar.h-t
@@ -6669,35 +4854,23 @@ EXTRA_DIST += wchar.in.h
## end gnulib module wchar
-## begin gnulib module wctype-h
+## begin gnulib module wctype
BUILT_SOURCES += wctype.h
-libunistring_la_SOURCES += wctype-h.c
# We need the following in order to create <wctype.h> when the system
# doesn't have one that works with the given compiler.
-wctype.h: wctype.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(WARN_ON_USE_H)
+wctype.h: wctype.in.h $(CXXDEFS_H) $(WARN_ON_USE_H)
$(AM_V_GEN)rm -f $@-t $@ && \
{ echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \
- sed -e 's|@''GUARD_PREFIX''@|GL|g' \
- -e 's/@''HAVE_WCTYPE_H''@/$(HAVE_WCTYPE_H)/g' \
+ sed -e 's/@''HAVE_WCTYPE_H''@/$(HAVE_WCTYPE_H)/g' \
-e 's|@''INCLUDE_NEXT''@|$(INCLUDE_NEXT)|g' \
-e 's|@''PRAGMA_SYSTEM_HEADER''@|@PRAGMA_SYSTEM_HEADER@|g' \
- -e 's|@''PRAGMA_COLUMNS''@|@PRAGMA_COLUMNS@|g' \
-e 's|@''NEXT_WCTYPE_H''@|$(NEXT_WCTYPE_H)|g' \
- -e 's/@''GNULIB_ISWBLANK''@/$(GNULIB_ISWBLANK)/g' \
- -e 's/@''GNULIB_WCTYPE''@/$(GNULIB_WCTYPE)/g' \
- -e 's/@''GNULIB_ISWCTYPE''@/$(GNULIB_ISWCTYPE)/g' \
- -e 's/@''GNULIB_WCTRANS''@/$(GNULIB_WCTRANS)/g' \
- -e 's/@''GNULIB_TOWCTRANS''@/$(GNULIB_TOWCTRANS)/g' \
-e 's/@''HAVE_ISWBLANK''@/$(HAVE_ISWBLANK)/g' \
-e 's/@''HAVE_ISWCNTRL''@/$(HAVE_ISWCNTRL)/g' \
- -e 's/@''HAVE_WCTYPE_T''@/$(HAVE_WCTYPE_T)/g' \
- -e 's/@''HAVE_WCTRANS_T''@/$(HAVE_WCTRANS_T)/g' \
-e 's/@''HAVE_WINT_T''@/$(HAVE_WINT_T)/g' \
- -e 's/@''REPLACE_ISWBLANK''@/$(REPLACE_ISWBLANK)/g' \
-e 's/@''REPLACE_ISWCNTRL''@/$(REPLACE_ISWCNTRL)/g' \
- -e 's/@''REPLACE_TOWLOWER''@/$(REPLACE_TOWLOWER)/g' \
-e '/definitions of _GL_FUNCDECL_RPL/r $(CXXDEFS_H)' \
-e '/definition of _GL_WARN_ON_USE/r $(WARN_ON_USE_H)' \
< $(srcdir)/wctype.in.h; \
@@ -6707,7 +4880,7 @@ MOSTLYCLEANFILES += wctype.h wctype.h-t
EXTRA_DIST += wctype.in.h
-## end gnulib module wctype-h
+## end gnulib module wctype
## begin gnulib module wcwidth
@@ -6720,7 +4893,7 @@ EXTRA_libunistring_la_SOURCES += wcwidth.c
## begin gnulib module xsize
-libunistring_la_SOURCES += xsize.h xsize.c
+libunistring_la_SOURCES += xsize.h
## end gnulib module xsize