merge: eio + fix compilation on windows + minor fixes + po files

don't move eio to IN-EFL right now


SVN revision: 80180

1 files changed, 56 insertions, 0 deletions

diff --git a/m4/eio_check_options.m4 b/m4/eio_check_options.m4
new file mode 100644
index 0000000000..485dd85595
--- /dev/null
+++ b/m4/eio_check_options.m4
@@ -0,0 +1,56 @@
+dnl use: EIO_CHECK_INOTIFY([ACTION-IF-FOUND[, ACTION-IF-NOT-FOUND]])
+AC_DEFUN([EIO_CHECK_INOTIFY],
+[
+_eio_have_inotify="no"
+
+dnl We need to check if the right inotify version is accessible
+
+dnl It is hard to find a good test on how to check the correct
+dnl inotify version. They changed the headers a lot.
+dnl in kernel 2.6.13 __NR_inotify_init was added to the defined syscalls
+dnl in asm/unistd.h and IN_MOVE_SELF was added to linux/inotify.h
+dnl so with this check you need a very new kernel and kernel-headers!
+
+if ! test "x${have_windows}" = "xyes" ; then
+
+   AC_CHECK_LIB([c], [inotify_init],
+      [
+       AC_DEFINE([HAVE_INOTIFY], [1], [ File monitoring with Inotify ])
+       AC_DEFINE([HAVE_SYS_INOTIFY], [1], [ File monitoring with Inotify - sys/inotify.h ])
+       _eio_have_inotify="yes"
+      ],
+      [
+       AC_TRY_COMPILE(
+          [
+#include <asm/unistd.h>
+#include <linux/inotify.h>
+          ],
+          [
+int a = __NR_inotify_init; int b = IN_MOVE_SELF;
+          ],
+          [
+           AC_DEFINE([HAVE_INOTIFY], [1], [ File monitoring with Inotify ])
+           _eio_have_inotify="yes"
+          ],
+          [_eio_have_inotify="no"])
+      ])
+fi
+
+AC_MSG_CHECKING([whether inotify is to be used for filemonitoring])
+AC_MSG_RESULT([${_eio_have_inotify}])
+
+AS_IF([test "x${_eio_have_inotify}" = "xyes"], [$1], [$2])
+])
+
+dnl use: EIO_CHECK_NOTIFY_WIN32([ACTION-IF-FOUND[, ACTION-IF-NOT-FOUND]])
+AC_DEFUN([EIO_CHECK_NOTIFY_WIN32],
+[
+if test "x${have_win32}" = "xyes" ; then
+   AC_DEFINE([HAVE_NOTIFY_WIN32], [1], [ File monitoring with Windows notification ])
+fi
+
+AC_MSG_CHECKING([whether Windows notification is to be used for filemonitoring])
+AC_MSG_RESULT([${have_win32}])
+
+AS_IF([test "x${have_win32}" = "xyes"], [$1], [$2])
+])