[inotify-tools] use automatic autogen instead of autogen patch

Signed-off-by: Robert Schwebel <r.schwebel@pengutronix.de>

6 files changed, 90 insertions, 1 deletions

diff --git a/patches/inotify-tools-3.13/autogen.sh b/patches/inotify-tools-3.13/autogen.sh
new file mode 120000
index 000000000..9f8a4cb7d
--- /dev/null
+++ b/patches/inotify-tools-3.13/autogen.sh
@@ -0,0 +1 @@
+../autogen.sh
\ No newline at end of file
diff --git a/patches/inotify-tools-3.13/inotify-tools-3.13-ac-prog-libtool.diff b/patches/inotify-tools-3.13/inotify-tools-3.13-ac-prog-libtool.diff
new file mode 100644
index 000000000..e7110b41b
--- /dev/null
+++ b/patches/inotify-tools-3.13/inotify-tools-3.13-ac-prog-libtool.diff
@@ -0,0 +1,24 @@
+From: Robert Schwebel <r.schwebel@pengutronix.de>
+Subject: use modern libtool macro
+
+aclocal.m4:123: AC_PROG_LIBTOOL is expanded from...
+
+Signed-off-by: Robert Schwebel <r.schwebel@pengutronix.de>
+
+---
+ configure.ac |    2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+Index: inotify-tools-3.13/configure.ac
+===================================================================
+--- inotify-tools-3.13.orig/configure.ac
++++ inotify-tools-3.13/configure.ac
+@@ -12,7 +12,7 @@ AC_PROG_MAKE_SET
+ 
+ # Checks for programs.
+ AC_PROG_CC
+-AC_PROG_LIBTOOL
++LT_INIT
+ 
+ AC_PATH_PROG(DOXYGEN, doxygen, NO_DOXYGEN)
+ 
diff --git a/patches/inotify-tools-3.13/inotify-tools-3.13-am-config-header.diff b/patches/inotify-tools-3.13/inotify-tools-3.13-am-config-header.diff
new file mode 100644
index 000000000..b61fec99d
--- /dev/null
+++ b/patches/inotify-tools-3.13/inotify-tools-3.13-am-config-header.diff
@@ -0,0 +1,26 @@
+From: Robert Schwebel <r.schwebel@pengutronix.de>
+Subject: inotify-tools: update configure.ac
+
+configure.ac:8: warning: The macro `AM_CONFIG_HEADER' is obsolete.
+
+Signed-off-by: Robert Schwebel <r.schwebel@pengutronix.de>
+
+---
+ configure.ac |    4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+Index: inotify-tools-3.13/configure.ac
+===================================================================
+--- inotify-tools-3.13.orig/configure.ac
++++ inotify-tools-3.13/configure.ac
+@@ -5,8 +5,8 @@ AC_PREREQ(2.59)
+ AC_INIT([inotify-tools], [3.13], [rohan@mcgovern.id.au])
+ AM_INIT_AUTOMAKE
+ AC_CONFIG_SRCDIR([src/inotifywait.c])
+-AM_CONFIG_HEADER([config.h])
+-AM_CONFIG_HEADER([libinotifytools/src/inotifytools/inotify.h])
++AC_CONFIG_HEADERS([config.h])
++AC_CONFIG_HEADERS([libinotifytools/src/inotifytools/inotify.h])
+ AC_DEFINE([_GNU_SOURCE], [], [For a few GNU-specific functions])
+ AC_PROG_MAKE_SET
+ 
diff --git a/patches/inotify-tools-3.13/inotify-tools-3.13-autoreconf.diff.bz2 b/patches/inotify-tools-3.13/inotify-tools-3.13-autoreconf.diff.bz2
deleted file mode 100644
index 14967b3ca..000000000
--- a/patches/inotify-tools-3.13/inotify-tools-3.13-autoreconf.diff.bz2
+++ /dev/null
diff --git a/patches/inotify-tools-3.13/inotify-tools-3.13-m4-macro-dir.diff b/patches/inotify-tools-3.13/inotify-tools-3.13-m4-macro-dir.diff
new file mode 100644
index 000000000..767203619
--- /dev/null
+++ b/patches/inotify-tools-3.13/inotify-tools-3.13-m4-macro-dir.diff
@@ -0,0 +1,36 @@
+From: Robert Schwebel <r.schwebel@pengutronix.de>
+
+libtool 2.2.6a claims about these updates:
+
+libtoolize: Consider adding `AC_CONFIG_MACRO_DIR([m4])' to configure.ac and
+libtoolize: rerunning libtoolize, to keep the correct libtool macros in-tree.
+libtoolize: Consider adding `-I m4' to ACLOCAL_AMFLAGS in Makefile.am.
+
+Signed-off-by: Robert Schwebel <r.schwebel@pengutronix.de>
+
+---
+ Makefile.am  |    1 +
+ configure.ac |    1 +
+ 2 files changed, 2 insertions(+)
+
+Index: inotify-tools-3.13/configure.ac
+===================================================================
+--- inotify-tools-3.13.orig/configure.ac
++++ inotify-tools-3.13/configure.ac
+@@ -7,6 +7,7 @@ AM_INIT_AUTOMAKE
+ AC_CONFIG_SRCDIR([src/inotifywait.c])
+ AC_CONFIG_HEADERS([config.h])
+ AC_CONFIG_HEADERS([libinotifytools/src/inotifytools/inotify.h])
++AC_CONFIG_MACRO_DIR([m4])
+ AC_DEFINE([_GNU_SOURCE], [], [For a few GNU-specific functions])
+ AC_PROG_MAKE_SET
+ 
+Index: inotify-tools-3.13/Makefile.am
+===================================================================
+--- inotify-tools-3.13.orig/Makefile.am
++++ inotify-tools-3.13/Makefile.am
+@@ -1,3 +1,4 @@
++ACLOCAL_AMFLAGS = -I m4
+ 
+ SUBDIRS = libinotifytools src man
+ 
diff --git a/patches/inotify-tools-3.13/series b/patches/inotify-tools-3.13/series
index e9a925131..e651b603a 100644
--- a/patches/inotify-tools-3.13/series
+++ b/patches/inotify-tools-3.13/series
@@ -1,2 +1,4 @@
 inotify-tools-3.13-configure-compile_ifelse.diff
-inotify-tools-3.13-autoreconf.diff.bz2
+inotify-tools-3.13-am-config-header.diff
+inotify-tools-3.13-ac-prog-libtool.diff
+inotify-tools-3.13-m4-macro-dir.diff