From b4a69cf9f29d3d810a34b668d324bfd492cfe008 Mon Sep 17 00:00:00 2001
From: medoc <none@none>
Date: Sat, 1 Oct 2011 20:11:01 +0200
Subject: [PATCH] build: linux 3.0 inotify.h is in include/linux not
 include/sys

---
 src/configure    | 38 ++++++++++++--------------------------
 src/configure.ac |  2 +-
 2 files changed, 13 insertions(+), 27 deletions(-)

diff --git a/src/configure b/src/configure
index eeabe6fe..a6d44a0f 100755
--- a/src/configure
+++ b/src/configure
@@ -1,6 +1,6 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.68 for Recoll 1.16.0.
+# Generated by GNU Autoconf 2.68 for Recoll 1.16.2.
 #
 #
 # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
@@ -557,8 +557,8 @@ MAKEFLAGS=
 # Identity of this package.
 PACKAGE_NAME='Recoll'
 PACKAGE_TARNAME='recoll'
-PACKAGE_VERSION='1.16.0'
-PACKAGE_STRING='Recoll 1.16.0'
+PACKAGE_VERSION='1.16.2'
+PACKAGE_STRING='Recoll 1.16.2'
 PACKAGE_BUGREPORT=''
 PACKAGE_URL=''
 
@@ -1248,7 +1248,7 @@ if test "$ac_init_help" = "long"; then
   # Omit some internal or obsolete options to make the list less imposing.
   # This message is too long to be a string in the A/UX 3.1 sh.
   cat <<_ACEOF
-\`configure' configures Recoll 1.16.0 to adapt to many kinds of systems.
+\`configure' configures Recoll 1.16.2 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1313,7 +1313,7 @@ fi
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of Recoll 1.16.0:";;
+     short | recursive ) echo "Configuration of Recoll 1.16.2:";;
    esac
   cat <<\_ACEOF
 
@@ -1436,7 +1436,7 @@ fi
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-Recoll configure 1.16.0
+Recoll configure 1.16.2
 generated by GNU Autoconf 2.68
 
 Copyright (C) 2010 Free Software Foundation, Inc.
@@ -1989,7 +1989,7 @@ cat >config.log <<_ACEOF
 This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
 
-It was created by Recoll $as_me 1.16.0, which was
+It was created by Recoll $as_me 1.16.2, which was
 generated by GNU Autoconf 2.68.  Invocation command line was
 
   $ $0 $@
@@ -3611,6 +3611,7 @@ rm -rf conftest*
 fi
 
 
+# OpenBSD needs sys/param.h for mount.h to compile
 ac_ext=c
 ac_cpp='$CPP $CPPFLAGS'
 ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
@@ -4020,21 +4021,6 @@ fi
 
 done
 
-for ac_header in bar.h
-do :
-  ac_fn_c_check_header_compile "$LINENO" "bar.h" "ac_cv_header_bar_h" "#ifdef HAVE_FOO_H
-# include <foo.h>
-#endif
-
-"
-if test "x$ac_cv_header_bar_h" = xyes; then :
-  cat >>confdefs.h <<_ACEOF
-#define HAVE_BAR_H 1
-_ACEOF
-
-fi
-
-done
 
 for ac_header in sys/mount.h sys/statfs.h sys/statvfs.h sys/vfs.h
 do :
@@ -4221,7 +4207,7 @@ $as_echo "$as_me: aspell support enabled but aspell package not found. Compiling
    fi
 fi
 
-if test -f /usr/include/sys/inotify.h ; then
+if test -f /usr/include/sys/inotify.h -o -f /usr/include/linux/inotify.h; then
    inot_default=yes
 else
    inot_default=no
@@ -5573,7 +5559,7 @@ test "X$m_prefix" = "XNONE" && m_prefix=/usr/local
 m_datadir=${m_prefix}/share
 QTRECOLL_DATADIR=${m_datadir}/recoll
 
-RCLVERSION='1.16.0'
+RCLVERSION='1.16.2'
 
 
 
@@ -6134,7 +6120,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
 # report actual input values of CONFIG_FILES etc. instead of their
 # values after options handling.
 ac_log="
-This file was extended by Recoll $as_me 1.16.0, which was
+This file was extended by Recoll $as_me 1.16.2, which was
 generated by GNU Autoconf 2.68.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -6196,7 +6182,7 @@ _ACEOF
 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
 ac_cs_version="\\
-Recoll config.status 1.16.0
+Recoll config.status 1.16.2
 configured by $0, generated by GNU Autoconf 2.68,
   with options \\"\$ac_cs_config\\"
 
diff --git a/src/configure.ac b/src/configure.ac
index 4ccb7d61..f58609ad 100644
--- a/src/configure.ac
+++ b/src/configure.ac
@@ -95,7 +95,7 @@ if test X$withAspell != Xno ; then
    fi
 fi
 
-if test -f /usr/include/sys/inotify.h ; then
+if test -f /usr/include/sys/inotify.h -o -f /usr/include/linux/inotify.h; then
    inot_default=yes
 else
    inot_default=no