automake: update to 1.12.4.

diff --git a/config/rootfiles/common/automake b/config/rootfiles/common/automake
index 2b2ceb2a75523f1dbec66e0a8fea3e1c5813fac4..0c19dc3460a1a7f7dda31cfec595dc43e196a754 100644 (file)
--- a/config/rootfiles/common/automake
+++ b/config/rootfiles/common/automake
@@ -1,121 +1,133 @@
 #usr/bin/aclocal
-#usr/bin/aclocal-1.9
+#usr/bin/aclocal-1.12
 #usr/bin/automake
-#usr/bin/automake-1.9
-#usr/share/aclocal-1.9
-#usr/share/aclocal-1.9/amversion.m4
-#usr/share/aclocal-1.9/as.m4
-#usr/share/aclocal-1.9/auxdir.m4
-#usr/share/aclocal-1.9/ccstdc.m4
-#usr/share/aclocal-1.9/cond.m4
-#usr/share/aclocal-1.9/depend.m4
-#usr/share/aclocal-1.9/depout.m4
-#usr/share/aclocal-1.9/dmalloc.m4
-#usr/share/aclocal-1.9/gcj.m4
-#usr/share/aclocal-1.9/header.m4
-#usr/share/aclocal-1.9/init.m4
-#usr/share/aclocal-1.9/install-sh.m4
-#usr/share/aclocal-1.9/lead-dot.m4
-#usr/share/aclocal-1.9/lex.m4
-#usr/share/aclocal-1.9/lispdir.m4
-#usr/share/aclocal-1.9/maintainer.m4
-#usr/share/aclocal-1.9/make.m4
-#usr/share/aclocal-1.9/minuso.m4
-#usr/share/aclocal-1.9/missing.m4
-#usr/share/aclocal-1.9/mkdirp.m4
-#usr/share/aclocal-1.9/multi.m4
-#usr/share/aclocal-1.9/obsol-gt.m4
-#usr/share/aclocal-1.9/obsol-lt.m4
-#usr/share/aclocal-1.9/obsolete.m4
-#usr/share/aclocal-1.9/options.m4
-#usr/share/aclocal-1.9/protos.m4
-#usr/share/aclocal-1.9/python.m4
-#usr/share/aclocal-1.9/regex.m4
-#usr/share/aclocal-1.9/runlog.m4
-#usr/share/aclocal-1.9/sanity.m4
-#usr/share/aclocal-1.9/strip.m4
-#usr/share/aclocal-1.9/tar.m4
-#usr/share/automake-1.9
-#usr/share/automake-1.9/Automake
-#usr/share/automake-1.9/Automake/ChannelDefs.pm
-#usr/share/automake-1.9/Automake/Channels.pm
-#usr/share/automake-1.9/Automake/Condition.pm
-#usr/share/automake-1.9/Automake/Config.pm
-#usr/share/automake-1.9/Automake/Configure_ac.pm
-#usr/share/automake-1.9/Automake/DisjConditions.pm
-#usr/share/automake-1.9/Automake/FileUtils.pm
-#usr/share/automake-1.9/Automake/General.pm
-#usr/share/automake-1.9/Automake/Item.pm
-#usr/share/automake-1.9/Automake/ItemDef.pm
-#usr/share/automake-1.9/Automake/Location.pm
-#usr/share/automake-1.9/Automake/Options.pm
-#usr/share/automake-1.9/Automake/Rule.pm
-#usr/share/automake-1.9/Automake/RuleDef.pm
-#usr/share/automake-1.9/Automake/Struct.pm
-#usr/share/automake-1.9/Automake/VarDef.pm
-#usr/share/automake-1.9/Automake/Variable.pm
-#usr/share/automake-1.9/Automake/Version.pm
-#usr/share/automake-1.9/Automake/Wrap.pm
-#usr/share/automake-1.9/Automake/XFile.pm
-#usr/share/automake-1.9/COPYING
-#usr/share/automake-1.9/INSTALL
-#usr/share/automake-1.9/acinstall
-#usr/share/automake-1.9/am
-#usr/share/automake-1.9/am/ansi2knr.am
-#usr/share/automake-1.9/am/check.am
-#usr/share/automake-1.9/am/clean-hdr.am
-#usr/share/automake-1.9/am/clean.am
-#usr/share/automake-1.9/am/compile.am
-#usr/share/automake-1.9/am/configure.am
-#usr/share/automake-1.9/am/data.am
-#usr/share/automake-1.9/am/dejagnu.am
-#usr/share/automake-1.9/am/depend.am
-#usr/share/automake-1.9/am/depend2.am
-#usr/share/automake-1.9/am/distdir.am
-#usr/share/automake-1.9/am/footer.am
-#usr/share/automake-1.9/am/header-vars.am
-#usr/share/automake-1.9/am/header.am
-#usr/share/automake-1.9/am/inst-vars.am
-#usr/share/automake-1.9/am/install.am
-#usr/share/automake-1.9/am/java.am
-#usr/share/automake-1.9/am/lang-compile.am
-#usr/share/automake-1.9/am/lex.am
-#usr/share/automake-1.9/am/library.am
-#usr/share/automake-1.9/am/libs.am
-#usr/share/automake-1.9/am/libtool.am
-#usr/share/automake-1.9/am/lisp.am
-#usr/share/automake-1.9/am/ltlib.am
-#usr/share/automake-1.9/am/ltlibrary.am
-#usr/share/automake-1.9/am/mans-vars.am
-#usr/share/automake-1.9/am/mans.am
-#usr/share/automake-1.9/am/multilib.am
-#usr/share/automake-1.9/am/program.am
-#usr/share/automake-1.9/am/progs.am
-#usr/share/automake-1.9/am/python.am
-#usr/share/automake-1.9/am/remake-hdr.am
-#usr/share/automake-1.9/am/scripts.am
-#usr/share/automake-1.9/am/subdirs.am
-#usr/share/automake-1.9/am/tags.am
-#usr/share/automake-1.9/am/texi-vers.am
-#usr/share/automake-1.9/am/texibuild.am
-#usr/share/automake-1.9/am/texinfos.am
-#usr/share/automake-1.9/am/yacc.am
-#usr/share/automake-1.9/ansi2knr.1
-#usr/share/automake-1.9/ansi2knr.c
-#usr/share/automake-1.9/compile
-#usr/share/automake-1.9/config-ml.in
-#usr/share/automake-1.9/config.guess
-#usr/share/automake-1.9/config.sub
-#usr/share/automake-1.9/depcomp
-#usr/share/automake-1.9/elisp-comp
-#usr/share/automake-1.9/install-sh
-#usr/share/automake-1.9/mdate-sh
-#usr/share/automake-1.9/missing
-#usr/share/automake-1.9/mkinstalldirs
-#usr/share/automake-1.9/py-compile
-#usr/share/automake-1.9/symlink-tree
-#usr/share/automake-1.9/texinfo.tex
-#usr/share/automake-1.9/ylwrap
+#usr/bin/automake-1.12
+#usr/share/aclocal-1.12
+#usr/share/aclocal-1.12/amversion.m4
+#usr/share/aclocal-1.12/ar-lib.m4
+#usr/share/aclocal-1.12/as.m4
+#usr/share/aclocal-1.12/auxdir.m4
+#usr/share/aclocal-1.12/ccstdc.m4
+#usr/share/aclocal-1.12/cond-if.m4
+#usr/share/aclocal-1.12/cond.m4
+#usr/share/aclocal-1.12/depend.m4
+#usr/share/aclocal-1.12/depout.m4
+#usr/share/aclocal-1.12/dmalloc.m4
+#usr/share/aclocal-1.12/gcj.m4
+#usr/share/aclocal-1.12/header.m4
+#usr/share/aclocal-1.12/init.m4
+#usr/share/aclocal-1.12/install-sh.m4
+#usr/share/aclocal-1.12/lead-dot.m4
+#usr/share/aclocal-1.12/lex.m4
+#usr/share/aclocal-1.12/lispdir.m4
+#usr/share/aclocal-1.12/maintainer.m4
+#usr/share/aclocal-1.12/make.m4
+#usr/share/aclocal-1.12/minuso.m4
+#usr/share/aclocal-1.12/missing.m4
+#usr/share/aclocal-1.12/mkdirp.m4
+#usr/share/aclocal-1.12/obsol-gt.m4
+#usr/share/aclocal-1.12/obsol-lt.m4
+#usr/share/aclocal-1.12/obsolete.m4
+#usr/share/aclocal-1.12/options.m4
+#usr/share/aclocal-1.12/protos.m4
+#usr/share/aclocal-1.12/python.m4
+#usr/share/aclocal-1.12/runlog.m4
+#usr/share/aclocal-1.12/sanity.m4
+#usr/share/aclocal-1.12/silent.m4
+#usr/share/aclocal-1.12/strip.m4
+#usr/share/aclocal-1.12/substnot.m4
+#usr/share/aclocal-1.12/tar.m4
+#usr/share/aclocal-1.12/upc.m4
+#usr/share/aclocal-1.12/vala.m4
+#usr/share/aclocal/README
+#usr/share/automake-1.12
+#usr/share/automake-1.12/Automake
+#usr/share/automake-1.12/Automake/ChannelDefs.pm
+#usr/share/automake-1.12/Automake/Channels.pm
+#usr/share/automake-1.12/Automake/Condition.pm
+#usr/share/automake-1.12/Automake/Config.pm
+#usr/share/automake-1.12/Automake/Configure_ac.pm
+#usr/share/automake-1.12/Automake/DisjConditions.pm
+#usr/share/automake-1.12/Automake/FileUtils.pm
+#usr/share/automake-1.12/Automake/General.pm
+#usr/share/automake-1.12/Automake/Getopt.pm
+#usr/share/automake-1.12/Automake/Item.pm
+#usr/share/automake-1.12/Automake/ItemDef.pm
+#usr/share/automake-1.12/Automake/Location.pm
+#usr/share/automake-1.12/Automake/Options.pm
+#usr/share/automake-1.12/Automake/Rule.pm
+#usr/share/automake-1.12/Automake/RuleDef.pm
+#usr/share/automake-1.12/Automake/VarDef.pm
+#usr/share/automake-1.12/Automake/Variable.pm
+#usr/share/automake-1.12/Automake/Version.pm
+#usr/share/automake-1.12/Automake/Wrap.pm
+#usr/share/automake-1.12/Automake/XFile.pm
+#usr/share/automake-1.12/COPYING
+#usr/share/automake-1.12/INSTALL
+#usr/share/automake-1.12/am
+#usr/share/automake-1.12/am/check.am
+#usr/share/automake-1.12/am/check2.am
+#usr/share/automake-1.12/am/clean-hdr.am
+#usr/share/automake-1.12/am/clean.am
+#usr/share/automake-1.12/am/compile.am
+#usr/share/automake-1.12/am/configure.am
+#usr/share/automake-1.12/am/data.am
+#usr/share/automake-1.12/am/dejagnu.am
+#usr/share/automake-1.12/am/depend.am
+#usr/share/automake-1.12/am/depend2.am
+#usr/share/automake-1.12/am/distdir.am
+#usr/share/automake-1.12/am/footer.am
+#usr/share/automake-1.12/am/header-vars.am
+#usr/share/automake-1.12/am/header.am
+#usr/share/automake-1.12/am/inst-vars.am
+#usr/share/automake-1.12/am/install.am
+#usr/share/automake-1.12/am/java.am
+#usr/share/automake-1.12/am/lang-compile.am
+#usr/share/automake-1.12/am/lex.am
+#usr/share/automake-1.12/am/library.am
+#usr/share/automake-1.12/am/libs.am
+#usr/share/automake-1.12/am/libtool.am
+#usr/share/automake-1.12/am/lisp.am
+#usr/share/automake-1.12/am/ltlib.am
+#usr/share/automake-1.12/am/ltlibrary.am
+#usr/share/automake-1.12/am/mans-vars.am
+#usr/share/automake-1.12/am/mans.am
+#usr/share/automake-1.12/am/program.am
+#usr/share/automake-1.12/am/progs.am
+#usr/share/automake-1.12/am/python.am
+#usr/share/automake-1.12/am/remake-hdr.am
+#usr/share/automake-1.12/am/scripts.am
+#usr/share/automake-1.12/am/subdirs.am
+#usr/share/automake-1.12/am/tags.am
+#usr/share/automake-1.12/am/texi-vers.am
+#usr/share/automake-1.12/am/texibuild.am
+#usr/share/automake-1.12/am/texinfos.am
+#usr/share/automake-1.12/am/vala.am
+#usr/share/automake-1.12/am/yacc.am
+#usr/share/automake-1.12/ar-lib
+#usr/share/automake-1.12/compile
+#usr/share/automake-1.12/config.guess
+#usr/share/automake-1.12/config.sub
+#usr/share/automake-1.12/depcomp
+#usr/share/automake-1.12/elisp-comp
+#usr/share/automake-1.12/install-sh
+#usr/share/automake-1.12/mdate-sh
+#usr/share/automake-1.12/missing
+#usr/share/automake-1.12/mkinstalldirs
+#usr/share/automake-1.12/py-compile
+#usr/share/automake-1.12/tap-driver.pl
+#usr/share/automake-1.12/tap-driver.sh
+#usr/share/automake-1.12/test-driver
+#usr/share/automake-1.12/texinfo.tex
+#usr/share/automake-1.12/ylwrap
+#usr/share/doc/automake
+#usr/share/doc/automake/amhello-1.0.tar.gz
+#usr/share/info/automake-history.info
 #usr/share/info/automake.info
 #usr/share/info/automake.info-1
 #usr/share/info/automake.info-2
+#usr/share/info/automake.info-3
+#usr/share/man/man1/aclocal-1.12.1
+#usr/share/man/man1/aclocal.1
+#usr/share/man/man1/automake-1.12.1
+#usr/share/man/man1/automake.1

diff --git a/lfs/automake b/lfs/automake
index 699d96f1485b7fa218cdf15b8c07816dc752e3f9..9b19a1b1722c0e034f5b9243bf000a5230462aa9 100644 (file)
--- a/lfs/automake
+++ b/lfs/automake
@@ -1,7 +1,7 @@
 ###############################################################################
 #                                                                             #
 # IPFire.org - A linux based firewall                                         #
-# Copyright (C) 2007  Michael Tremer & Christian Schmidt                      #
+# Copyright (C) 2007-2012  IPFire Team  <info@ipfire.org>                     #
 #                                                                             #
 # This program is free software: you can redistribute it and/or modify        #
 # it under the terms of the GNU General Public License as published by        #
@@ -24,10 +24,10 @@
 
 include Config
 
-VER        = 1.9.6
+VER        = 1.12.4
 
 THISAPP    = automake-$(VER)
-DL_FILE    = $(THISAPP).tar.bz2
+DL_FILE    = $(THISAPP).tar.xz
 DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 TARGET     = $(DIR_INFO)/$(THISAPP)
@@ -40,7 +40,7 @@ objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_MD5 = c11b8100bb311492d8220378fd8bf9e0
+$(DL_FILE)_MD5 = 7395a0420ecb5c9bc43e5fcf4824df36
 
 install : $(TARGET)
 
@@ -69,7 +69,7 @@ $(subst %,%_MD5,$(objects)) :
 
 $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
        @$(PREBUILD)
-       @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar jxf $(DIR_DL)/$(DL_FILE)
+       @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar Jxf $(DIR_DL)/$(DL_FILE)
        cd $(DIR_APP) && ./configure --prefix=/usr --disable-nls
        cd $(DIR_APP) && make $(MAKETUNING)
        cd $(DIR_APP) && make install