diff options
| author | Stefano Lattarini <stefano.lattarini@gmail.com> | 2012-01-06 19:10:32 +0100 |
|---|---|---|
| committer | Stefano Lattarini <stefano.lattarini@gmail.com> | 2012-01-06 19:10:32 +0100 |
| commit | ec269617ffec201b5e2edbdd004b0141e7f38e95 (patch) | |
| tree | 2174d5f81e843cd70f1dbf7e709361004b09343f /m4 | |
| parent | 5a2997632676d53873db02ec892daea12d2a5ad7 (diff) | |
| parent | 01c3294bac3b67004d208449fe9460fc3ab61ee4 (diff) | |
| download | automake-ec269617ffec201b5e2edbdd004b0141e7f38e95.tar.gz | |
Merge branch 'maint' into branch-1.11
* maint:
dist: do not wrap calls to 'tar' with the 'missing' script
fixup: previous commit v1.11-627-g1e0aedc
tests: fix spurious failures due to autom4te caching
parallel-tests: avoid issue with overly long lines in sed input
sync: auxiliary files from upstream synced
sync: fix syncing of 'gitlog-to-changelog' script
maintcheck: avoid false positive in sc_tests_plain_make
Diffstat (limited to 'm4')
| -rw-r--r-- | m4/tar.m4 | 9 |
1 files changed, 5 insertions, 4 deletions
@@ -1,6 +1,6 @@ # Check how to create a tarball. -*- Autoconf -*- -# Copyright (C) 2004, 2005 Free Software Foundation, Inc. +# Copyright (C) 2004, 2005, 2012 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -22,10 +22,11 @@ # a tarball read from stdin. # $(am__untar) < result.tar AC_DEFUN([_AM_PROG_TAR], -[# Always define AMTAR for backward compatibility. -AM_MISSING_PROG([AMTAR], [tar]) +[# Always define AMTAR for backward compatibility. Yes, it's still used +# in the wild :-( We should find a proper way to deprecate it ... +AC_SUBST([AMTAR], ['$${TAR-tar}']) m4_if([$1], [v7], - [am__tar='${AMTAR} chof - "$$tardir"'; am__untar='${AMTAR} xf -'], + [am__tar='$${TAR-tar} chof - "$$tardir"' am__untar='$${TAR-tar} xf -'], [m4_case([$1], [ustar],, [pax],, [m4_fatal([Unknown tar format])]) AC_MSG_CHECKING([how to create a $1 tar archive]) |