m4-git: new HEAD

4 files changed, 180 insertions, 239 deletions

diff --git a/repos/autotools/autotools-git/m4/m4-patches/0001-bootstrap-fix-for-latest-gnulib.patch b/repos/autotools/autotools-git/m4/m4-patches/0001-bootstrap-fix-for-latest-gnulib.patch
new file mode 100644
index 0000000..400ae5a
--- /dev/null
+++ b/repos/autotools/autotools-git/m4/m4-patches/0001-bootstrap-fix-for-latest-gnulib.patch
@@ -0,0 +1,88 @@
+From 7fcae990a900e117e674f119c67aa4169c4c503a Mon Sep 17 00:00:00 2001
+From: Pavel Raiskup <praiskup@redhat.com>
+Date: Tue, 14 Jun 2016 14:20:42 +0200
+Subject: [PATCH 1/2] bootstrap: fix for latest gnulib
+
+This is just hotfix to unblock the build against gnulib, but
+a better fix is on TODO.
+
+* .gitignore: Mention files from 'assure' gnulib module.
+* bootstrap.conf (src_modules): Add 'assure', this hack in
+bootstrap.conf is not able (or doesn't want) to calculate
+transitive dependencies correctly.
+* build-aux/gnulib: Sync with upstream.
+* build-aux/m4/gnulib-cache.m4: Regenerate.
+* Makefile.am: Distribute also assure.h.
+---
+ .gitignore                   | 1 +
+ Makefile.am                  | 1 +
+ bootstrap.conf               | 1 +
+ build-aux/gnulib             | 2 +-
+ build-aux/m4/gnulib-cache.m4 | 4 ++--
+ 5 files changed, 6 insertions(+), 3 deletions(-)
+
+diff --git a/.gitignore b/.gitignore
+index b196d98..e698cb9 100644
+--- a/.gitignore
++++ b/.gitignore
+@@ -70,6 +70,7 @@ Makefile.inc
+ /po/POTFILES
+ /po/Rules-quot
+ /po/stamp-po
++/src/assure.h
+ /src/getopt*
+ /src/m4
+ /src/version-etc*
+diff --git a/Makefile.am b/Makefile.am
+index 86561a8..d9e17c0 100644
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -123,6 +123,7 @@ MAINTAINERCLEANFILES += \
+ 
+ bin_PROGRAMS	= src/m4
+ src_m4_SOURCES	= \
++		  src/assure.h \
+ 		  src/xstrtoul.c \
+ 		  src/xstrtol-error.c \
+ 		  src/xstrtol.c \
+diff --git a/bootstrap.conf b/bootstrap.conf
+index b48b650..255ad5e 100644
+--- a/bootstrap.conf
++++ b/bootstrap.conf
+@@ -59,6 +59,7 @@ gnulib_non_module_files=$gnulib_non_module_files"
+ # List dependencies here too; we don't extract them, otherwise dependent
+ # modules could end up being imported to src/ *and* gnu/!
+ src_modules='
++assure
+ getopt-gnu
+ getopt-posix
+ version-etc-fsf
+diff --git a/build-aux/gnulib b/build-aux/gnulib
+index 79002fd..097a592 160000
+--- a/build-aux/gnulib
++++ b/build-aux/gnulib
+@@ -1 +1 @@
+-Subproject commit 79002fdd9f556694728f5ebc2ea0c43c14ef476d
++Subproject commit 097a5928a785bae77ed1255e57b6553dd1912efe
+diff --git a/build-aux/m4/gnulib-cache.m4 b/build-aux/m4/gnulib-cache.m4
+index 145b3da..46e39ca 100644
+--- a/build-aux/m4/gnulib-cache.m4
++++ b/build-aux/m4/gnulib-cache.m4
+@@ -1,4 +1,4 @@
+-# Copyright (C) 2002-2014 Free Software Foundation, Inc.
++# Copyright (C) 2002-2016 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
+@@ -27,7 +27,7 @@
+ 
+ 
+ # Specification in the form of a command-line invocation:
+-#   gnulib-tool --import --dir=. --local-dir=build-aux/gl --lib=libgnu --source-base=m4/gnu --m4-base=build-aux/m4 --doc-base=doc --tests-base=tests/gnu --aux-dir=build-aux --with-tests --with-c++-tests --no-conditional-dependencies --libtool --macro-prefix=M4 assert autobuild avltree-oset binary-io bitrotate clean-temp cloexec close-stream closein config-h configmake dirname error execute fclose fdl-1.3 fflush filenamecat flexmember fopen fopen-safer freadptr freadseek fseeko gendocs gettext git-version-gen gitlog-to-changelog gnumakefile gnupload gpl-3.0 intprops inttypes maintainer-makefile manywarnings memchr2 memcmp2 memmem mkstemp obstack obstack-printf-posix progname propername quote regex regexprops-generic rename setenv sigpipe snprintf-posix spawn-pipe sprintf-posix stdbool stdlib-safer strnlen strtod tempname unlocked-io unsetenv update-copyright vasnprintf-posix verify verror wait-process xalloc xalloc-die xmemdup0 xoset xprintf-posix xstrndup xvasprintf-posix
++#   gnulib-tool --import --local-dir=build-aux/gl --lib=libgnu --source-base=m4/gnu --m4-base=build-aux/m4 --doc-base=doc --tests-base=tests/gnu --aux-dir=build-aux --with-tests --with-c++-tests --no-conditional-dependencies --libtool --macro-prefix=M4 assert autobuild avltree-oset binary-io bitrotate clean-temp cloexec close-stream closein config-h configmake dirname error execute fclose fdl-1.3 fflush filenamecat flexmember fopen fopen-safer freadptr freadseek fseeko gendocs gettext git-version-gen gitlog-to-changelog gnumakefile gnupload gpl-3.0 intprops inttypes maintainer-makefile manywarnings memchr2 memcmp2 memmem mkstemp obstack obstack-printf-posix progname propername quote regex regexprops-generic rename setenv sigpipe snprintf-posix spawn-pipe sprintf-posix stdbool stdlib-safer strnlen strtod tempname unlocked-io unsetenv update-copyright vasnprintf-posix verify verror wait-process xalloc xalloc-die xmemdup0 xoset xprintf-posix xstrndup xvasprintf-posix
+ 
+ # Specification in the form of a few gnulib-tool.m4 macro invocations:
+ gl_LOCAL_DIR([build-aux/gl])
+-- 
+2.7.4
+
diff --git a/repos/autotools/autotools-git/m4/m4-patches/0001-build-fix-bootstrap-fail.patch b/repos/autotools/autotools-git/m4/m4-patches/0001-build-fix-bootstrap-fail.patch
deleted file mode 100644
index da64dde..0000000
--- a/repos/autotools/autotools-git/m4/m4-patches/0001-build-fix-bootstrap-fail.patch
+++ /dev/null
@@ -1,188 +0,0 @@
-From 29aaca21c98b7eff51c56e608fd5053831d42ea3 Mon Sep 17 00:00:00 2001
-From: Pavel Raiskup <praiskup@redhat.com>
-Date: Mon, 26 May 2014 07:18:28 +0200
-Subject: [PATCH 1/2] build: fix bootstrap fail
-
-Moving the 'doc' related Makefile targets into doc/Makefile.am to
-avoid building manual page before the m4 binary itself (suggested
-by automake.info).  Also use LT_LIB_DLLOAD macro to perform proper
-check for dynamic loading API.
-
-References: a43fd66dc18 (revert)
-
-* Makefile.am (SUBDIRS): Add doc subdir.
-(m4_libm4_la_LIBADD): Remove redundant $(LIBADD_DL).
-* Makefile.am. Move to docs-related rules to ..
-* doc/Makefile.am: .. here.
-* configure.ac (LT_LIB_DLLOAD): Added, needed for linking
-dlopen(), dlerror() and dlsym().
-* po/Makevars: Regenerate.
-* build-aux/m4/gnulib-cache.m4: Likewise.
-* build-aux/gnulib: Pull newest version.
----
- Makefile.am                  | 23 ++---------------------
- build-aux/gnulib             |  2 +-
- build-aux/m4/gnulib-cache.m4 |  2 +-
- configure.ac                 |  4 ++++
- doc/Makefile.am              | 35 +++++++++++++++++++++++++++++++++++
- po/Makevars                  |  6 +++---
- 6 files changed, 46 insertions(+), 26 deletions(-)
- create mode 100644 doc/Makefile.am
-
-diff --git a/Makefile.am b/Makefile.am
-index c752ff2..d378b76 100644
---- a/Makefile.am
-+++ b/Makefile.am
-@@ -20,10 +20,9 @@
- ##
- ## Written by Gary V. Vaughan <gary@gnu.org>
- 
--config_aux_dir	= build-aux
- config_macro_dir= $(config_aux_dir)/m4
- 
--SUBDIRS		= po m4/gnu . tests/gnu
-+SUBDIRS		= po m4/gnu . doc tests/gnu
- 
- ACLOCAL_AMFLAGS = -I build-aux/m4
- AUTOMAKE_OPTIONS = nostdinc
-@@ -232,7 +231,7 @@ m4_libm4_la_SOURCES	= \
- 		  m4/syntax.c \
- 		  m4/utility.c
- m4_libm4_la_LIBADD = m4/gnu/libgnu.la \
--		  $(LIBLTDL) $(LTLIBINTL) $(LIBADD_DL)
-+		  $(LIBLTDL) $(LTLIBINTL)
- m4_libm4_la_DEPENDENCIES = $(LTDLDEPS) m4/gnu/libgnu.la
- 
- # This file needs to be regenerated at configure time.
-@@ -241,24 +240,6 @@ dist-hook:
- EXTRA_DIST     += m4/system_.h
- 
- 
--## -------------- ##
--## Documentation. ##
--## -------------- ##
--info_TEXINFOS	= doc/m4.texi
--m4_TEXINFOS	= doc/regexprops-generic.texi doc/fdl-1.3.texi doc/gpl-3.0.texi
--dist_man_MANS	= $(srcdir)/doc/m4.1
--EXTRA_DIST	+= doc/gendocs_template
--MAINTAINERCLEANFILES += doc/gendocs_template
--HELP2MAN	= $(SHELL) $(top_srcdir)/$(config_aux_dir)/missing --run help2man
--
--# Build the man page once in the srcdir, rather than in every VPATH build
--# dir, to match how automake builds info pages.  This is safe for 'make
--# distcheck' since it is distributed pre-built.
--$(srcdir)/doc/m4.1: .version $(srcdir)/src/main.c
--	@echo "Updating the \`man' page \`$@'"; \
--	$(HELP2MAN) --name="macro processor" --source=FSF \
--	  --info-page=m4 --output=$@ src/m4$(EXEEXT)
--
- TAGS_FILES	= $(infos_TEXINFOS)
- TAGS_DEPENDENCIES = $(TAGS_FILES)
- ETAGS_ARGS	= --language=none --regex='/@node \([^,]*\)/\1/' $(TAGS_FILES)
-diff --git a/build-aux/gnulib b/build-aux/gnulib
-index a4482b6..98ca2c0 160000
---- a/build-aux/gnulib
-+++ b/build-aux/gnulib
-@@ -1 +1 @@
--Subproject commit a4482b667f8c6ba6e89eacb876fab7ff4775dab4
-+Subproject commit 98ca2c063cfe019b673fd0ce81448c919e9c989c
-diff --git a/build-aux/m4/gnulib-cache.m4 b/build-aux/m4/gnulib-cache.m4
-index a31e566..145b3da 100644
---- a/build-aux/m4/gnulib-cache.m4
-+++ b/build-aux/m4/gnulib-cache.m4
-@@ -1,4 +1,4 @@
--# Copyright (C) 2002-2013 Free Software Foundation, Inc.
-+# Copyright (C) 2002-2014 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
-diff --git a/configure.ac b/configure.ac
-index 2fe6d9e..23bddfc 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -83,6 +83,7 @@ M4_CHECK_DEBUGGING
- ## ----------------------- ##
- LT_PREREQ([2.2])
- LT_INIT([shared dlopen win32-dll])
-+LT_LIB_DLLOAD
- 
- AC_ARG_ENABLE([gcc-warnings],
-   [AS_HELP_STRING([--enable-gcc-warnings],
-@@ -95,6 +96,8 @@ AC_ARG_ENABLE([gcc-warnings],
-   [gl_gcc_warnings=no]
- )
- 
-+AC_SUBST([config_aux_dir], [build-aux])
-+
- if test "$gl_gcc_warnings" = yes; then
-   gl_WARN_ADD([-Werror], [WERROR_CFLAGS])
-   AC_SUBST([WERROR_CFLAGS])
-@@ -280,6 +283,7 @@ M4_SYSCMD
- ## -------- ##
- AC_CONFIG_FILES([
- Makefile
-+doc/Makefile
- m4/gnu/Makefile
- m4/system.h:m4/system_.h
- tests/atlocal
-diff --git a/doc/Makefile.am b/doc/Makefile.am
-new file mode 100644
-index 0000000..614a91a
---- /dev/null
-+++ b/doc/Makefile.am
-@@ -0,0 +1,35 @@
-+## Makefile.am - template for generating Makefile via Automake
-+##
-+## Copyright (C) 2014 Free Software Foundation, Inc.
-+##
-+## This file is part of GNU M4.
-+##
-+## GNU M4 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.
-+##
-+## GNU M4 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 program.  If not, see <http://www.gnu.org/licenses/>.
-+##
-+## Written by Gary V. Vaughan <gary@gnu.org>
-+
-+info_TEXINFOS	= m4.texi
-+m4_TEXINFOS	= regexprops-generic.texi fdl-1.3.texi gpl-3.0.texi
-+dist_man_MANS	= m4.1
-+EXTRA_DIST	= gendocs_template
-+MAINTAINERCLEANFILES = gendocs_template
-+HELP2MAN	= $(SHELL) $(top_srcdir)/$(config_aux_dir)/missing --run help2man
-+
-+# Build the man page once in the srcdir, rather than in every VPATH build
-+# dir, to match how automake builds info pages.  This is safe for 'make
-+# distcheck' since it is distributed pre-built.
-+m4.1: $(top_srcdir)/.version $(top_srcdir)/src/main.c
-+	@echo "Updating the \`man' page \`$@'"; \
-+	$(HELP2MAN) --name="macro processor" --source=FSF \
-+	  --info-page=m4 --output=$@ $(top_srcdir)/src/m4$(EXEEXT)
-diff --git a/po/Makevars b/po/Makevars
-index 118868e..6f3cd63 100644
---- a/po/Makevars
-+++ b/po/Makevars
-@@ -9,9 +9,9 @@ top_builddir = ..
- 
- # These options get passed to xgettext.
- XGETTEXT_OPTIONS = --keyword=_ --keyword=N_ \
----flag=_:1:pass-c-format \
----flag=N_:1:pass-c-format \
--$${end_of_xgettext_options+}
-+                     --flag=_:1:pass-c-format \
-+        --flag=N_:1:pass-c-format \
-+             $${end_of_xgettext_options+}
- 
- # This is the copyright holder that gets inserted into the header of the
- # $(DOMAIN).pot file.  Set this to the copyright holder of the surrounding
--- 
-1.9.3
-
diff --git a/repos/autotools/autotools-git/m4/m4-patches/0002-modules-inclusions-fix-path-searching-issues.patch b/repos/autotools/autotools-git/m4/m4-patches/0002-modules-inclusions-fix-path-searching-issues.patch
index 2389f33..1ee896b 100644
--- a/repos/autotools/autotools-git/m4/m4-patches/0002-modules-inclusions-fix-path-searching-issues.patch
+++ b/repos/autotools/autotools-git/m4/m4-patches/0002-modules-inclusions-fix-path-searching-issues.patch
@@ -1,34 +1,40 @@
-From 60af89a04825c502ac374b3cf3c077e6427451c8 Mon Sep 17 00:00:00 2001
+From e287753cb90be996ae932aeb63b58a8075f8189a Mon Sep 17 00:00:00 2001
 From: Pavel Raiskup <praiskup@redhat.com>
-Date: Wed, 28 May 2014 12:25:52 +0200
-Subject: [PATCH 2/2] modules,inclusions: fix path searching issues
+Date: Thu, 16 Jun 2016 13:42:13 +0200
+Subject: [PATCH 2/2] modules, inclusions: fix path searching issues
 
-When 'm4' directory occurred in M4PATH or current directory, the
-m4 processor ended up with message 'Is a directory' and did not
-continue to search for 'm4.so' somewhere else in path.
+When 'm4' directory occurred in M4PATH or current directory
+(happens very often with autotooled packages), the m4 processor
+ended up with message 'Is a directory' and did not continue to
+search for 'm4.so' somewhere else in path.
 
-Expanding 'include(Makefile)' for example failed when M4PATH was
-set because the current directory was not searched.
+Expanding 'include(Makefile)' from $(srcdir) for example failed
+when M4PATH was set because the current directory was not
+searched.
 
 * m4/path.c (try_prefixes): New function.
-(m4_path_search): Deduplicate suffix trying by try_prefixes.
+(m4_path_search): De-duplicate suffix trying by try_prefixes.
 (m4__include_init): Always prepend current directory.
 * tests/testsuite.at (AT_CHECK_M4): Filter out test output
 dependant on user's setup.
 * tests/options.at: Adjust expected stderr output.
+* tests/others.at: As we now return really the _first_ errno
+occured during path searching, we need to adjust expected error
+output.
 * doc/m4.texi: likewise.
 ---
  doc/m4.texi        |   2 +
- m4/path.c          | 111 +++++++++++++++++++++++++++--------------------------
+ m4/path.c          | 126 ++++++++++++++++++++++++++++-------------------------
  tests/options.at   |   6 ++-
+ tests/others.at    |   8 ++--
  tests/testsuite.at |   1 +
- 4 files changed, 64 insertions(+), 56 deletions(-)
+ 5 files changed, 77 insertions(+), 66 deletions(-)
 
 diff --git a/doc/m4.texi b/doc/m4.texi
-index 8d40cae..95eb083 100644
+index ba1b157..7f0d375 100644
 --- a/doc/m4.texi
 +++ b/doc/m4.texi
-@@ -4682,6 +4682,8 @@
+@@ -4683,6 +4683,8 @@
  @comment options: -dip
  @example
  $ @kbd{m4 -dip -I doc/examples}
@@ -38,16 +44,18 @@ index 8d40cae..95eb083 100644
  define(`foo', `m4wrap(`wrapped text
  ')dnl')
 diff --git a/m4/path.c b/m4/path.c
-index 3a93289..66e460b 100644
+index ef743a3..a1ff090 100644
 --- a/m4/path.c
 +++ b/m4/path.c
-@@ -143,6 +143,53 @@ m4_add_include_directory (m4 *context, const char *dir, bool prepend)
+@@ -182,6 +182,63 @@ m4_add_include_directory (m4 *context, const char *dir, bool prepend)
  #endif
  }
  
-+/* FILENAME must contain directory path also */
++/* Search for m4 module in DIRNAME directory.  Try to test _all_ SUFFIXES with
++   FILENAME; use the first combination which seems to be correct m4 module.  If
++   the FILENAME is absolute path, DIRNAME shall be NULL. */
 +static char *
-+try_prefixes (m4 *context, const char *dirname, const char *filename,
++try_suffixes (m4 *context, const char *dirname, const char *filename,
 +              size_t max_suffix_len, const char **suffixes)
 +{
 +  int e = 0, i;
@@ -56,20 +64,27 @@ index 3a93289..66e460b 100644
 +  size_t mem = strlen (filepath);
 +  filepath = xrealloc (filepath, mem + max_suffix_len + 1);
 +
-+  /* Try appending each of the suffixes we were given.  */
++#if TRUNCATE_FILENAME
++  filepath = path_truncate (filepath);
++  mem = strlen (filepath); /* recalculate length after truncation */
++#endif
++
 +#ifdef DEBUG_INCL
 +  xfprintf (stderr, "path_search (%s) -- trying %s\n", filename, filepath);
 +#endif
 +
-+
-+  /* If search fails, we'll use the error we got from the first try
-+     access (usually with no suffix).  */
++  /* If search fails, we'll use the errno we got from the first unsuccessful
++     try. */
 +  for (i = 0; suffixes && suffixes[i]; !i && (e = errno), ++i)
 +    {
 +      struct stat st;
 +      int rc;
 +      strcpy (filepath + mem, suffixes[i]);
 +
++      /* Use stat() here rather than access() because access does not give us
++         S_ISDIR(st.st_mode) info.  Choosing a module which we have no
++         privileges to open is not problem because dlopening later will fail
++         anyway with a understandable error. */
 +      if (stat (filepath, &st))
 +        continue;
 +
@@ -82,6 +97,7 @@ index 3a93289..66e460b 100644
 +                                              filepath));
 +          return filepath;
 +        }
++
 +      if (S_ISDIR (st.st_mode))
 +        errno = EISDIR;
 +    }
@@ -95,7 +111,7 @@ index 3a93289..66e460b 100644
  
  /* Search for FILENAME according to -B options, `.', -I options, then
     M4PATH environment.  If successful, return the open file, and if
-@@ -181,61 +228,18 @@ m4_path_search (m4 *context, const char *filename, const char **suffixes)
+@@ -220,69 +277,18 @@ m4_path_search (m4 *context, const char *filename, const char **suffixes)
    /* If file is absolute, or if we are not searching a path, a single
       lookup will do the trick.  */
    if (IS_ABSOLUTE_FILE_NAME (filename))
@@ -103,7 +119,11 @@ index 3a93289..66e460b 100644
 -      size_t mem = strlen (filename);
 -
 -      /* Try appending each of the suffixes we were given.  */
--      filepath = strncpy (xmalloc (mem + max_suffix_len +1), filename, mem);
+-      filepath = strncpy (xmalloc (mem + max_suffix_len +1), filename, mem +1);
+-#if TRUNCATE_FILENAME
+-      filepath = path_truncate (filepath);
+-      mem = strlen (filepath); /* recalculate length after truncation */
+-#endif
 -      for (i = 0; suffixes && suffixes[i]; ++i)
 -        {
 -          strcpy (filepath + mem, suffixes[i]);
@@ -116,13 +136,13 @@ index 3a93289..66e460b 100644
 -	    e = errno;
 -        }
 -      free (filepath);
--
++    return try_suffixes (context, NULL, filename, max_suffix_len, suffixes);
+ 
 -      /* No such file.  */
 -      errno = e;
 -      return NULL;
 -    }
-+    return try_prefixes (context, NULL, filename, max_suffix_len, suffixes);
- 
+-
 -  for (incl = m4__get_search_path (context)->list;
 -       incl != NULL; incl = incl->next)
 +  for (incl = m4__get_search_path (context)->list, i = 0;
@@ -146,14 +166,18 @@ index 3a93289..66e460b 100644
 -      else if (!incl->len)
 -	/* Capture errno only when searching `.'.  */
 -	e = errno;
--
--      filepath = strncpy (xmalloc (mem + max_suffix_len +1), pathname, mem);
--      free (pathname);
-+      char *pathname = try_prefixes (context, incl->dir, filename,
++      char *pathname = try_suffixes (context, incl->dir, filename,
 +                                     max_suffix_len, suffixes);
 +      if (pathname)
 +        return pathname;
  
+-      filepath = strncpy (xmalloc (mem + max_suffix_len +1), pathname, mem +1);
+-      free (pathname);
+-#if TRUNCATE_FILENAME
+-      filepath = path_truncate (filepath);
+-      mem = strlen (filepath); /* recalculate length after truncation */
+-#endif
+- 
 -      for (i = 0; suffixes && suffixes[i]; ++i)
 -        {
 -          strcpy (filepath + mem, suffixes[i]);
@@ -166,21 +190,11 @@ index 3a93289..66e460b 100644
      }
  
    errno = e;
-@@ -336,8 +340,7 @@ m4__include_init (m4 *context)
-     /* If M4PATH was not set, then search just the current directory by
-        default. */
-     assert (info);
--    if (info->list_end == NULL)
--      search_path_add (info, "", false);
-+    search_path_add (info, "", true);
- 
-     /* Non-core modules installation directory. */
-     search_path_add (info, PKGLIBDIR, false);
 diff --git a/tests/options.at b/tests/options.at
-index 8503f8f..574ed3f 100644
+index 7084207..8fa19b6 100644
 --- a/tests/options.at
 +++ b/tests/options.at
-@@ -422,10 +422,12 @@ m4debug: input from m4wrap exhausted
+@@ -423,10 +423,12 @@ m4debug: input from m4wrap exhausted
  dnl Test all flags.
  AT_CHECK_M4([-dV in], [0], [[3
  0
@@ -194,7 +208,7 @@ index 8503f8f..574ed3f 100644
  m4debug: module gnu: opening file
  m4debug: module gnu: init hook called
  m4debug: module gnu: opened
-@@ -700,7 +702,7 @@ AT_CHECK_M4([-I post -B pre in], [1],
+@@ -701,7 +703,7 @@ AT_CHECK_M4([-I post -B pre in], [1],
  [[in pre/foo
  in ./bar
  in post/blah
@@ -203,11 +217,35 @@ index 8503f8f..574ed3f 100644
  ]])
  
  AT_CLEANUP
+diff --git a/tests/others.at b/tests/others.at
+index 9c7a0c6..507ef78 100644
+--- a/tests/others.at
++++ b/tests/others.at
+@@ -144,15 +144,15 @@ AT_DATA([in3.m4],
+ 
+ AT_CHECK_M4([in1.m4/], [1], [], [stderr])
+ dnl mingw fails with EINVAL rather than the expected ENOTDIR
+-AT_CHECK([$SED 's/Invalid argument/Not a directory/' stderr], [0],
+-[[m4: cannot open file 'in1.m4/': Not a directory
++AT_CHECK([$SED 's/Invalid argument/No such file or directory/' stderr], [0],
++[[m4: cannot open file 'in1.m4/': No such file or directory
+ ]])
+ 
+ AT_CHECK_M4([in1.m4], [1], [[
+ ]], [stderr])
+ dnl mingw fails with EINVAL rather than the expected ENOTDIR
+-AT_CHECK([$SED 's/Invalid argument/Not a directory/' stderr], [0],
+-[[m4:in1.m4:1: include: cannot open file 'in2.m4/': Not a directory
++AT_CHECK([$SED 's/Invalid argument/No such file or directory/' stderr], [0],
++[[m4:in1.m4:1: include: cannot open file 'in2.m4/': No such file or directory
+ ]])
+ 
+ AT_CHECK_M4([in2.m4], [0], [[
 diff --git a/tests/testsuite.at b/tests/testsuite.at
-index 26d8346..66bb70b 100644
+index a7cdfc4..20246e2 100644
 --- a/tests/testsuite.at
 +++ b/tests/testsuite.at
-@@ -88,6 +88,7 @@ m4_case([$4], [], [], [ignore], [],
+@@ -89,6 +89,7 @@ m4_case([$4], [], [], [ignore], [],
          /^m4debug: module/s/opening file.*/opening file/
          s/\(cannot open module [^:]*\):.*/\1/
          s/Bad file number/Bad file descriptor/
@@ -216,5 +254,5 @@ index 26d8346..66bb70b 100644
      ' stderr >&2]], [0], [], [$4])])
  ])
 -- 
-1.9.3
+2.7.4
 
diff --git a/repos/autotools/autotools-git/m4/m4.spec b/repos/autotools/autotools-git/m4/m4.spec
index fd4be2d..310d141 100644
--- a/repos/autotools/autotools-git/m4/m4.spec
+++ b/repos/autotools/autotools-git/m4/m4.spec
@@ -4,7 +4,7 @@
 
 %{?scl:%scl_package m4}
 
-%global upstream_stamp 645-0dc1
+%global upstream_stamp 678-c9436
 
 
 Summary: The GNU macro processor
@@ -13,7 +13,7 @@ Version: 1.9a
 Release: 5.%(echo %upstream_stamp | sed 's|-|_|')%{?dist}
 License: GPLv3+
 Group: Applications/Text
-Source0: m4-%{version}.%{upstream_stamp}-dirty.tar.gz
+Source0: m4-%{version}.%{upstream_stamp}.tar.gz
 URL: http://www.gnu.org/software/m4/
 Requires(post): /sbin/install-info
 Requires(preun): /sbin/install-info
@@ -45,7 +45,7 @@ not for running configure scripts.
 Install m4 if you need a macro processor.
 
 %prep
-%setup -q -n m4-%{version}.%upstream_stamp-dirty
+%setup -q -n m4-%{version}.%upstream_stamp
 chmod 644 COPYING
 
 %build
@@ -64,11 +64,11 @@ find $RPM_BUILD_ROOT -name '*.la' -exec rm {} +
 
 %check
 export LD_LIBRARY_PATH=`pwd`/`find -name .libs | grep 'm4/.libs'`
-make %{?_smp_mflags} check || exit 0
+make %{?_smp_mflags} check
 
 
 %files -f m4.lang
-%doc AUTHORS COPYING ChangeLog NEWS README THANKS TODO
+%doc AUTHORS COPYING ChangeLog NEWS README TODO
 %{_bindir}/m4
 %{_infodir}/*
 %{_mandir}/man1/m4.1*
@@ -92,6 +92,9 @@ if [ "$1" = 0 ]; then
 fi
 
 %changelog
+* Thu Jun 16 2016 Pavel Raiskup <praiskup@redhat.com> - 1.9a-5.678_c9436
+- update to latest HEAD
+
 * Wed Aug 12 2015 Pavel Raiskup <praiskup@redhat.com> - 1.9a-5.645_0dc1
 - use _compat_el5_build only if defined (rhbz#1252751)