New upstream version 4.7

1 files changed, 211 insertions, 207 deletions

diff --git a/Makefile.in b/Makefile.in
index 82c299b..ab1e6f3 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -66,7 +66,65 @@
 # the same distribution terms as the rest of that program.
 #
 # Generated by gnulib-tool.
-# Reproduce by: gnulib-tool --import --local-dir=gl --lib=libsed --source-base=lib --m4-base=m4 --doc-base=doc --tests-base=gnulib-tests --aux-dir=build-aux --with-tests --avoid=lock-tests --makefile-name=gnulib.mk --no-conditional-dependencies --no-libtool --macro-prefix=gl acl alloca btowc c-ctype closeout dfa extensions fdl fwriting getdelim getopt gettext-h git-version-gen gitlog-to-changelog ignore-value localcharset manywarnings mbrlen mbrtowc mbsinit memchr memrchr mkostemp non-recursive-gnulib-prefix-hack obstack progname readme-release regex rename selinux-h ssize_t stat-macros stdalign stdbool strerror strverscmp threadlib unlocked-io update-copyright verify version-etc-fsf wcrtomb wctob
+# Reproduce by:
+# gnulib-tool --import --local-dir=gl \
+#  --lib=libsed \
+#  --source-base=lib \
+#  --m4-base=m4 \
+#  --doc-base=doc \
+#  --tests-base=gnulib-tests \
+#  --aux-dir=build-aux \
+#  --with-tests \
+#  --makefile-name=gnulib.mk \
+#  --no-conditional-dependencies \
+#  --no-libtool \
+#  --macro-prefix=gl \
+#  --avoid=lock-tests \
+#  acl \
+#  alloca \
+#  binary-io \
+#  btowc \
+#  c-ctype \
+#  closeout \
+#  dfa \
+#  extensions \
+#  fdl \
+#  fwriting \
+#  getdelim \
+#  getopt \
+#  gettext-h \
+#  git-version-gen \
+#  gitlog-to-changelog \
+#  ignore-value \
+#  localcharset \
+#  manywarnings \
+#  mbrlen \
+#  mbrtowc \
+#  mbsinit \
+#  memchr \
+#  memrchr \
+#  mkostemp \
+#  non-recursive-gnulib-prefix-hack \
+#  obstack \
+#  progname \
+#  readme-release \
+#  regex \
+#  rename \
+#  selinux-h \
+#  ssize_t \
+#  stat-macros \
+#  stdalign \
+#  stdbool \
+#  strerror \
+#  strverscmp \
+#  threadlib \
+#  unlocked-io \
+#  update-copyright \
+#  verify \
+#  version-etc-fsf \
+#  wcrtomb \
+#  wctob \
+#  xalloc
 
 # Copyright (C) 2016-2018 Free Software Foundation, Inc.
 
@@ -175,6 +233,7 @@ am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
 pkgdatadir = $(datadir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
+pkglibexecdir = $(libexecdir)/@PACKAGE@
 am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
 install_sh_DATA = $(install_sh) -c -m 644
 install_sh_PROGRAM = $(install_sh) -c
@@ -199,16 +258,17 @@ check_PROGRAMS = testsuite/get-mb-cur-max$(EXEEXT) \
 subdir = .
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/m4/00gnulib.m4 \
+	$(top_srcdir)/m4/__inline.m4 \
 	$(top_srcdir)/m4/absolute-header.m4 $(top_srcdir)/m4/acl.m4 \
 	$(top_srcdir)/m4/alloca.m4 $(top_srcdir)/m4/arpa_inet_h.m4 \
-	$(top_srcdir)/m4/asm-underscore.m4 $(top_srcdir)/m4/assert.m4 \
-	$(top_srcdir)/m4/btowc.m4 $(top_srcdir)/m4/builtin-expect.m4 \
+	$(top_srcdir)/m4/assert.m4 $(top_srcdir)/m4/btowc.m4 \
+	$(top_srcdir)/m4/builtin-expect.m4 \
 	$(top_srcdir)/m4/canonicalize.m4 \
 	$(top_srcdir)/m4/close-stream.m4 $(top_srcdir)/m4/close.m4 \
 	$(top_srcdir)/m4/closedir.m4 $(top_srcdir)/m4/closeout.m4 \
-	$(top_srcdir)/m4/codeset.m4 $(top_srcdir)/m4/configmake.m4 \
-	$(top_srcdir)/m4/ctype.m4 $(top_srcdir)/m4/dirent_h.m4 \
-	$(top_srcdir)/m4/dirfd.m4 $(top_srcdir)/m4/dirname.m4 \
+	$(top_srcdir)/m4/codeset.m4 $(top_srcdir)/m4/ctype.m4 \
+	$(top_srcdir)/m4/dirent_h.m4 $(top_srcdir)/m4/dirfd.m4 \
+	$(top_srcdir)/m4/dirname.m4 \
 	$(top_srcdir)/m4/double-slash-root.m4 $(top_srcdir)/m4/dup2.m4 \
 	$(top_srcdir)/m4/eealloc.m4 $(top_srcdir)/m4/environ.m4 \
 	$(top_srcdir)/m4/errno_h.m4 $(top_srcdir)/m4/error.m4 \
@@ -228,9 +288,9 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/00gnulib.m4 \
 	$(top_srcdir)/m4/gettimeofday.m4 $(top_srcdir)/m4/glibc21.m4 \
 	$(top_srcdir)/m4/gnulib-common.m4 \
 	$(top_srcdir)/m4/gnulib-comp.m4 \
-	$(top_srcdir)/m4/hard-locale.m4 \
 	$(top_srcdir)/m4/host-cpu-c-abi.m4 $(top_srcdir)/m4/iconv.m4 \
 	$(top_srcdir)/m4/include_next.m4 $(top_srcdir)/m4/inet_pton.m4 \
+	$(top_srcdir)/m4/intl-thread-locale.m4 \
 	$(top_srcdir)/m4/intlmacosx.m4 \
 	$(top_srcdir)/m4/inttypes-pri.m4 $(top_srcdir)/m4/inttypes.m4 \
 	$(top_srcdir)/m4/ioctl.m4 $(top_srcdir)/m4/isblank.m4 \
@@ -250,8 +310,9 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/00gnulib.m4 \
 	$(top_srcdir)/m4/mbsinit.m4 $(top_srcdir)/m4/mbstate_t.m4 \
 	$(top_srcdir)/m4/mbtowc.m4 $(top_srcdir)/m4/memchr.m4 \
 	$(top_srcdir)/m4/memrchr.m4 $(top_srcdir)/m4/minmax.m4 \
-	$(top_srcdir)/m4/mkostemp.m4 $(top_srcdir)/m4/mmap-anon.m4 \
-	$(top_srcdir)/m4/mode_t.m4 $(top_srcdir)/m4/msvc-inval.m4 \
+	$(top_srcdir)/m4/mkdir.m4 $(top_srcdir)/m4/mkostemp.m4 \
+	$(top_srcdir)/m4/mmap-anon.m4 $(top_srcdir)/m4/mode_t.m4 \
+	$(top_srcdir)/m4/msvc-inval.m4 \
 	$(top_srcdir)/m4/msvc-nothrow.m4 $(top_srcdir)/m4/multiarch.m4 \
 	$(top_srcdir)/m4/nanosleep.m4 $(top_srcdir)/m4/netinet_in_h.m4 \
 	$(top_srcdir)/m4/nl_langinfo.m4 $(top_srcdir)/m4/nls.m4 \
@@ -326,28 +387,28 @@ am__dirstamp = $(am__leading_dot)dirstamp
 am_lib_libsed_a_OBJECTS = lib/copy-acl.$(OBJEXT) lib/set-acl.$(OBJEXT) \
 	lib/acl-errno-valid.$(OBJEXT) lib/acl-internal.$(OBJEXT) \
 	lib/get-permissions.$(OBJEXT) lib/set-permissions.$(OBJEXT) \
-	lib/c-ctype.$(OBJEXT) lib/c-strcasecmp.$(OBJEXT) \
-	lib/c-strncasecmp.$(OBJEXT) lib/close-stream.$(OBJEXT) \
-	lib/closeout.$(OBJEXT) lib/dfa.$(OBJEXT) \
-	lib/localeinfo.$(OBJEXT) lib/dirname-lgpl.$(OBJEXT) \
-	lib/basename-lgpl.$(OBJEXT) lib/stripslash.$(OBJEXT) \
-	lib/exitfail.$(OBJEXT) lib/getprogname.$(OBJEXT) \
-	lib/hard-locale.$(OBJEXT) lib/localcharset.$(OBJEXT) \
-	lib/glthread/lock.$(OBJEXT) lib/malloca.$(OBJEXT) \
-	lib/progname.$(OBJEXT) lib/qcopy-acl.$(OBJEXT) \
-	lib/qset-acl.$(OBJEXT) lib/quotearg.$(OBJEXT) \
-	lib/se-context.$(OBJEXT) lib/se-selinux.$(OBJEXT) \
-	lib/stat-time.$(OBJEXT) lib/tempname.$(OBJEXT) \
-	lib/glthread/threadlib.$(OBJEXT) lib/unistd.$(OBJEXT) \
-	lib/version-etc.$(OBJEXT) lib/version-etc-fsf.$(OBJEXT) \
-	lib/wctype-h.$(OBJEXT) lib/xmalloc.$(OBJEXT) \
-	lib/xalloc-die.$(OBJEXT)
+	lib/binary-io.$(OBJEXT) lib/c-ctype.$(OBJEXT) \
+	lib/c-strcasecmp.$(OBJEXT) lib/c-strncasecmp.$(OBJEXT) \
+	lib/close-stream.$(OBJEXT) lib/closeout.$(OBJEXT) \
+	lib/dfa.$(OBJEXT) lib/localeinfo.$(OBJEXT) \
+	lib/dirname-lgpl.$(OBJEXT) lib/basename-lgpl.$(OBJEXT) \
+	lib/stripslash.$(OBJEXT) lib/exitfail.$(OBJEXT) \
+	lib/getprogname.$(OBJEXT) lib/hard-locale.$(OBJEXT) \
+	lib/localcharset.$(OBJEXT) lib/glthread/lock.$(OBJEXT) \
+	lib/malloca.$(OBJEXT) lib/progname.$(OBJEXT) \
+	lib/qcopy-acl.$(OBJEXT) lib/qset-acl.$(OBJEXT) \
+	lib/quotearg.$(OBJEXT) lib/se-context.$(OBJEXT) \
+	lib/se-selinux.$(OBJEXT) lib/stat-time.$(OBJEXT) \
+	lib/tempname.$(OBJEXT) lib/glthread/threadlib.$(OBJEXT) \
+	lib/unistd.$(OBJEXT) lib/version-etc.$(OBJEXT) \
+	lib/version-etc-fsf.$(OBJEXT) lib/wctype-h.$(OBJEXT) \
+	lib/xmalloc.$(OBJEXT) lib/xalloc-die.$(OBJEXT)
 lib_libsed_a_OBJECTS = $(am_lib_libsed_a_OBJECTS)
 sed_libver_a_AR = $(AR) $(ARFLAGS)
 sed_libver_a_LIBADD =
 nodist_sed_libver_a_OBJECTS = sed/version.$(OBJEXT)
 sed_libver_a_OBJECTS = $(nodist_sed_libver_a_OBJECTS)
-am_sed_sed_OBJECTS = sed/sed-compile.$(OBJEXT) \
+am_sed_sed_OBJECTS = sed/sed-compile.$(OBJEXT) sed/sed-debug.$(OBJEXT) \
 	sed/sed-execute.$(OBJEXT) sed/sed-mbcs.$(OBJEXT) \
 	sed/sed-regexp.$(OBJEXT) sed/sed-sed.$(OBJEXT) \
 	sed/sed-utils.$(OBJEXT)
@@ -380,8 +441,9 @@ am__maybe_remake_depfiles = depfiles
 am__depfiles_remade = lib/$(DEPDIR)/acl-errno-valid.Po \
 	lib/$(DEPDIR)/acl-internal.Po lib/$(DEPDIR)/acl_entries.Po \
 	lib/$(DEPDIR)/alloca.Po lib/$(DEPDIR)/basename-lgpl.Po \
-	lib/$(DEPDIR)/btowc.Po lib/$(DEPDIR)/c-ctype.Po \
-	lib/$(DEPDIR)/c-strcasecmp.Po lib/$(DEPDIR)/c-strncasecmp.Po \
+	lib/$(DEPDIR)/binary-io.Po lib/$(DEPDIR)/btowc.Po \
+	lib/$(DEPDIR)/c-ctype.Po lib/$(DEPDIR)/c-strcasecmp.Po \
+	lib/$(DEPDIR)/c-strncasecmp.Po \
 	lib/$(DEPDIR)/canonicalize-lgpl.Po \
 	lib/$(DEPDIR)/close-stream.Po lib/$(DEPDIR)/closeout.Po \
 	lib/$(DEPDIR)/copy-acl.Po lib/$(DEPDIR)/dfa.Po \
@@ -399,30 +461,32 @@ am__depfiles_remade = lib/$(DEPDIR)/acl-errno-valid.Po \
 	lib/$(DEPDIR)/mbrlen.Po lib/$(DEPDIR)/mbrtowc.Po \
 	lib/$(DEPDIR)/mbsinit.Po lib/$(DEPDIR)/mbtowc.Po \
 	lib/$(DEPDIR)/memchr.Po lib/$(DEPDIR)/memrchr.Po \
-	lib/$(DEPDIR)/mkostemp.Po lib/$(DEPDIR)/msvc-inval.Po \
-	lib/$(DEPDIR)/msvc-nothrow.Po lib/$(DEPDIR)/nl_langinfo.Po \
-	lib/$(DEPDIR)/obstack.Po lib/$(DEPDIR)/progname.Po \
-	lib/$(DEPDIR)/qcopy-acl.Po lib/$(DEPDIR)/qset-acl.Po \
-	lib/$(DEPDIR)/quotearg.Po lib/$(DEPDIR)/readlink.Po \
-	lib/$(DEPDIR)/regcomp.Po lib/$(DEPDIR)/regex.Po \
-	lib/$(DEPDIR)/regex_internal.Po lib/$(DEPDIR)/regexec.Po \
-	lib/$(DEPDIR)/rename.Po lib/$(DEPDIR)/rmdir.Po \
-	lib/$(DEPDIR)/se-context.Po lib/$(DEPDIR)/se-selinux.Po \
-	lib/$(DEPDIR)/set-acl.Po lib/$(DEPDIR)/set-permissions.Po \
-	lib/$(DEPDIR)/stat-time.Po lib/$(DEPDIR)/stat-w32.Po \
-	lib/$(DEPDIR)/stat.Po lib/$(DEPDIR)/strerror-override.Po \
-	lib/$(DEPDIR)/strerror.Po lib/$(DEPDIR)/stripslash.Po \
-	lib/$(DEPDIR)/strverscmp.Po lib/$(DEPDIR)/tempname.Po \
-	lib/$(DEPDIR)/unistd.Po lib/$(DEPDIR)/version-etc-fsf.Po \
-	lib/$(DEPDIR)/version-etc.Po lib/$(DEPDIR)/wcrtomb.Po \
-	lib/$(DEPDIR)/wctob.Po lib/$(DEPDIR)/wctomb.Po \
-	lib/$(DEPDIR)/wctype-h.Po lib/$(DEPDIR)/xalloc-die.Po \
-	lib/$(DEPDIR)/xmalloc.Po lib/glthread/$(DEPDIR)/lock.Po \
+	lib/$(DEPDIR)/mkdir.Po lib/$(DEPDIR)/mkostemp.Po \
+	lib/$(DEPDIR)/msvc-inval.Po lib/$(DEPDIR)/msvc-nothrow.Po \
+	lib/$(DEPDIR)/nl_langinfo.Po lib/$(DEPDIR)/obstack.Po \
+	lib/$(DEPDIR)/progname.Po lib/$(DEPDIR)/qcopy-acl.Po \
+	lib/$(DEPDIR)/qset-acl.Po lib/$(DEPDIR)/quotearg.Po \
+	lib/$(DEPDIR)/readlink.Po lib/$(DEPDIR)/regcomp.Po \
+	lib/$(DEPDIR)/regex.Po lib/$(DEPDIR)/regex_internal.Po \
+	lib/$(DEPDIR)/regexec.Po lib/$(DEPDIR)/rename.Po \
+	lib/$(DEPDIR)/rmdir.Po lib/$(DEPDIR)/se-context.Po \
+	lib/$(DEPDIR)/se-selinux.Po lib/$(DEPDIR)/set-acl.Po \
+	lib/$(DEPDIR)/set-permissions.Po lib/$(DEPDIR)/stat-time.Po \
+	lib/$(DEPDIR)/stat-w32.Po lib/$(DEPDIR)/stat.Po \
+	lib/$(DEPDIR)/strerror-override.Po lib/$(DEPDIR)/strerror.Po \
+	lib/$(DEPDIR)/stripslash.Po lib/$(DEPDIR)/strverscmp.Po \
+	lib/$(DEPDIR)/tempname.Po lib/$(DEPDIR)/unistd.Po \
+	lib/$(DEPDIR)/version-etc-fsf.Po lib/$(DEPDIR)/version-etc.Po \
+	lib/$(DEPDIR)/wcrtomb.Po lib/$(DEPDIR)/wctob.Po \
+	lib/$(DEPDIR)/wctomb.Po lib/$(DEPDIR)/wctype-h.Po \
+	lib/$(DEPDIR)/xalloc-die.Po lib/$(DEPDIR)/xmalloc.Po \
+	lib/glthread/$(DEPDIR)/lock.Po \
 	lib/glthread/$(DEPDIR)/threadlib.Po \
-	sed/$(DEPDIR)/sed-compile.Po sed/$(DEPDIR)/sed-execute.Po \
-	sed/$(DEPDIR)/sed-mbcs.Po sed/$(DEPDIR)/sed-regexp.Po \
-	sed/$(DEPDIR)/sed-sed.Po sed/$(DEPDIR)/sed-utils.Po \
-	sed/$(DEPDIR)/version.Po testsuite/$(DEPDIR)/get-mb-cur-max.Po \
+	sed/$(DEPDIR)/sed-compile.Po sed/$(DEPDIR)/sed-debug.Po \
+	sed/$(DEPDIR)/sed-execute.Po sed/$(DEPDIR)/sed-mbcs.Po \
+	sed/$(DEPDIR)/sed-regexp.Po sed/$(DEPDIR)/sed-sed.Po \
+	sed/$(DEPDIR)/sed-utils.Po sed/$(DEPDIR)/version.Po \
+	testsuite/$(DEPDIR)/get-mb-cur-max.Po \
 	testsuite/$(DEPDIR)/test-mbrtowc.Po
 am__mv = mv -f
 AM_V_lt = $(am__v_lt_@AM_V@)
@@ -799,7 +863,6 @@ distuninstallcheck_listfiles = find . -type f -print
 am__distuninstallcheck_listfiles = $(distuninstallcheck_listfiles) \
   | sed 's|^\./|$(prefix)/|' | grep -v '$(infodir)/dir$$'
 distcleancheck_listfiles = find . -type f -print
-pkglibexecdir = @pkglibexecdir@
 ACLOCAL = @ACLOCAL@
 ALLOCA = @ALLOCA@
 ALLOCA_H = @ALLOCA_H@
@@ -913,6 +976,7 @@ GNULIB_GETLOADAVG = @GNULIB_GETLOADAVG@
 GNULIB_GETLOGIN = @GNULIB_GETLOGIN@
 GNULIB_GETLOGIN_R = @GNULIB_GETLOGIN_R@
 GNULIB_GETPAGESIZE = @GNULIB_GETPAGESIZE@
+GNULIB_GETPASS = @GNULIB_GETPASS@
 GNULIB_GETPEERNAME = @GNULIB_GETPEERNAME@
 GNULIB_GETSOCKNAME = @GNULIB_GETSOCKNAME@
 GNULIB_GETSOCKOPT = @GNULIB_GETSOCKOPT@
@@ -937,6 +1001,7 @@ GNULIB_LINK = @GNULIB_LINK@
 GNULIB_LINKAT = @GNULIB_LINKAT@
 GNULIB_LISTEN = @GNULIB_LISTEN@
 GNULIB_LOCALECONV = @GNULIB_LOCALECONV@
+GNULIB_LOCALENAME = @GNULIB_LOCALENAME@
 GNULIB_LOCALTIME = @GNULIB_LOCALTIME@
 GNULIB_LSEEK = @GNULIB_LSEEK@
 GNULIB_LSTAT = @GNULIB_LSTAT@
@@ -1185,6 +1250,7 @@ HAVE_DECL_STRSIGNAL = @HAVE_DECL_STRSIGNAL@
 HAVE_DECL_STRTOIMAX = @HAVE_DECL_STRTOIMAX@
 HAVE_DECL_STRTOK_R = @HAVE_DECL_STRTOK_R@
 HAVE_DECL_STRTOUMAX = @HAVE_DECL_STRTOUMAX@
+HAVE_DECL_TRUNCATE = @HAVE_DECL_TRUNCATE@
 HAVE_DECL_TTYNAME_R = @HAVE_DECL_TTYNAME_R@
 HAVE_DECL_UNSETENV = @HAVE_DECL_UNSETENV@
 HAVE_DECL_VSNPRINTF = @HAVE_DECL_VSNPRINTF@
@@ -1207,6 +1273,7 @@ HAVE_FDOPENDIR = @HAVE_FDOPENDIR@
 HAVE_FEATURES_H = @HAVE_FEATURES_H@
 HAVE_FFSL = @HAVE_FFSL@
 HAVE_FFSLL = @HAVE_FFSLL@
+HAVE_FREELOCALE = @HAVE_FREELOCALE@
 HAVE_FSEEKO = @HAVE_FSEEKO@
 HAVE_FSTATAT = @HAVE_FSTATAT@
 HAVE_FSYNC = @HAVE_FSYNC@
@@ -1219,10 +1286,12 @@ HAVE_GETHOSTNAME = @HAVE_GETHOSTNAME@
 HAVE_GETLOGIN = @HAVE_GETLOGIN@
 HAVE_GETOPT_H = @HAVE_GETOPT_H@
 HAVE_GETPAGESIZE = @HAVE_GETPAGESIZE@
+HAVE_GETPASS = @HAVE_GETPASS@
 HAVE_GETSUBOPT = @HAVE_GETSUBOPT@
 HAVE_GETTIMEOFDAY = @HAVE_GETTIMEOFDAY@
 HAVE_GRANTPT = @HAVE_GRANTPT@
 HAVE_GROUP_MEMBER = @HAVE_GROUP_MEMBER@
+HAVE_IMAXDIV_T = @HAVE_IMAXDIV_T@
 HAVE_INTTYPES_H = @HAVE_INTTYPES_H@
 HAVE_ISBLANK = @HAVE_ISBLANK@
 HAVE_ISWBLANK = @HAVE_ISWBLANK@
@@ -1261,6 +1330,7 @@ HAVE_MKSTEMPS = @HAVE_MKSTEMPS@
 HAVE_MSVC_INVALID_PARAMETER_HANDLER = @HAVE_MSVC_INVALID_PARAMETER_HANDLER@
 HAVE_NANOSLEEP = @HAVE_NANOSLEEP@
 HAVE_NETINET_IN_H = @HAVE_NETINET_IN_H@
+HAVE_NEWLOCALE = @HAVE_NEWLOCALE@
 HAVE_NL_LANGINFO = @HAVE_NL_LANGINFO@
 HAVE_OPENAT = @HAVE_OPENAT@
 HAVE_OPENDIR = @HAVE_OPENDIR@
@@ -1336,7 +1406,6 @@ HAVE_SYS_TYPES_H = @HAVE_SYS_TYPES_H@
 HAVE_SYS_UIO_H = @HAVE_SYS_UIO_H@
 HAVE_TIMEGM = @HAVE_TIMEGM@
 HAVE_TIMEZONE_T = @HAVE_TIMEZONE_T@
-HAVE_TRUNCATE = @HAVE_TRUNCATE@
 HAVE_TYPE_VOLATILE_SIG_ATOMIC_T = @HAVE_TYPE_VOLATILE_SIG_ATOMIC_T@
 HAVE_TZSET = @HAVE_TZSET@
 HAVE_UNISTD_H = @HAVE_UNISTD_H@
@@ -1390,8 +1459,6 @@ HAVE_WS2TCPIP_H = @HAVE_WS2TCPIP_H@
 HAVE_XLOCALE_H = @HAVE_XLOCALE_H@
 HAVE__BOOL = @HAVE__BOOL@
 HAVE__EXIT = @HAVE__EXIT@
-HOST_CPU = @HOST_CPU@
-HOST_CPU_C_ABI = @HOST_CPU_C_ABI@
 INCLUDE_NEXT = @INCLUDE_NEXT@
 INCLUDE_NEXT_AS_FIRST_DIRECTIVE = @INCLUDE_NEXT_AS_FIRST_DIRECTIVE@
 INET_PTON_LIB = @INET_PTON_LIB@
@@ -1541,6 +1608,7 @@ REPLACE_FFLUSH = @REPLACE_FFLUSH@
 REPLACE_FOPEN = @REPLACE_FOPEN@
 REPLACE_FPRINTF = @REPLACE_FPRINTF@
 REPLACE_FPURGE = @REPLACE_FPURGE@
+REPLACE_FREELOCALE = @REPLACE_FREELOCALE@
 REPLACE_FREOPEN = @REPLACE_FREOPEN@
 REPLACE_FSEEK = @REPLACE_FSEEK@
 REPLACE_FSEEKO = @REPLACE_FSEEKO@
@@ -1558,6 +1626,7 @@ REPLACE_GETGROUPS = @REPLACE_GETGROUPS@
 REPLACE_GETLINE = @REPLACE_GETLINE@
 REPLACE_GETLOGIN_R = @REPLACE_GETLOGIN_R@
 REPLACE_GETPAGESIZE = @REPLACE_GETPAGESIZE@
+REPLACE_GETPASS = @REPLACE_GETPASS@
 REPLACE_GETTIMEOFDAY = @REPLACE_GETTIMEOFDAY@
 REPLACE_GMTIME = @REPLACE_GMTIME@
 REPLACE_INET_NTOP = @REPLACE_INET_NTOP@
@@ -1590,6 +1659,7 @@ REPLACE_MKNOD = @REPLACE_MKNOD@
 REPLACE_MKSTEMP = @REPLACE_MKSTEMP@
 REPLACE_MKTIME = @REPLACE_MKTIME@
 REPLACE_NANOSLEEP = @REPLACE_NANOSLEEP@
+REPLACE_NEWLOCALE = @REPLACE_NEWLOCALE@
 REPLACE_NL_LANGINFO = @REPLACE_NL_LANGINFO@
 REPLACE_NULL = @REPLACE_NULL@
 REPLACE_OBSTACK_PRINTF = @REPLACE_OBSTACK_PRINTF@
@@ -1749,7 +1819,6 @@ infodir = @infodir@
 install_sh = @install_sh@
 libdir = @libdir@
 libexecdir = @libexecdir@
-lispdir = @lispdir@
 localedir = $(datadir)/locale
 localstatedir = @localstatedir@
 mandir = @mandir@
@@ -1777,17 +1846,15 @@ AM_CPPFLAGS = -I$(top_srcdir) \
                -I$(top_builddir)/sed
 
 AM_CFLAGS = 
-BUILT_SOURCES = .version $(ALLOCA_H) lib/configmake.h lib/ctype.h \
-	$(ERRNO_H) lib/fcntl.h $(GETOPT_H) $(GETOPT_CDEFS_H) \
-	lib/langinfo.h $(LIMITS_H) lib/locale.h lib/selinux/selinux.h \
+BUILT_SOURCES = .version $(ALLOCA_H) lib/ctype.h $(ERRNO_H) \
+	lib/fcntl.h $(GETOPT_H) $(GETOPT_CDEFS_H) lib/langinfo.h \
+	$(LIMITS_H) lib/locale.h lib/selinux/selinux.h \
 	$(SELINUX_CONTEXT_H) $(STDALIGN_H) $(STDARG_H) $(STDBOOL_H) \
 	$(STDDEF_H) $(STDINT_H) lib/stdio.h lib/stdlib.h lib/string.h \
 	lib/sys/stat.h lib/sys/time.h lib/sys/types.h lib/time.h \
 	lib/unistd.h lib/wchar.h lib/wctype.h sed/version.c \
 	sed/version.h
-CLEANFILES = lib/configmake.h lib/configmake.h-t lib/charset.alias \
-	lib/ref-add.sed lib/ref-del.sed tmp* core *.core \
-	$(EXTRA_PROGRAMS) *.*out *.log
+CLEANFILES = tmp* core *.core $(EXTRA_PROGRAMS) *.*out *.log
 EXTRA_DIST = BUGS THANKS.in .version .mailmap ChangeLog-2014 \
 	po/ChangeLog-2014 bootstrap bootstrap.conf build-aux/help2man \
 	thanks-gen lib/acl-internal.h lib/acl.h lib/acl_entries.c \
@@ -1811,13 +1878,13 @@ EXTRA_DIST = BUGS THANKS.in .version .mailmap ChangeLog-2014 \
 	$(top_srcdir)/GNUmakefile $(top_srcdir)/build-aux/gnupload \
 	lib/hard-locale.h $(top_srcdir)/build-aux/config.rpath \
 	lib/ignore-value.h lib/intprops.h lib/isblank.c \
-	lib/langinfo.in.h lib/limits.in.h lib/config.charset \
-	lib/ref-add.sin lib/ref-del.sin lib/locale.in.h \
+	lib/langinfo.in.h lib/cdefs.h lib/libc-config.h \
+	lib/limits.in.h lib/localcharset.h lib/locale.in.h \
 	lib/localeconv.c lib/localtime-buffer.c lib/localtime-buffer.h \
 	lib/lstat.c $(top_srcdir)/maint.mk lib/malloc.c lib/malloca.h \
 	lib/mbrlen.c lib/mbrtowc.c lib/mbsinit.c lib/mbtowc-impl.h \
 	lib/mbtowc.c lib/memchr.c lib/memchr.valgrind lib/memrchr.c \
-	lib/mkostemp.c lib/msvc-inval.c lib/msvc-inval.h \
+	lib/mkdir.c lib/mkostemp.c lib/msvc-inval.c lib/msvc-inval.h \
 	lib/msvc-nothrow.c lib/msvc-nothrow.h lib/nl_langinfo.c \
 	$(top_srcdir)/build-aux/prefix-gnulib-mk lib/obstack.c \
 	lib/obstack.h lib/pathmax.h lib/quote.h lib/quote.h \
@@ -1890,15 +1957,15 @@ DISTCHECK_CONFIGURE_FLAGS = XGETTEXT='$(SHELL) -c : dummy' $(EXTRA_DC_FLAGS)
 EXTRA_DC_FLAGS = 
 lib_libsed_a_SOURCES = lib/copy-acl.c lib/set-acl.c \
 	lib/acl-errno-valid.c lib/acl-internal.c lib/get-permissions.c \
-	lib/set-permissions.c lib/c-ctype.h lib/c-ctype.c \
-	lib/c-strcase.h lib/c-strcasecmp.c lib/c-strncasecmp.c \
-	lib/close-stream.c lib/closeout.c lib/dfa.c lib/localeinfo.c \
-	lib/dirname-lgpl.c lib/basename-lgpl.c lib/stripslash.c \
-	lib/exitfail.c lib/getprogname.h lib/getprogname.c \
-	lib/gettext.h lib/hard-locale.c lib/localcharset.h \
-	lib/localcharset.c lib/glthread/lock.h lib/glthread/lock.c \
-	lib/malloca.c lib/minmax.h lib/progname.h lib/progname.c \
-	lib/qcopy-acl.c lib/qset-acl.c lib/quotearg.c \
+	lib/set-permissions.c lib/binary-io.h lib/binary-io.c \
+	lib/c-ctype.h lib/c-ctype.c lib/c-strcase.h lib/c-strcasecmp.c \
+	lib/c-strncasecmp.c lib/close-stream.c lib/closeout.c \
+	lib/dfa.c lib/localeinfo.c lib/dirname-lgpl.c \
+	lib/basename-lgpl.c lib/stripslash.c lib/exitfail.c \
+	lib/getprogname.h lib/getprogname.c lib/gettext.h \
+	lib/hard-locale.c lib/localcharset.c lib/glthread/lock.h \
+	lib/glthread/lock.c lib/malloca.c lib/minmax.h lib/progname.h \
+	lib/progname.c lib/qcopy-acl.c lib/qset-acl.c lib/quotearg.c \
 	lib/se-context.in.h lib/se-selinux.in.h lib/se-context.c \
 	lib/se-selinux.c lib/stat-time.c lib/tempname.c \
 	lib/glthread/threadlib.c lib/unistd.c lib/version-etc.h \
@@ -1912,20 +1979,18 @@ EXTRA_lib_libsed_a_SOURCES = lib/acl_entries.c lib/alloca.c \
 	lib/getopt.c lib/getopt1.c lib/gettimeofday.c lib/isblank.c \
 	lib/localeconv.c lib/localtime-buffer.c lib/lstat.c \
 	lib/malloc.c lib/mbrlen.c lib/mbrtowc.c lib/mbsinit.c \
-	lib/mbtowc.c lib/memchr.c lib/memrchr.c lib/mkostemp.c \
-	lib/msvc-inval.c lib/msvc-nothrow.c lib/nl_langinfo.c \
-	lib/obstack.c lib/readlink.c lib/regcomp.c lib/regex.c \
-	lib/regex_internal.c lib/regexec.c lib/rename.c lib/rmdir.c \
-	lib/getfilecon.c lib/stat-w32.c lib/stat.c lib/strerror.c \
-	lib/strerror-override.c lib/strverscmp.c lib/wcrtomb.c \
-	lib/wctob.c lib/wctomb.c
+	lib/mbtowc.c lib/memchr.c lib/memrchr.c lib/mkdir.c \
+	lib/mkostemp.c lib/msvc-inval.c lib/msvc-nothrow.c \
+	lib/nl_langinfo.c lib/obstack.c lib/readlink.c lib/regcomp.c \
+	lib/regex.c lib/regex_internal.c lib/regexec.c lib/rename.c \
+	lib/rmdir.c lib/getfilecon.c lib/stat-w32.c lib/stat.c \
+	lib/strerror.c lib/strerror-override.c lib/strverscmp.c \
+	lib/wcrtomb.c lib/wctob.c lib/wctomb.c
 
 # 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 = lib/(__GNUC__ lib/|| lib/60000000 lib/<= lib/__DECC_VER)
-charset_alias = $(DESTDIR)$(libdir)/charset.alias
-charset_tmp = $(DESTDIR)$(libdir)/charset.tmp
 
 # Because this Makefile snippet defines a variable used by other
 # gnulib Makefile snippets, it must be present in all makefiles that
@@ -1953,6 +2018,7 @@ UNUSED_PARAMETER_H = $(top_srcdir)/lib/unused-parameter.h
 WARN_ON_USE_H = $(top_srcdir)/lib/warn-on-use.h
 sed_sed_SOURCES = \
   sed/compile.c		\
+  sed/debug.c		\
   sed/execute.c		\
   sed/mbcs.c		\
   sed/regexp.c		\
@@ -1993,18 +2059,20 @@ LOG_COMPILER = false
 # is listed in only one place.
 
 # Old tests converted to newer init.sh style
-T = testsuite/misc.pl testsuite/cmd-l.sh testsuite/cmd-R.sh \
+T = testsuite/misc.pl testsuite/bug32082.sh testsuite/bug32271-1.sh \
+	testsuite/bug32271-2.sh testsuite/cmd-l.sh testsuite/cmd-R.sh \
 	testsuite/colon-with-no-label.sh testsuite/comment-n.sh \
 	testsuite/compile-errors.sh testsuite/compile-tests.sh \
 	testsuite/convert-number.sh testsuite/command-endings.sh \
-	testsuite/execute-tests.sh testsuite/help-version.sh \
-	testsuite/in-place-hyphen.sh \
+	testsuite/debug.pl testsuite/execute-tests.sh \
+	testsuite/help-version.sh testsuite/in-place-hyphen.sh \
 	testsuite/in-place-suffix-backup.sh \
 	testsuite/inplace-selinux.sh testsuite/invalid-mb-seq-UMR.sh \
 	testsuite/mb-bad-delim.sh testsuite/mb-charclass-non-utf8.sh \
 	testsuite/mb-match-slash.sh testsuite/mb-y-translate.sh \
-	testsuite/newline-dfa-bug.sh testsuite/normalize-text.sh \
-	testsuite/nulldata.sh testsuite/panic-tests.sh \
+	testsuite/missing-filename.sh testsuite/newline-dfa-bug.sh \
+	testsuite/normalize-text.sh testsuite/nulldata.sh \
+	testsuite/obinary.sh testsuite/panic-tests.sh \
 	testsuite/posix-char-class.sh testsuite/posix-mode-addr.sh \
 	testsuite/posix-mode-bad-ref.sh testsuite/posix-mode-ERE.sh \
 	testsuite/posix-mode-s.sh testsuite/posix-mode-N.sh \
@@ -2020,7 +2088,7 @@ T = testsuite/misc.pl testsuite/cmd-l.sh testsuite/cmd-R.sh \
 	testsuite/eval.sh testsuite/help.sh testsuite/inplace-hold.sh \
 	testsuite/mac-mf.sh testsuite/madding.sh testsuite/newjis.sh \
 	testsuite/stdin.sh testsuite/utf8-ru.sh testsuite/uniq.sh \
-	testsuite/xemacs.sh
+	testsuite/word-delim.sh testsuite/xemacs.sh
 SEDTESTS = 
 testsuite_get_mb_cur_max_LDADD = lib/libsed.a $(INTLLIBS)
 testsuite_test_mbrtowc_LDADD = lib/libsed.a $(INTLLIBS)
@@ -2080,7 +2148,7 @@ all: $(BUILT_SOURCES) config.h
 	$(MAKE) $(AM_MAKEFLAGS) all-recursive
 
 .SUFFIXES:
-.SUFFIXES: .c .dvi .log .o .obj .pl .pl$(EXEEXT) .ps .sed .sh .sh$(EXEEXT) .sin .trs
+.SUFFIXES: .c .dvi .log .o .obj .pl .pl$(EXEEXT) .ps .sh .sh$(EXEEXT) .trs
 am--refresh: Makefile
 	@:
 $(srcdir)/Makefile.in:  $(srcdir)/Makefile.am $(top_srcdir)/lib/local.mk $(srcdir)/lib/gnulib.mk $(top_srcdir)/sed/local.mk $(top_srcdir)/doc/local.mk $(top_srcdir)/testsuite/local.mk $(am__configure_deps)
@@ -2197,6 +2265,8 @@ lib/get-permissions.$(OBJEXT): lib/$(am__dirstamp) \
 	lib/$(DEPDIR)/$(am__dirstamp)
 lib/set-permissions.$(OBJEXT): lib/$(am__dirstamp) \
 	lib/$(DEPDIR)/$(am__dirstamp)
+lib/binary-io.$(OBJEXT): lib/$(am__dirstamp) \
+	lib/$(DEPDIR)/$(am__dirstamp)
 lib/c-ctype.$(OBJEXT): lib/$(am__dirstamp) \
 	lib/$(DEPDIR)/$(am__dirstamp)
 lib/c-strcasecmp.$(OBJEXT): lib/$(am__dirstamp) \
@@ -2308,6 +2378,7 @@ lib/memchr.$(OBJEXT): lib/$(am__dirstamp) \
 	lib/$(DEPDIR)/$(am__dirstamp)
 lib/memrchr.$(OBJEXT): lib/$(am__dirstamp) \
 	lib/$(DEPDIR)/$(am__dirstamp)
+lib/mkdir.$(OBJEXT): lib/$(am__dirstamp) lib/$(DEPDIR)/$(am__dirstamp)
 lib/mkostemp.$(OBJEXT): lib/$(am__dirstamp) \
 	lib/$(DEPDIR)/$(am__dirstamp)
 lib/msvc-inval.$(OBJEXT): lib/$(am__dirstamp) \
@@ -2364,6 +2435,8 @@ sed/libver.a: $(sed_libver_a_OBJECTS) $(sed_libver_a_DEPENDENCIES) $(EXTRA_sed_l
 	$(AM_V_at)$(RANLIB) sed/libver.a
 sed/sed-compile.$(OBJEXT): sed/$(am__dirstamp) \
 	sed/$(DEPDIR)/$(am__dirstamp)
+sed/sed-debug.$(OBJEXT): sed/$(am__dirstamp) \
+	sed/$(DEPDIR)/$(am__dirstamp)
 sed/sed-execute.$(OBJEXT): sed/$(am__dirstamp) \
 	sed/$(DEPDIR)/$(am__dirstamp)
 sed/sed-mbcs.$(OBJEXT): sed/$(am__dirstamp) \
@@ -2412,6 +2485,7 @@ distclean-compile:
 @AMDEP_TRUE@@am__include@ @am__quote@lib/$(DEPDIR)/acl_entries.Po@am__quote@ # am--include-marker
 @AMDEP_TRUE@@am__include@ @am__quote@lib/$(DEPDIR)/alloca.Po@am__quote@ # am--include-marker
 @AMDEP_TRUE@@am__include@ @am__quote@lib/$(DEPDIR)/basename-lgpl.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@lib/$(DEPDIR)/binary-io.Po@am__quote@ # am--include-marker
 @AMDEP_TRUE@@am__include@ @am__quote@lib/$(DEPDIR)/btowc.Po@am__quote@ # am--include-marker
 @AMDEP_TRUE@@am__include@ @am__quote@lib/$(DEPDIR)/c-ctype.Po@am__quote@ # am--include-marker
 @AMDEP_TRUE@@am__include@ @am__quote@lib/$(DEPDIR)/c-strcasecmp.Po@am__quote@ # am--include-marker
@@ -2449,6 +2523,7 @@ distclean-compile:
 @AMDEP_TRUE@@am__include@ @am__quote@lib/$(DEPDIR)/mbtowc.Po@am__quote@ # am--include-marker
 @AMDEP_TRUE@@am__include@ @am__quote@lib/$(DEPDIR)/memchr.Po@am__quote@ # am--include-marker
 @AMDEP_TRUE@@am__include@ @am__quote@lib/$(DEPDIR)/memrchr.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@lib/$(DEPDIR)/mkdir.Po@am__quote@ # am--include-marker
 @AMDEP_TRUE@@am__include@ @am__quote@lib/$(DEPDIR)/mkostemp.Po@am__quote@ # am--include-marker
 @AMDEP_TRUE@@am__include@ @am__quote@lib/$(DEPDIR)/msvc-inval.Po@am__quote@ # am--include-marker
 @AMDEP_TRUE@@am__include@ @am__quote@lib/$(DEPDIR)/msvc-nothrow.Po@am__quote@ # am--include-marker
@@ -2489,6 +2564,7 @@ distclean-compile:
 @AMDEP_TRUE@@am__include@ @am__quote@lib/glthread/$(DEPDIR)/lock.Po@am__quote@ # am--include-marker
 @AMDEP_TRUE@@am__include@ @am__quote@lib/glthread/$(DEPDIR)/threadlib.Po@am__quote@ # am--include-marker
 @AMDEP_TRUE@@am__include@ @am__quote@sed/$(DEPDIR)/sed-compile.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@sed/$(DEPDIR)/sed-debug.Po@am__quote@ # am--include-marker
 @AMDEP_TRUE@@am__include@ @am__quote@sed/$(DEPDIR)/sed-execute.Po@am__quote@ # am--include-marker
 @AMDEP_TRUE@@am__include@ @am__quote@sed/$(DEPDIR)/sed-mbcs.Po@am__quote@ # am--include-marker
 @AMDEP_TRUE@@am__include@ @am__quote@sed/$(DEPDIR)/sed-regexp.Po@am__quote@ # am--include-marker
@@ -2534,6 +2610,20 @@ sed/sed-compile.obj: sed/compile.c
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(sed_sed_CPPFLAGS) $(CPPFLAGS) $(sed_sed_CFLAGS) $(CFLAGS) -c -o sed/sed-compile.obj `if test -f 'sed/compile.c'; then $(CYGPATH_W) 'sed/compile.c'; else $(CYGPATH_W) '$(srcdir)/sed/compile.c'; fi`
 
+sed/sed-debug.o: sed/debug.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(sed_sed_CPPFLAGS) $(CPPFLAGS) $(sed_sed_CFLAGS) $(CFLAGS) -MT sed/sed-debug.o -MD -MP -MF sed/$(DEPDIR)/sed-debug.Tpo -c -o sed/sed-debug.o `test -f 'sed/debug.c' || echo '$(srcdir)/'`sed/debug.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) sed/$(DEPDIR)/sed-debug.Tpo sed/$(DEPDIR)/sed-debug.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='sed/debug.c' object='sed/sed-debug.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(sed_sed_CPPFLAGS) $(CPPFLAGS) $(sed_sed_CFLAGS) $(CFLAGS) -c -o sed/sed-debug.o `test -f 'sed/debug.c' || echo '$(srcdir)/'`sed/debug.c
+
+sed/sed-debug.obj: sed/debug.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(sed_sed_CPPFLAGS) $(CPPFLAGS) $(sed_sed_CFLAGS) $(CFLAGS) -MT sed/sed-debug.obj -MD -MP -MF sed/$(DEPDIR)/sed-debug.Tpo -c -o sed/sed-debug.obj `if test -f 'sed/debug.c'; then $(CYGPATH_W) 'sed/debug.c'; else $(CYGPATH_W) '$(srcdir)/sed/debug.c'; fi`
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) sed/$(DEPDIR)/sed-debug.Tpo sed/$(DEPDIR)/sed-debug.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='sed/debug.c' object='sed/sed-debug.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(sed_sed_CPPFLAGS) $(CPPFLAGS) $(sed_sed_CFLAGS) $(CFLAGS) -c -o sed/sed-debug.obj `if test -f 'sed/debug.c'; then $(CYGPATH_W) 'sed/debug.c'; else $(CYGPATH_W) '$(srcdir)/sed/debug.c'; fi`
+
 sed/sed-execute.o: sed/execute.c
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(sed_sed_CPPFLAGS) $(CPPFLAGS) $(sed_sed_CFLAGS) $(CFLAGS) -MT sed/sed-execute.o -MD -MP -MF sed/$(DEPDIR)/sed-execute.Tpo -c -o sed/sed-execute.o `test -f 'sed/execute.c' || echo '$(srcdir)/'`sed/execute.c
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) sed/$(DEPDIR)/sed-execute.Tpo sed/$(DEPDIR)/sed-execute.Po
@@ -3283,7 +3373,7 @@ check-am: all-am
 check: $(BUILT_SOURCES)
 	$(MAKE) $(AM_MAKEFLAGS) check-recursive
 all-am: Makefile $(INFO_DEPS) $(PROGRAMS) $(LIBRARIES) $(MANS) $(DATA) \
-		$(HEADERS) config.h all-local
+		$(HEADERS) config.h
 installdirs: installdirs-recursive
 installdirs-am:
 	for dir in "$(DESTDIR)$(bindir)" "$(DESTDIR)$(infodir)" "$(DESTDIR)$(man1dir)"; do \
@@ -3350,6 +3440,7 @@ distclean: distclean-recursive
 	-rm -f lib/$(DEPDIR)/acl_entries.Po
 	-rm -f lib/$(DEPDIR)/alloca.Po
 	-rm -f lib/$(DEPDIR)/basename-lgpl.Po
+	-rm -f lib/$(DEPDIR)/binary-io.Po
 	-rm -f lib/$(DEPDIR)/btowc.Po
 	-rm -f lib/$(DEPDIR)/c-ctype.Po
 	-rm -f lib/$(DEPDIR)/c-strcasecmp.Po
@@ -3387,6 +3478,7 @@ distclean: distclean-recursive
 	-rm -f lib/$(DEPDIR)/mbtowc.Po
 	-rm -f lib/$(DEPDIR)/memchr.Po
 	-rm -f lib/$(DEPDIR)/memrchr.Po
+	-rm -f lib/$(DEPDIR)/mkdir.Po
 	-rm -f lib/$(DEPDIR)/mkostemp.Po
 	-rm -f lib/$(DEPDIR)/msvc-inval.Po
 	-rm -f lib/$(DEPDIR)/msvc-nothrow.Po
@@ -3427,6 +3519,7 @@ distclean: distclean-recursive
 	-rm -f lib/glthread/$(DEPDIR)/lock.Po
 	-rm -f lib/glthread/$(DEPDIR)/threadlib.Po
 	-rm -f sed/$(DEPDIR)/sed-compile.Po
+	-rm -f sed/$(DEPDIR)/sed-debug.Po
 	-rm -f sed/$(DEPDIR)/sed-execute.Po
 	-rm -f sed/$(DEPDIR)/sed-mbcs.Po
 	-rm -f sed/$(DEPDIR)/sed-regexp.Po
@@ -3470,7 +3563,7 @@ install-dvi-am: $(DVIS)
 	  echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(dvidir)'"; \
 	  $(INSTALL_DATA) $$files "$(DESTDIR)$(dvidir)" || exit $$?; \
 	done
-install-exec-am: install-binPROGRAMS install-exec-local
+install-exec-am: install-binPROGRAMS
 
 install-html: install-html-recursive
 
@@ -3578,6 +3671,7 @@ maintainer-clean: maintainer-clean-recursive
 	-rm -f lib/$(DEPDIR)/acl_entries.Po
 	-rm -f lib/$(DEPDIR)/alloca.Po
 	-rm -f lib/$(DEPDIR)/basename-lgpl.Po
+	-rm -f lib/$(DEPDIR)/binary-io.Po
 	-rm -f lib/$(DEPDIR)/btowc.Po
 	-rm -f lib/$(DEPDIR)/c-ctype.Po
 	-rm -f lib/$(DEPDIR)/c-strcasecmp.Po
@@ -3615,6 +3709,7 @@ maintainer-clean: maintainer-clean-recursive
 	-rm -f lib/$(DEPDIR)/mbtowc.Po
 	-rm -f lib/$(DEPDIR)/memchr.Po
 	-rm -f lib/$(DEPDIR)/memrchr.Po
+	-rm -f lib/$(DEPDIR)/mkdir.Po
 	-rm -f lib/$(DEPDIR)/mkostemp.Po
 	-rm -f lib/$(DEPDIR)/msvc-inval.Po
 	-rm -f lib/$(DEPDIR)/msvc-nothrow.Po
@@ -3655,6 +3750,7 @@ maintainer-clean: maintainer-clean-recursive
 	-rm -f lib/glthread/$(DEPDIR)/lock.Po
 	-rm -f lib/glthread/$(DEPDIR)/threadlib.Po
 	-rm -f sed/$(DEPDIR)/sed-compile.Po
+	-rm -f sed/$(DEPDIR)/sed-debug.Po
 	-rm -f sed/$(DEPDIR)/sed-execute.Po
 	-rm -f sed/$(DEPDIR)/sed-mbcs.Po
 	-rm -f sed/$(DEPDIR)/sed-regexp.Po
@@ -3681,15 +3777,15 @@ ps: ps-recursive
 ps-am: $(PSS)
 
 uninstall-am: uninstall-binPROGRAMS uninstall-dvi-am uninstall-html-am \
-	uninstall-info-am uninstall-local uninstall-man \
-	uninstall-pdf-am uninstall-ps-am
+	uninstall-info-am uninstall-man uninstall-pdf-am \
+	uninstall-ps-am
 
 uninstall-man: uninstall-man1
 
 .MAKE: $(am__recursive_targets) all check check-am install install-am \
 	install-strip
 
-.PHONY: $(am__recursive_targets) CTAGS GTAGS TAGS all all-am all-local \
+.PHONY: $(am__recursive_targets) CTAGS GTAGS TAGS all all-am \
 	am--depfiles am--refresh check check-TESTS check-am clean \
 	clean-aminfo clean-binPROGRAMS clean-checkPROGRAMS \
 	clean-cscope clean-generic clean-noinstLIBRARIES cscope \
@@ -3700,17 +3796,16 @@ uninstall-man: uninstall-man1
 	distcleancheck distdir distuninstallcheck dvi dvi-am html \
 	html-am info info-am install install-am install-binPROGRAMS \
 	install-data install-data-am install-dvi install-dvi-am \
-	install-exec install-exec-am install-exec-local install-html \
-	install-html-am install-info install-info-am install-man \
-	install-man1 install-pdf install-pdf-am install-ps \
-	install-ps-am install-strip installcheck installcheck-am \
-	installdirs installdirs-am maintainer-clean \
-	maintainer-clean-aminfo maintainer-clean-generic \
-	maintainer-clean-vti mostlyclean mostlyclean-aminfo \
-	mostlyclean-compile mostlyclean-generic mostlyclean-local \
-	mostlyclean-vti pdf pdf-am ps ps-am recheck tags tags-am \
-	uninstall uninstall-am uninstall-binPROGRAMS uninstall-dvi-am \
-	uninstall-html-am uninstall-info-am uninstall-local \
+	install-exec install-exec-am install-html install-html-am \
+	install-info install-info-am install-man install-man1 \
+	install-pdf install-pdf-am install-ps install-ps-am \
+	install-strip installcheck installcheck-am installdirs \
+	installdirs-am maintainer-clean maintainer-clean-aminfo \
+	maintainer-clean-generic maintainer-clean-vti mostlyclean \
+	mostlyclean-aminfo mostlyclean-compile mostlyclean-generic \
+	mostlyclean-local mostlyclean-vti pdf pdf-am ps ps-am recheck \
+	tags tags-am uninstall uninstall-am uninstall-binPROGRAMS \
+	uninstall-dvi-am uninstall-html-am uninstall-info-am \
 	uninstall-man uninstall-man1 uninstall-pdf-am uninstall-ps-am
 
 .PRECIOUS: Makefile
@@ -3777,44 +3872,6 @@ full-distcheck:
 @GL_GENERATE_ALLOCA_H_FALSE@lib/alloca.h: $(top_builddir)/config.status
 @GL_GENERATE_ALLOCA_H_FALSE@	rm -f $@
 
-# Listed in the same order as the GNU makefile conventions, and
-# provided by autoconf 2.59c+ or 2.70.
-# The Automake-defined pkg* macros are appended, in the order
-# listed in the Automake 1.10a+ documentation.
-lib/configmake.h: Makefile
-	$(AM_V_GEN)rm -f $@-t && \
-	{ echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \
-	  echo '#define PREFIX "$(prefix)"'; \
-	  echo '#define EXEC_PREFIX "$(exec_prefix)"'; \
-	  echo '#define BINDIR "$(bindir)"'; \
-	  echo '#define SBINDIR "$(sbindir)"'; \
-	  echo '#define LIBEXECDIR "$(libexecdir)"'; \
-	  echo '#define DATAROOTDIR "$(datarootdir)"'; \
-	  echo '#define DATADIR "$(datadir)"'; \
-	  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)"'; \
-	  echo '#define INFODIR "$(infodir)"'; \
-	  echo '#define HTMLDIR "$(htmldir)"'; \
-	  echo '#define DVIDIR "$(dvidir)"'; \
-	  echo '#define PDFDIR "$(pdfdir)"'; \
-	  echo '#define PSDIR "$(psdir)"'; \
-	  echo '#define LIBDIR "$(libdir)"'; \
-	  echo '#define LISPDIR "$(lispdir)"'; \
-	  echo '#define LOCALEDIR "$(localedir)"'; \
-	  echo '#define MANDIR "$(mandir)"'; \
-	  echo '#define MANEXT "$(manext)"'; \
-	  echo '#define PKGDATADIR "$(pkgdatadir)"'; \
-	  echo '#define PKGINCLUDEDIR "$(pkgincludedir)"'; \
-	  echo '#define PKGLIBDIR "$(pkglibdir)"'; \
-	  echo '#define PKGLIBEXECDIR "$(pkglibexecdir)"'; \
-	} | sed '/""/d' > $@-t && \
-	mv -f $@-t $@
-
 # We need the following in order to create <ctype.h> when the system
 # doesn't have one that works with the given compiler.
 lib/ctype.h: lib/ctype.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(WARN_ON_USE_H)
@@ -3883,7 +3940,7 @@ lib/fcntl.h: lib/fcntl.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(ARG_NON
 
 # We need the following in order to create <getopt.h> when the system
 # doesn't have one that works with the given compiler.
-lib/getopt.h: lib/getopt.in.h $(top_builddir)/config.status
+lib/getopt.h: lib/getopt.in.h $(top_builddir)/config.status $(ARG_NONNULL_H)
 	$(AM_V_GEN)rm -f $@-t $@ && \
 	{ echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \
 	  sed -e 's|@''GUARD_PREFIX''@|GL|g' \
@@ -3949,67 +4006,6 @@ lib/langinfo.h: lib/langinfo.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(W
 @GL_GENERATE_LIMITS_H_FALSE@lib/limits.h: $(top_builddir)/config.status
 @GL_GENERATE_LIMITS_H_FALSE@	rm -f $@
 
-# We need the following in order to install a simple file in $(libdir)
-# which is shared with other installed packages. We use a list of referencing
-# packages so that "make uninstall" will remove the file if and only if it
-# is not used by another installed package.
-# On systems with glibc-2.1 or newer, the file is redundant, therefore we
-# avoid installing it.
-
-all-local: lib/charset.alias lib/ref-add.sed lib/ref-del.sed
-install-exec-local: install-exec-localcharset
-install-exec-localcharset: all-local
-	if test $(GLIBC21) = no; then \
-	  case '$(host_os)' in \
-	    darwin[56]*) \
-	      need_charset_alias=true ;; \
-	    darwin* | cygwin* | mingw* | pw32* | cegcc*) \
-	      need_charset_alias=false ;; \
-	    *) \
-	      need_charset_alias=true ;; \
-	  esac ; \
-	else \
-	  need_charset_alias=false ; \
-	fi ; \
-	if $$need_charset_alias; then \
-	  $(mkinstalldirs) $(DESTDIR)$(libdir) ; \
-	fi ; \
-	if test -f $(charset_alias); then \
-	  sed -f lib/ref-add.sed $(charset_alias) > $(charset_tmp) ; \
-	  $(INSTALL_DATA) $(charset_tmp) $(charset_alias) ; \
-	  rm -f $(charset_tmp) ; \
-	else \
-	  if $$need_charset_alias; then \
-	    sed -f lib/ref-add.sed lib/charset.alias > $(charset_tmp) ; \
-	    $(INSTALL_DATA) $(charset_tmp) $(charset_alias) ; \
-	    rm -f $(charset_tmp) ; \
-	  fi ; \
-	fi
-
-uninstall-local: uninstall-localcharset
-uninstall-localcharset: all-local
-	if test -f $(charset_alias); then \
-	  sed -f lib/ref-del.sed $(charset_alias) > $(charset_tmp); \
-	  if grep '^# Packages using this file: $$' $(charset_tmp) \
-	      > /dev/null; then \
-	    rm -f $(charset_alias); \
-	  else \
-	    $(INSTALL_DATA) $(charset_tmp) $(charset_alias); \
-	  fi; \
-	  rm -f $(charset_tmp); \
-	fi
-
-lib/charset.alias: lib/config.charset
-	$(AM_V_GEN)rm -f $@-t $@ && \
-	$(SHELL) $(top_srcdir)/lib/config.charset '$(host)' > $@-t && \
-	mv $@-t $@
-
-# SUFFIXES += .sed .sin
-.sin.sed:
-	$(AM_V_GEN)rm -f $@-t $@ && \
-	sed -e '/^#/d' -e 's/@''PACKAGE''@/$(PACKAGE)/g' $< > $@-t && \
-	mv $@-t $@
-
 # We need the following in order to create <locale.h> when the system
 # doesn't have one that provides all definitions.
 lib/locale.h: lib/locale.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(ARG_NONNULL_H) $(WARN_ON_USE_H)
@@ -4023,11 +4019,16 @@ lib/locale.h: lib/locale.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(ARG_N
 	      -e 's/@''GNULIB_LOCALECONV''@/$(GNULIB_LOCALECONV)/g' \
 	      -e 's/@''GNULIB_SETLOCALE''@/$(GNULIB_SETLOCALE)/g' \
 	      -e 's/@''GNULIB_DUPLOCALE''@/$(GNULIB_DUPLOCALE)/g' \
+	      -e 's/@''GNULIB_LOCALENAME''@/$(GNULIB_LOCALENAME)/g' \
+	      -e 's|@''HAVE_NEWLOCALE''@|$(HAVE_NEWLOCALE)|g' \
 	      -e 's|@''HAVE_DUPLOCALE''@|$(HAVE_DUPLOCALE)|g' \
+	      -e 's|@''HAVE_FREELOCALE''@|$(HAVE_FREELOCALE)|g' \
 	      -e 's|@''HAVE_XLOCALE_H''@|$(HAVE_XLOCALE_H)|g' \
 	      -e 's|@''REPLACE_LOCALECONV''@|$(REPLACE_LOCALECONV)|g' \
 	      -e 's|@''REPLACE_SETLOCALE''@|$(REPLACE_SETLOCALE)|g' \
+	      -e 's|@''REPLACE_NEWLOCALE''@|$(REPLACE_NEWLOCALE)|g' \
 	      -e 's|@''REPLACE_DUPLOCALE''@|$(REPLACE_DUPLOCALE)|g' \
+	      -e 's|@''REPLACE_FREELOCALE''@|$(REPLACE_FREELOCALE)|g' \
 	      -e 's|@''REPLACE_STRUCT_LCONV''@|$(REPLACE_STRUCT_LCONV)|g' \
 	      -e '/definitions of _GL_FUNCDECL_RPL/r $(CXXDEFS_H)' \
 	      -e '/definition of _GL_ARG_NONNULL/r $(ARG_NONNULL_H)' \
@@ -4647,6 +4648,7 @@ lib/unistd.h: lib/unistd.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(ARG_N
 	      -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_GETPASS''@/$(GNULIB_GETPASS)/g' \
 	      -e 's/@''GNULIB_GETUSERSHELL''@/$(GNULIB_GETUSERSHELL)/g' \
 	      -e 's/@''GNULIB_GROUP_MEMBER''@/$(GNULIB_GROUP_MEMBER)/g' \
 	      -e 's/@''GNULIB_ISATTY''@/$(GNULIB_ISATTY)/g' \
@@ -4690,6 +4692,7 @@ lib/unistd.h: lib/unistd.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(ARG_N
 	      -e 's|@''HAVE_GETGROUPS''@|$(HAVE_GETGROUPS)|g' \
 	      -e 's|@''HAVE_GETHOSTNAME''@|$(HAVE_GETHOSTNAME)|g' \
 	      -e 's|@''HAVE_GETPAGESIZE''@|$(HAVE_GETPAGESIZE)|g' \
+	      -e 's|@''HAVE_GETPASS''@|$(HAVE_GETPASS)|g' \
 	      -e 's|@''HAVE_GROUP_MEMBER''@|$(HAVE_GROUP_MEMBER)|g' \
 	      -e 's|@''HAVE_LCHOWN''@|$(HAVE_LCHOWN)|g' \
 	      -e 's|@''HAVE_LINK''@|$(HAVE_LINK)|g' \
@@ -4704,7 +4707,6 @@ lib/unistd.h: lib/unistd.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(ARG_N
 	      -e 's|@''HAVE_SLEEP''@|$(HAVE_SLEEP)|g' \
 	      -e 's|@''HAVE_SYMLINK''@|$(HAVE_SYMLINK)|g' \
 	      -e 's|@''HAVE_SYMLINKAT''@|$(HAVE_SYMLINKAT)|g' \
-	      -e 's|@''HAVE_TRUNCATE''@|$(HAVE_TRUNCATE)|g' \
 	      -e 's|@''HAVE_UNLINKAT''@|$(HAVE_UNLINKAT)|g' \
 	      -e 's|@''HAVE_USLEEP''@|$(HAVE_USLEEP)|g' \
 	      -e 's|@''HAVE_DECL_ENVIRON''@|$(HAVE_DECL_ENVIRON)|g' \
@@ -4716,6 +4718,7 @@ lib/unistd.h: lib/unistd.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(ARG_N
 	      -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_TRUNCATE''@|$(HAVE_DECL_TRUNCATE)|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' \
@@ -4733,6 +4736,7 @@ lib/unistd.h: lib/unistd.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(ARG_N
 	      -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_GETPASS''@|$(REPLACE_GETPASS)|g' \
 	      -e 's|@''REPLACE_ISATTY''@|$(REPLACE_ISATTY)|g' \
 	      -e 's|@''REPLACE_LCHOWN''@|$(REPLACE_LCHOWN)|g' \
 	      -e 's|@''REPLACE_LINK''@|$(REPLACE_LINK)|g' \