tris/recoll
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Israel G. Lugo: make sure that only one of inotify or FAM gets enabled, giving priority to inotify.

Browse Source
This commit is contained in:
dockes 2009-12-07 13:24:18 +00:00
parent 93d0aa3fee
commit e932144440
1 changed files with 25 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

45
src/configure.ac
View File

@ -80,11 +80,36 @@ if test X$withAspell != Xno ; then
fi fi
fi fi
if test -f /usr/include/sys/inotify.h ; then
inot_default=yes
else
inot_default=no
fi
# Real time monitoring with inotify
AC_ARG_WITH(inotify,
AC_HELP_STRING([--with-inotify],
[Use inotify for almost real time indexing of modified files.]),
withInotify=$withval, withInotify=$inot_default)
if test X$withInotify != Xno ; then
AC_MSG_NOTICE([enabled support for inotify monitoring])
AC_DEFINE(RCL_MONITOR, 1, [Real time monitoring option])
AC_DEFINE(RCL_USE_INOTIFY, 1, [Compile the inotify interface])
else
AC_MSG_NOTICE([inotify monitoring disabled])
fi
# Real time monitoring with FAM # Real time monitoring with FAM
AC_ARG_WITH(fam, AC_ARG_WITH(fam,
AC_HELP_STRING([--with-fam], AC_HELP_STRING([--with-fam],
[Use File Alteration Monitor for almost real time indexing of modified files. Give the fam/gamin library as argument (ie: /usr/lib/libfam.so) if configure does not find the right one.]), [Use File Alteration Monitor for almost real time indexing of modified files. Give the fam/gamin library as argument (ie: /usr/lib/libfam.so) if configure does not find the right one.]),
withFam=$withval, withFam=no) withFam=$withval, withFam=no)
if test X$withFam != Xno -a X$withInotify != Xno ; then
AC_MSG_NOTICE([FAM support enabled but inotify support also enabled. Disabling FAM support and using inotify])
withFam=no
fi
case $withFam in case $withFam in
no);; no);;
yes) yes)
@ -116,26 +141,6 @@ if test X$withFam != Xno ; then
fi fi
fi fi
if test -f /usr/include/sys/inotify.h -a X$withFam = Xno ; then
inot_default=yes
else
inot_default=no
fi
# Real time monitoring with inotify
AC_ARG_WITH(inotify,
AC_HELP_STRING([--with-inotify],
[Use inotify for almost real time indexing of modified files.]),
withInotify=$withval, withInotify=$inot_default)
if test X$withInotify != Xno ; then
AC_MSG_NOTICE([enabled support for inotify monitoring])
AC_DEFINE(RCL_MONITOR, 1, [Real time monitoring option])
AC_DEFINE(RCL_USE_INOTIFY, 1, [Compile the inotify interface])
else
AC_MSG_NOTICE([inotify monitoring disabled])
fi
# Enable use of file extended attributes. # Enable use of file extended attributes.
# Not by default as these are little used for now. # Not by default as these are little used for now.
AC_ARG_ENABLE(xattr, AC_ARG_ENABLE(xattr,