From 0b4e8c4c364368491714d80e465c71625e4116b4 Mon Sep 17 00:00:00 2001
From: Luka Perkov <luka@openwrt.org>
Date: Tue, 17 Dec 2013 02:47:13 +0000
Subject: [PATCH] automake: update to 1.11.6

Signed-off-by: Luka Perkov <luka@openwrt.org>

SVN-Revision: 39108
---
 tools/automake/Makefile                            |  8 ++++----
 tools/automake/patches/000-relocatable.patch       |  8 ++++----
 ...100-aclocal-skip-not-existing-directories.patch |  4 ++--
 .../patches/200-fix_missing_py_compile.patch       | 14 --------------
 4 files changed, 10 insertions(+), 24 deletions(-)
 delete mode 100644 tools/automake/patches/200-fix_missing_py_compile.patch

diff --git a/tools/automake/Makefile b/tools/automake/Makefile
index 63d28bd48b2..546f9b26619 100644
--- a/tools/automake/Makefile
+++ b/tools/automake/Makefile
@@ -1,5 +1,5 @@
 #
-# Copyright (C) 2006-2012 OpenWrt.org
+# Copyright (C) 2006-2013 OpenWrt.org
 #
 # This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.
@@ -7,11 +7,11 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=automake
-PKG_VERSION:=1.11.3
+PKG_VERSION:=1.11.6
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz
 PKG_SOURCE_URL:=@GNU/automake
-PKG_MD5SUM:=3d72b2076eb4397ad5e9a2aace6357fd
+PKG_MD5SUM:=cf4752287ad708f83bd3689da57a32c9
 
 include $(INCLUDE_DIR)/host-build.mk
 
@@ -25,7 +25,7 @@ define Host/Install
 	ln -sf aclocal $(STAGING_DIR_HOST)/bin/aclocal-1.9
 	ln -sf aclocal $(STAGING_DIR_HOST)/bin/aclocal-1.10
 	ln -sf aclocal $(STAGING_DIR_HOST)/bin/aclocal-1.11
-	ln -sf aclocal $(STAGING_DIR_HOST)/bin/aclocal-1.11.1
+	ln -sf aclocal $(STAGING_DIR_HOST)/bin/aclocal-1.11.6
 endef
 
 define Host/Clean
diff --git a/tools/automake/patches/000-relocatable.patch b/tools/automake/patches/000-relocatable.patch
index 827797c732c..1206fdc1cb5 100644
--- a/tools/automake/patches/000-relocatable.patch
+++ b/tools/automake/patches/000-relocatable.patch
@@ -1,6 +1,6 @@
 --- a/aclocal.in
 +++ b/aclocal.in
-@@ -29,7 +29,8 @@ eval 'case $# in 0) exec @PERL@ -S "$0";
+@@ -27,7 +27,8 @@
  
  BEGIN
  {
@@ -10,7 +10,7 @@
    unshift @INC, (split '@PATH_SEPARATOR@', $perllibdir);
  }
  
-@@ -61,8 +62,8 @@ $perl_threads = 0;
+@@ -58,8 +59,8 @@
  # ACLOCAL_PATH environment variable, and reset with the `--system-acdir'
  # option.
  my @user_includes = ();
@@ -23,7 +23,7 @@
  my $install = 0;
 --- a/automake.in
 +++ b/automake.in
-@@ -31,7 +31,8 @@ package Language;
+@@ -31,7 +31,8 @@
  
  BEGIN
  {
@@ -35,7 +35,7 @@
    # Override SHELL.  This is required on DJGPP so that system() uses
 --- a/lib/Automake/Config.in
 +++ b/lib/Automake/Config.in
-@@ -31,7 +31,7 @@ our $APIVERSION = '@APIVERSION@';
+@@ -31,7 +31,7 @@
  our $PACKAGE = '@PACKAGE@';
  our $PACKAGE_BUGREPORT = '@PACKAGE_BUGREPORT@';
  our $VERSION = '@VERSION@';
diff --git a/tools/automake/patches/100-aclocal-skip-not-existing-directories.patch b/tools/automake/patches/100-aclocal-skip-not-existing-directories.patch
index 7829d0ecded..e6c3d7f3355 100644
--- a/tools/automake/patches/100-aclocal-skip-not-existing-directories.patch
+++ b/tools/automake/patches/100-aclocal-skip-not-existing-directories.patch
@@ -1,6 +1,6 @@
 --- a/aclocal.in
 +++ b/aclocal.in
-@@ -314,6 +314,12 @@ sub scan_m4_dirs ($@)
+@@ -327,6 +327,12 @@
  
    foreach my $m4dir (@dirlist)
      {
@@ -12,4 +12,4 @@
 +
        if (! opendir (DIR, $m4dir))
  	{
- 	  fatal "couldn't open directory `$m4dir': $!";
+ 	  if ($install && $type == FT_USER && $first_user_m4dir)
diff --git a/tools/automake/patches/200-fix_missing_py_compile.patch b/tools/automake/patches/200-fix_missing_py_compile.patch
deleted file mode 100644
index b03bdff00d8..00000000000
--- a/tools/automake/patches/200-fix_missing_py_compile.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-Index: automake-1.11.3/lib/am/python.am
-===================================================================
---- automake-1.11.3.orig/lib/am/python.am	2012-01-31 12:41:18.000000000 +0100
-+++ automake-1.11.3/lib/am/python.am	2012-06-07 16:42:53.488515898 +0200
-@@ -23,8 +23,8 @@
- ## Installing.  ##
- ## ------------ ##
- 
--if %?INSTALL%
- ?FIRST?am__py_compile = PYTHON=$(PYTHON) $(SHELL) $(py_compile)
-+if %?INSTALL%
- am__installdirs += "$(DESTDIR)$(%NDIR%dir)"
- .PHONY install-%EXEC?exec:data%-am: install-%DIR%PYTHON
- install-%DIR%PYTHON: $(%DIR%_PYTHON)
-- 
2.30.2