From 2e5f4462b40bff0e7266af7a9fd6cc90e22ae210 Mon Sep 17 00:00:00 2001
From: Axel Kittenberger <axkibe@gmail.com>
Date: Fri, 9 Mar 2018 10:08:21 +0100
Subject: [PATCH] preparing 2.2.3

---
 ChangeLog           |  1 +
 INSTALL             | 24 ++++++++++++------------
 cmake/FindLua.cmake | 10 +++++-----
 3 files changed, 18 insertions(+), 17 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index d25684d..8d5602f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,6 @@
 2018-??-??: 2.2.3
 	enhaencement: supporting includes with new filter and filterFrom options
+	change: needing at least Lua 5.2 (was 5.1)
 	change: if the target/targetdir ands with a ':' do not append
 			a trailing '/' to it, since that would change it from homedir to rootdir!
 	add: example for Amazon S3 Bucket (Daniel Miranda)
diff --git a/INSTALL b/INSTALL
index 0d4d374..f424e9a 100644
--- a/INSTALL
+++ b/INSTALL
@@ -15,22 +15,22 @@ Prerequisites
   Lua
 
     For building Lsyncd the Lua interpreter 'lua'
-	and the Lua compiler 'luac' are needed.
-	They aren't needed in the deployed binary though.
-	
-	Use Lua 5.1 or Lua 5.2 at your choice.
+    and the Lua compiler 'luac' are needed.
+    They aren't needed in the deployed binary though.
+
+    Use Lua 5.2 or later.
 
   Liblua
 
     The lua library.
 	
-	Note that you likely need the package "liblua-dev"
-	or something like that.
+    Note that you likely need the package "liblua-dev"
+    or something like that.
 
-	Use Lua 5.1 or Lua 5.2 at your choice.
+    Use Lua 5.2 or later.
 
-	Note, this has to be exactly the same Version as the
-	lua compiler used above!
+    Note, this has to be exactly the same Version as the
+    lua compiler used above!
 
 
 Building
@@ -41,16 +41,16 @@ Building
     mkdir build
     cd build
     cmake ..
-	make
+    make
     sudo make install
 
   Building intree:
     cmake .
-	make
+    make
 
   On OSX you yet need to get the xnu sources.
   For example:
     cmake -DWITH_INOTIFY=OFF -DWITH_FSEVENTS=ON -DXNU_DIR=/path/to/xnu-VERSION
-	make
+    make
 
 FIXME make install not yet done
diff --git a/cmake/FindLua.cmake b/cmake/FindLua.cmake
index ee7a63d..5fabb3f 100644
--- a/cmake/FindLua.cmake
+++ b/cmake/FindLua.cmake
@@ -1,7 +1,7 @@
 # Locate Lua library
 # This module defines
 #  LUA_EXECUTABLE, if found
-#  LUA_FOUND, if false, do not try to link to Lua 
+#  LUA_FOUND, if false, do not try to link to Lua
 #  LUA_LIBRARIES
 #  LUA_INCLUDE_DIR, where to find lua.h
 #  LUA_VERSION_STRING, the version of Lua found (since CMake 2.8.8)
@@ -28,7 +28,7 @@
 #  License text for the above reference.)
 #
 # The required version of Lua can be specified using the
-# standard syntax, e.g. FIND_PACKAGE(Lua 5.1)
+# standard syntax, e.g. FIND_PACKAGE(Lua 5.2)
 # Otherwise the module will search for any available Lua implementation
 
 # Always search for non-versioned lua first (recommended)
@@ -41,7 +41,7 @@ SET(_POSSIBLE_LUA_LIBRARY lua)
 IF(Lua_FIND_VERSION_MAJOR AND Lua_FIND_VERSION_MINOR)
   SET(_POSSIBLE_SUFFIXES "${Lua_FIND_VERSION_MAJOR}${Lua_FIND_VERSION_MINOR}" "${Lua_FIND_VERSION_MAJOR}.${Lua_FIND_VERSION_MINOR}" "-${Lua_FIND_VERSION_MAJOR}.${Lua_FIND_VERSION_MINOR}")
 ELSE(Lua_FIND_VERSION_MAJOR AND Lua_FIND_VERSION_MINOR)
-  SET(_POSSIBLE_SUFFIXES "53" "5.3" "-5.3" "52" "5.2" "-5.2" "51" "5.1" "-5.1")
+  SET(_POSSIBLE_SUFFIXES "53" "5.3" "-5.3" "52" "5.2" "-5.2")
 ENDIF(Lua_FIND_VERSION_MAJOR AND Lua_FIND_VERSION_MINOR)
 
 # Set up possible search names and locations
@@ -79,7 +79,7 @@ FIND_PATH(LUA_INCLUDE_DIR lua.h
 )
 
 # Find the lua library
-FIND_LIBRARY(LUA_LIBRARY 
+FIND_LIBRARY(LUA_LIBRARY
   NAMES ${_POSSIBLE_LUA_LIBRARY}
   HINTS
   $ENV{LUA_DIR}
@@ -115,7 +115,7 @@ IF(LUA_INCLUDE_DIR AND EXISTS "${LUA_INCLUDE_DIR}/lua.h")
 ENDIF()
 
 INCLUDE(FindPackageHandleStandardArgs)
-# handle the QUIETLY and REQUIRED arguments and set LUA_FOUND to TRUE if 
+# handle the QUIETLY and REQUIRED arguments and set LUA_FOUND to TRUE if
 # all listed variables are TRUE
 FIND_PACKAGE_HANDLE_STANDARD_ARGS(Lua
                                   REQUIRED_VARS LUA_LIBRARIES LUA_INCLUDE_DIR