mutt: fix automake breakage

Fix breakage due to automake 1.12.6 bump.

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>

diff --git a/package/mutt/mutt-01-nodoc.patch b/package/mutt/mutt-01-nodoc.patch
new file mode 100644 (file)
index 0000000..6fd556d
--- /dev/null
+++ b/package/mutt/mutt-01-nodoc.patch
@@ -0,0 +1,21 @@
+Disable the documentation build
+
+The documentation tool is compiled for the target, but executed on the
+host. We don't bother fixing this, as we don't care of the
+documentation in Buildroot.
+
+Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
+
+Index: mutt-1.5.17+20080114/Makefile.am
+===================================================================
+--- mutt-1.5.17+20080114.orig/Makefile.am      2010-05-15 18:15:08.000000000 +0200
++++ mutt-1.5.17+20080114/Makefile.am   2010-05-15 18:15:17.000000000 +0200
+@@ -9,7 +9,7 @@
+ IMAP_INCLUDES = -I$(top_srcdir)/imap
+ endif
+ 
+-SUBDIRS = m4 po intl doc contrib $(IMAP_SUBDIR)
++SUBDIRS = m4 po intl contrib $(IMAP_SUBDIR)
+ 
+ bin_SCRIPTS = muttbug flea @SMIMEAUX_TARGET@
+ 

diff --git a/package/mutt/mutt-02-automake.patch b/package/mutt/mutt-02-automake.patch
new file mode 100644 (file)
index 0000000..19950a9
--- /dev/null
+++ b/package/mutt/mutt-02-automake.patch
@@ -0,0 +1,16 @@
+Fix for automake 1.12+
+http://dev.mutt.org/trac/ticket/3579
+
+Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
+
+diff -Nura mutt-1.5.21.orig/configure.ac mutt-1.5.21/configure.ac
+--- mutt-1.5.21.orig/configure.ac      2013-09-16 11:07:25.699781892 -0300
++++ mutt-1.5.21/configure.ac   2013-09-16 11:07:45.120419960 -0300
+@@ -27,7 +27,6 @@
+ 
+ AC_PROG_CC
+ AC_ISC_POSIX
+-AM_C_PROTOTYPES
+ if test "x$U" != "x"; then
+   AC_MSG_ERROR(Compiler not ANSI compliant)
+ fi

diff --git a/package/mutt/mutt-1.5.21-nodoc.patch b/package/mutt/mutt-1.5.21-nodoc.patch
deleted file mode 100644 (file)
index 6fd556d..0000000
--- a/package/mutt/mutt-1.5.21-nodoc.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-Disable the documentation build
-
-The documentation tool is compiled for the target, but executed on the
-host. We don't bother fixing this, as we don't care of the
-documentation in Buildroot.
-
-Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
-
-Index: mutt-1.5.17+20080114/Makefile.am
-===================================================================
---- mutt-1.5.17+20080114.orig/Makefile.am      2010-05-15 18:15:08.000000000 +0200
-+++ mutt-1.5.17+20080114/Makefile.am   2010-05-15 18:15:17.000000000 +0200
-@@ -9,7 +9,7 @@
- IMAP_INCLUDES = -I$(top_srcdir)/imap
- endif
- 
--SUBDIRS = m4 po intl doc contrib $(IMAP_SUBDIR)
-+SUBDIRS = m4 po intl contrib $(IMAP_SUBDIR)
- 
- bin_SCRIPTS = muttbug flea @SMIMEAUX_TARGET@
-