aboutsummaryrefslogtreecommitdiffstats
path: root/configure.ac
diff options
context:
space:
mode:
authorGustavo Sverzut Barbieri <barbieri@gmail.com>2012-12-06 13:02:59 +0000
committerGustavo Sverzut Barbieri <barbieri@gmail.com>2012-12-06 13:02:59 +0000
commit6a5eaacc6ada22808ec8515ef2b414883f4f59fe (patch)
tree11ddc57ab808907ac2652e57a2f1cde8335eec81 /configure.ac
parentReverting 80354: "Avoid calling test so many times. Use -a/-o instead." (diff)
downloadefl-6a5eaacc6ada22808ec8515ef2b414883f4f59fe.tar.gz
efl: common inotify checks, simplified.
Another try to make inotify checks more common. This time uses AC_CHECK_HEADERS() as for others, that already define HAVE_SYS_INOTIFY_H, then uses that. I still kept AM_CONDITIONAL([HAVE_INOTIFY]) because I plan to convert ecore_file to the same, smarter, method that is used in eio (compiling the file depending on the backend. SVN revision: 80358
Diffstat (limited to 'configure.ac')
-rw-r--r--configure.ac32
1 files changed, 4 insertions, 28 deletions
diff --git a/configure.ac b/configure.ac
index 403c20fd46..6dcb82a732 100644
--- a/configure.ac
+++ b/configure.ac
@@ -468,12 +468,16 @@ netinet/in.h \
siginfo.h \
stdint.h \
strings.h \
+sys/inotify.h \
sys/types.h \
sys/param.h \
sys/mman.h \
unistd.h \
])
+have_inotify="${ac_cv_header_sys_inotify_h}"
+AM_CONDITIONAL([HAVE_INOTIFY], [test "x${have_inotify}" = "xyes"])
+
EFL_CHECK_PATH_MAX
@@ -2368,17 +2372,6 @@ AC_ARG_ENABLE([poll],
],
[want_poll="yes"])
-AC_ARG_ENABLE([inotify],
- [AC_HELP_STRING([--disable-inotify],
- [disable inotify in the ecore_file module. @<:@default=enabled@:>@])],
- [
- if test "x${enableval}" = "xyes" ; then
- want_inotify="yes"
- else
- want_inotify="no"
- fi
- ],
- [want_inotify="yes"])
AC_ARG_ENABLE([atfile-source],
[AC_HELP_STRING([--disable-atfile-source],
@@ -2440,19 +2433,6 @@ requirements_pc_ecore_file="ecore-con >= ${PACKAGE_VERSION} ecore >= ${PACKAGE_V
### Checks for header files
-have_inotify="no"
-if test "x${want_inotify}" = "xyes" ; then
- AC_CHECK_HEADER([sys/inotify.h],
- [
- AC_DEFINE([HAVE_INOTIFY], [1], [File monitoring with Inotify])
- have_inotify="yes"
- ],
- [have_inotify="no"])
-fi
-
-AC_MSG_CHECKING([whether inotify is to be used for filemonitoring])
-AC_MSG_RESULT(${have_inotify})
-
### Checks for types
### Checks for structures
@@ -3954,12 +3934,8 @@ setxattr("/", "user.ethumb.md5", NULL, 0, 0);
AC_MSG_RESULT([${have_xattr}])
# Check for inotify specificity
-have_inotify="no"
have_notify_win32="no"
-EIO_CHECK_INOTIFY([have_inotify="yes"], [have_inotify="no"])
EIO_CHECK_NOTIFY_WIN32([have_notify_win32="yes"], [have_notify_win32="no"])
-
-AM_CONDITIONAL([EIO_HAVE_INOTIFY], [test "x${have_inotify}" = "xyes"])
AM_CONDITIONAL([EIO_HAVE_WINCHANGE], [test "x${have_notify_win32}" = "xyes"])
#### End of Eio