diff options
author | Vincent Torri <vincent.torri@gmail.com> | 2012-12-04 17:40:58 +0000 |
---|---|---|
committer | Vincent Torri <vincent.torri@gmail.com> | 2012-12-04 17:40:58 +0000 |
commit | 81c86b19f6b432c5d6701bd025d5b2cf308fba4c (patch) | |
tree | 44f76300c96fddf3be01d97afb3025227350ee92 /m4 | |
parent | 633e29c5a50fa1a1087df88d8d9859c79a83e486 (diff) |
merge: eio + fix compilation on windows + minor fixes + po files
don't move eio to IN-EFL right now
SVN revision: 80180
Diffstat (limited to 'm4')
-rw-r--r-- | m4/eio_check_options.m4 | 56 |
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 @@ | |||
1 | dnl use: EIO_CHECK_INOTIFY([ACTION-IF-FOUND[, ACTION-IF-NOT-FOUND]]) | ||
2 | AC_DEFUN([EIO_CHECK_INOTIFY], | ||
3 | [ | ||
4 | _eio_have_inotify="no" | ||
5 | |||
6 | dnl We need to check if the right inotify version is accessible | ||
7 | |||
8 | dnl It is hard to find a good test on how to check the correct | ||
9 | dnl inotify version. They changed the headers a lot. | ||
10 | dnl in kernel 2.6.13 __NR_inotify_init was added to the defined syscalls | ||
11 | dnl in asm/unistd.h and IN_MOVE_SELF was added to linux/inotify.h | ||
12 | dnl so with this check you need a very new kernel and kernel-headers! | ||
13 | |||
14 | if ! test "x${have_windows}" = "xyes" ; then | ||
15 | |||
16 | AC_CHECK_LIB([c], [inotify_init], | ||
17 | [ | ||
18 | AC_DEFINE([HAVE_INOTIFY], [1], [ File monitoring with Inotify ]) | ||
19 | AC_DEFINE([HAVE_SYS_INOTIFY], [1], [ File monitoring with Inotify - sys/inotify.h ]) | ||
20 | _eio_have_inotify="yes" | ||
21 | ], | ||
22 | [ | ||
23 | AC_TRY_COMPILE( | ||
24 | [ | ||
25 | #include <asm/unistd.h> | ||
26 | #include <linux/inotify.h> | ||
27 | ], | ||
28 | [ | ||
29 | int a = __NR_inotify_init; int b = IN_MOVE_SELF; | ||
30 | ], | ||
31 | [ | ||
32 | AC_DEFINE([HAVE_INOTIFY], [1], [ File monitoring with Inotify ]) | ||
33 | _eio_have_inotify="yes" | ||
34 | ], | ||
35 | [_eio_have_inotify="no"]) | ||
36 | ]) | ||
37 | fi | ||
38 | |||
39 | AC_MSG_CHECKING([whether inotify is to be used for filemonitoring]) | ||
40 | AC_MSG_RESULT([${_eio_have_inotify}]) | ||
41 | |||
42 | AS_IF([test "x${_eio_have_inotify}" = "xyes"], [$1], [$2]) | ||
43 | ]) | ||
44 | |||
45 | dnl use: EIO_CHECK_NOTIFY_WIN32([ACTION-IF-FOUND[, ACTION-IF-NOT-FOUND]]) | ||
46 | AC_DEFUN([EIO_CHECK_NOTIFY_WIN32], | ||
47 | [ | ||
48 | if test "x${have_win32}" = "xyes" ; then | ||
49 | AC_DEFINE([HAVE_NOTIFY_WIN32], [1], [ File monitoring with Windows notification ]) | ||
50 | fi | ||
51 | |||
52 | AC_MSG_CHECKING([whether Windows notification is to be used for filemonitoring]) | ||
53 | AC_MSG_RESULT([${have_win32}]) | ||
54 | |||
55 | AS_IF([test "x${have_win32}" = "xyes"], [$1], [$2]) | ||
56 | ]) | ||