[geany/geany-plugins] 18936f: geanylua: Do not accept Lua5.2 as the plugin doesn't build with it

[Colomban Wendling]

Branch:      refs/heads/master
Author:      Colomban Wendling <ban at herbesfolles.org>
Committer:   Colomban Wendling <ban at herbesfolles.org>
Date:        Thu, 12 Feb 2015 14:01:34 UTC
Commit:      18936f6db14989b49a5a3899ecd6f95becda5b76
             https://github.com/geany/geany-plugins/commit/18936f6db14989b49a5a3899ecd6f95becda5b76

Log Message:
-----------
geanylua: Do not accept Lua5.2 as the plugin doesn't build with it

Make sure the found Lua package is version 5.1 and not newer, as 5.2
breaks compilation.

The issue with 5.2 was reported by an user on IRC.


Modified Paths:
--------------
    build/geanylua.m4
    geanylua/wscript_configure

Modified: build/geanylua.m4
4 lines changed, 3 insertions(+), 1 deletions(-)
===================================================================
@@ -14,8 +14,10 @@ AC_DEFUN([GP_CHECK_GEANYLUA],
         done])
 
     LUA_VERSION=5.1
+    LUA_VERSION_BOUNDARY=5.2
     GP_CHECK_PLUGIN_DEPS([GeanyLua], [LUA],
-                         [${LUA_PKG_NAME} >= ${LUA_VERSION}])
+                         [${LUA_PKG_NAME} >= ${LUA_VERSION}
+                          ${LUA_PKG_NAME} < ${LUA_VERSION_BOUNDARY}])
     GP_CHECK_PLUGIN_DEPS([GeanyLua], [GMODULE], [gmodule-2.0])
     GP_COMMIT_PLUGIN_STATUS([GeanyLua])
 


Modified: geanylua/wscript_configure
6 lines changed, 4 insertions(+), 2 deletions(-)
===================================================================
@@ -30,10 +30,12 @@ def try_to_find_lua_package():
     for package_name in package_names:
         check_cfg_cached(conf,
                      package=package_name,
-                     atleast_version='5.1',
                      mandatory=False,
                      uselib_store='LUA',
-                     args='--cflags --libs')
+                     args='%s >= 5.1 %s < 5.2 --cflags --libs' %
+                          (package_name, package_name),
+                     msg="Checking for '%s' >= 5.1 and < 5.2" %
+                         package_name)
         if conf.env['HAVE_LUA'] == 1:
             return True
     return False



--------------
This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).