* inotify-tools-3.13:

	use correct macro to check for header


git-svn-id: https://svn.pengutronix.de/svn/ptxdist/trunks/ptxdist-trunk@9635 33e552b5-05e3-0310-8538-816dae2090ed

5 files changed, 19 insertions, 63 deletions

diff --git a/patches/inotify-tools-3.13/generic/inotify-tools-3.13-autoreconf.diff b/patches/inotify-tools-3.13/generic/inotify-tools-3.13-autoreconf.diff
deleted file mode 100644
index e3b48114c..000000000
--- a/patches/inotify-tools-3.13/generic/inotify-tools-3.13-autoreconf.diff
+++ /dev/null
@@ -1,25 +0,0 @@
-diff -ur inotify-tools-3.13/configure inotify-tools-3.13-autoreconf/configure
---- inotify-tools-3.13/configure	2008-05-05 23:10:55.000000000 +0200
-+++ inotify-tools-3.13-autoreconf/configure	2008-05-05 23:13:14.000000000 +0200
-@@ -19675,11 +20033,16 @@
- { echo "$as_me:$LINENO: checking whether sys/inotify.h actually works" >&5
- echo $ECHO_N "checking whether sys/inotify.h actually works... $ECHO_C" >&6; }
- if test "$cross_compiling" = yes; then
--  { { echo "$as_me:$LINENO: error: cannot run test program while cross compiling
--See \`config.log' for more details." >&5
--echo "$as_me: error: cannot run test program while cross compiling
--See \`config.log' for more details." >&2;}
--   { (exit 1); exit 1; }; }
-+
-+	{ echo "$as_me:$LINENO: result: cross compiling, assuming yes" >&5
-+echo "${ECHO_T}cross compiling, assuming yes" >&6; };
-+
-+cat >>confdefs.h <<\_ACEOF
-+#define SYS_INOTIFY_H_EXISTS_AND_WORKS 1
-+_ACEOF
-+
-+
-+
- else
-   cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h.  */
diff --git a/patches/inotify-tools-3.13/generic/inotify-tools-3.13-autoreconf.diff.bz2 b/patches/inotify-tools-3.13/generic/inotify-tools-3.13-autoreconf.diff.bz2
new file mode 100644
index 000000000..14967b3ca
--- /dev/null
+++ b/patches/inotify-tools-3.13/generic/inotify-tools-3.13-autoreconf.diff.bz2
diff --git a/patches/inotify-tools-3.13/generic/inotify-tools-3.13-configure-compile_ifelse.diff b/patches/inotify-tools-3.13/generic/inotify-tools-3.13-configure-compile_ifelse.diff
new file mode 100644
index 000000000..ec81a3a22
--- /dev/null
+++ b/patches/inotify-tools-3.13/generic/inotify-tools-3.13-configure-compile_ifelse.diff
@@ -0,0 +1,17 @@
+---
+ 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
+@@ -45,7 +45,7 @@ AM_CONDITIONAL([DOXYGEN_ENABLE], test x$
+ AC_CHECK_HEADERS([sys/inotify.h mcheck.h])
+ AC_LANG(C)
+ AC_MSG_CHECKING([whether sys/inotify.h actually works])
+-AC_RUN_IFELSE(
++AC_COMPILE_IFELSE(
+   AC_LANG_PROGRAM([[#include <sys/inotify.h>]],
+                   [[return (-1 == inotify_init());]]
+   ),
diff --git a/patches/inotify-tools-3.13/generic/inotify-tools-3.13-configure-inotify.diff b/patches/inotify-tools-3.13/generic/inotify-tools-3.13-configure-inotify.diff
deleted file mode 100644
index be6bd0e0b..000000000
--- a/patches/inotify-tools-3.13/generic/inotify-tools-3.13-configure-inotify.diff
+++ /dev/null
@@ -1,34 +0,0 @@
-From: Robert Schwebel <r.schwebel@pengutronix.de>
-Subject: configure doesn't care about cross compiling
-
-When cross compiling, we get this error:
-
-  checking whether sys/inotify.h actually works... configure: error:
-  cannot run test program while cross compiling
-
-We assume that if somebody cross compiles, he made sure that the inotify
-headers are there and working.
-
-Signed-off-by: Robert Schwebel <r.schwebel@pengutronix.de>
-
----
- configure.ac |    6 +++++-
- 1 file changed, 5 insertions(+), 1 deletion(-)
-
-Index: inotify-tools-3.13/configure.ac
-===================================================================
---- inotify-tools-3.13.orig/configure.ac
-+++ inotify-tools-3.13/configure.ac
-@@ -50,7 +50,11 @@
-                   [[return (-1 == inotify_init());]]
-   ),
-   [AC_MSG_RESULT([yup]); AC_DEFINE([SYS_INOTIFY_H_EXISTS_AND_WORKS],[1],[sys/inotify.h exists and works correctly])],
--  [AC_MSG_RESULT([nope, using own inotify headers])]
-+  [AC_MSG_RESULT([nope, using own inotify headers])],
-+  [
-+	AC_MSG_RESULT([cross compiling, assuming yes]);
-+	AC_DEFINE([SYS_INOTIFY_H_EXISTS_AND_WORKS],[1],[sys/inotify.h exists and works correctly])
-+  ]
- )
- 
- 
diff --git a/patches/inotify-tools-3.13/generic/series b/patches/inotify-tools-3.13/generic/series
index 5e0352aa6..e9a925131 100644
--- a/patches/inotify-tools-3.13/generic/series
+++ b/patches/inotify-tools-3.13/generic/series
@@ -1,4 +1,2 @@
-inotify-tools-3.13-configure-inotify.diff
-inotify-tools-3.13-autoreconf.diff
-
-
+inotify-tools-3.13-configure-compile_ifelse.diff
+inotify-tools-3.13-autoreconf.diff.bz2