summaryrefslogtreecommitdiff
path: root/lib/Automake/Options.pm
diff options
context:
space:
mode:
authorStefano Lattarini <stefano.lattarini@gmail.com>2012-01-01 11:14:27 +0100
committerStefano Lattarini <stefano.lattarini@gmail.com>2012-01-01 11:14:27 +0100
commitc1b14e966c2aa929e80bdfb259d0a81813859509 (patch)
treecfc181ea85ba2075a50b30c9b83d518bd027837f /lib/Automake/Options.pm
parent5dee15f4684717914cbfbbc2db5fe22e8f5e25e2 (diff)
parent280407599a72f8229c7b89d64b703e2dbc94cc87 (diff)
downloadautomake-c1b14e966c2aa929e80bdfb259d0a81813859509.tar.gz
Merge branch 'maint'
* maint: tests: make 'lzip.test' executable dist: obsolete support for lzma (superseded by xz and lzip) test defs: more granular overriding of the make program docs: fix a couple broken anchors dist: add support for lzip compression docs: fix paragraph names for automake and aclocal invocations tests: fix spurious failure due to autom4te caching fix: last entry in ChangeLog tests: tweak tests on silent-rules for makes without nested vars silent-rules: fallback for makes without nested vars
Diffstat (limited to 'lib/Automake/Options.pm')
-rw-r--r--lib/Automake/Options.pm10
1 files changed, 9 insertions, 1 deletions
diff --git a/lib/Automake/Options.pm b/lib/Automake/Options.pm
index 6836157a3..34c026c28 100644
--- a/lib/Automake/Options.pm
+++ b/lib/Automake/Options.pm
@@ -272,10 +272,18 @@ sub _process_option_list (\%@)
error ($where,
"automatic de-ANSI-fication support has been removed");
}
+ elsif ($_ eq 'dist-lzma')
+ {
+ # Creation of distribution tarball compressed with lzma is
+ # deprecated, will be removed in the next major release.
+ msg 'obsolete', $where,
+ "lzma compression is deprecated; use `dist-xz' " .
+ "or `dist-lzip' instead\n";
+ }
elsif ($_ eq 'no-installman' || $_ eq 'no-installinfo'
|| $_ eq 'dist-shar' || $_ eq 'dist-zip'
|| $_ eq 'dist-tarZ' || $_ eq 'dist-bzip2'
- || $_ eq 'dist-lzip' || $_ eq 'dist-lzma' || $_ eq 'dist-xz'
+ || $_ eq 'dist-lzip' || $_ eq 'dist-xz'
|| $_ eq 'no-dist-gzip' || $_ eq 'no-dist'
|| $_ eq 'dejagnu' || $_ eq 'no-texinfo.tex'
|| $_ eq 'readme-alpha' || $_ eq 'check-news'