SF.net SVN: geany-plugins:[1507] trunk/geany-plugins/wscript

[eht16 at users.sourceforge.net]

Revision: 1507
          http://geany-plugins.svn.sourceforge.net/geany-plugins/?rev=1507&view=rev
Author:   eht16
Date:     2010-08-15 13:48:43 +0000 (Sun, 15 Aug 2010)

Log Message:
-----------
Improve checks for Lua since distros call it very different (patch by Colomban Wendling, thanks)

Modified Paths:
--------------
    trunk/geany-plugins/wscript

Modified: trunk/geany-plugins/wscript
===================================================================
--- trunk/geany-plugins/wscript	2010-08-13 18:54:30 UTC (rev 1506)
+++ trunk/geany-plugins/wscript	2010-08-15 13:48:43 UTC (rev 1507)
@@ -98,8 +98,10 @@
 	Plugin('GeanyLUA',
 		 [ 'geanylua/geanylua.c' ], # the other source files are listed in build_lua()
 		 [ 'geanylua' ],
-		 # maybe you need to modify the package name of Lua, try one of these: lua5.1 lua51 lua-5.1
-		 [ [ 'lua', '5.1', True ] ]),
+		 [ [ 'lua', '5.1', False ],
+		   [ 'lua5.1', '5.1', False ],
+		   [ 'lua51', '5.1', False ],
+		   [ 'lua-5.1', '5.1', False ] ]),
 	Plugin('GeanyPrj', None, [ 'geanyprj/src' ]),
 	Plugin('Pretty-Printer', None, [ 'pretty-printer/src' ], [ [ 'libxml-2.0', '2.6.27', True ] ]),
 	Plugin('TreeBrowser', None, [ 'treebrowser/src' ], [ [ 'gio-2.0', '2.16', False ] ])
@@ -272,6 +274,11 @@
 		else:
 			conf.define('TTYHELPERDIR', conf.env['LIBEXECDIR'] + '/geany-plugins/geanygdb', 1)
 
+	if 'geanylua' in enabled_plugins:
+		if not conf.env['HAVE_LUA'] and not conf.env['HAVE_LUA5_1'] and \
+		   not conf.env['HAVE_LUA51'] and not conf.env['HAVE_LUA_5_1']:
+			enabled_plugins.remove('geanylua')
+
 	# Windows specials
 	if is_win32:
 		if conf.env['PREFIX'] == tempfile.gettempdir():


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.