Merge branch 'master' into ng/master

* master:
  fixup: copyright yars in two recent tests
  obsolete: fixup: don't use AU_DEFUN where AC_DEFUN is required
  obsolete: better error message if AM_PROG_MKDIR_P is used
  NEWS: document removal of AM_PROG_MKDIR_P macro
  NEWS: minor fixup
  obsolete: better error message if AM_PROG_CC_STDC is used
  obsolete: better error message if AM_CONFIG_HEADER is used
  sync: update files from upstream with "make fetch"
  tests: better names for temporary configure.ac files

Signed-off-by: Stefano Lattarini <stefano.lattarini@gmail.com>

diff --cc Makefile.am
index 0373386884e7e03db0bebf9ebf22a55e030e396a,42b1999680cf6aba2d70377f4e8a229563c56c1d..076b7c23f9e9004ed13d6f09f2f3446310f24e9a
--- 1/Makefile.am
--- 2/Makefile.am
+++ b/Makefile.am
@@@ -254,8 -276,11 +254,9 @@@ dist_automake_ac_DATA = 
    m4/install-sh.m4 \
    m4/lex.m4 \
    m4/lispdir.m4 \
 -  m4/maintainer.m4 \
 -  m4/make.m4 \
    m4/minuso.m4 \
    m4/missing.m4 \
+   m4/obsolete-err.m4 \
    m4/options.m4 \
    m4/python.m4 \
    m4/runlog.m4 \

diff --cc t/pr401.sh
index be67a537bdc9ab7979b79ed8067d21fcee4b18ba,36ca5a35db96e1b039288ca1f661fa54c07b0ed0..3156f1fcc1bf1a1cf374bfda916def2ae5aaf2fc
--- 1/t/pr401.sh
--- 2/t/pr401.sh
+++ b/t/pr401.sh
@@@ -142,10 -155,12 +142,10 @@@ $MAKE distclea
  ## Test using LIBOBJS from parent directory. ##
  ## ----------------------------------------- ##
  
- sed 's/^.*src\/Makefile.*$//' configure.ac >configure.int
- mv -f configure.int configure.ac
+ sed 's/^.*src\/Makefile.*$//' configure.ac >configure.tmp
+ mv -f configure.tmp configure.ac
  
  cat >Makefile.am <<'EOF'
 -AUTOMAKE_OPTIONS = subdir-objects
 -
  noinst_LIBRARIES = lib/libfeep.a
  lib_libfeep_a_SOURCES =
  lib_libfeep_a_LIBADD = $(LIBOBJS)

diff --cc t/pr401b.sh
index cde992079a6d577312b27c598ce933c376cae0b8,ad88b37e184d0ba77fc020637aad9de5f21badf0..b57f32f491a54b24169fafb13b11b6a7b4b5748e
--- 1/t/pr401b.sh
--- 2/t/pr401b.sh
+++ b/t/pr401b.sh
@@@ -144,10 -155,12 +144,10 @@@ $MAKE distclea
  ## Test using LTLIBOBJS from parent directory. ##
  ## ------------------------------------------- ##
  
- sed 's/^.*src\/Makefile.*$//' configure.ac >configure.int
- mv -f configure.int configure.ac
+ sed 's/^.*src\/Makefile.*$//' configure.ac >configure.tmp
+ mv -f configure.tmp configure.ac
  
  cat >Makefile.am <<'EOF'
 -AUTOMAKE_OPTIONS = subdir-objects
 -
  noinst_LTLIBRARIES = lib/libfeep.la
  lib_libfeep_la_SOURCES =
  lib_libfeep_la_LIBADD = $(LTLIBOBJS)

diff --cc t/pr401c.sh
index 34c4450f122bc13d345b1dfcb9bb4eb314842f0b,9331a50431ef7a406b395988aac4dfb895b759bb..6f4a3157c0d16c8f58f0ff5dae8125518a4cb3cc
--- 1/t/pr401c.sh
--- 2/t/pr401c.sh
+++ b/t/pr401c.sh
@@@ -145,10 -157,12 +145,10 @@@ $MAKE distclea
  ## Test using ALLOCA from parent directory. ##
  ## ---------------------------------------- ##
  
- sed 's/^.*src\/Makefile.*$//' configure.ac >configure.int
- mv -f configure.int configure.ac
+ sed 's/^.*src\/Makefile.*$//' configure.ac >configure.tmp
+ mv -f configure.tmp configure.ac
  
  cat >Makefile.am <<'EOF'
 -AUTOMAKE_OPTIONS = subdir-objects
 -
  noinst_LIBRARIES = lib/libfeep.a
  lib_libfeep_a_SOURCES =
  lib_libfeep_a_LIBADD = $(ALLOCA)