From: Stefano Lattarini <stefano.lattarini@gmail.com>
Date: Sun, 30 Dec 2012 11:12:27 +0000 (+0100)
Subject: Merge branch 'master' into ng/master
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=78e1c8e561d71ae70b2d014a758502c9dc523a95;p=thirdparty%2Fautomake.git

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>
---

78e1c8e561d71ae70b2d014a758502c9dc523a95
diff --cc Makefile.am
index 037338688,42b199968..076b7c23f
--- a/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 be67a537b,36ca5a35d..3156f1fcc
--- a/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 cde992079,ad88b37e1..b57f32f49
--- a/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 34c4450f1,9331a5043..6f4a3157c
--- a/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)