improving install script

git-svn-id: http://svn.code.sf.net/p/canvasdraw/cd/trunk@510 86f90930-8b5f-43f8-b0d1-9726248d827e

cd/LINSTALL

@@ -16,7 +16,7 @@ INSTALL for CD on Linux
 
   To install the development files (includes and static libraries), run the "install_dev" script.
 
-  To configure the run time libraries as Lua modules, run the "config_lua_module" script.
+  To configure the run time libraries as Lua modules, run the "config_lua_module" script. This needs to be used only if the Lua modules have 51/52/.. suffixes. The script is pre-configured for Lua 5.1, to use it for other Lua versions define USE_LUA52=Yes, or USE_LUA53=Yes.
 
   All scripts don't need parameters. They need root privileges. If they fail check the Guide at the documentation.
 

cd/config_lua_module

@@ -1,16 +1,15 @@
 #!/bin/bash
 
-#Current Lua Version
-LUA_VER=5.1
-LUA_PFX=51
-
 # Include TEC_UNAME definitions
-source tec_uname
+source ./tec_uname
 
 echo ' '
 echo '  This script will configure the Tecgraf libraries in the system'
 echo '  to be used from Lua. It was tested in Ubuntu and in Fedora.'
 echo ' '
+echo '  The current Lua version is defined by the variables:'
+echo '    USE_LUA51 (default) or USE_LUA52 or USE_LUA52'
+echo ' '
 echo '  The Run Time libraries must be already installed on the system (see the install script).'
 echo '  It assumes that Lua binaries are installed using system packages.'
 echo ' '
@@ -26,6 +25,7 @@ Make_Lua_Link()
 
 # From tec_uname script
 ComputeTecUname
+ComputeLuaVersion
 ComputeSystemPaths
 #PrintInfo
 

cd/tec_uname

@@ -155,13 +155,37 @@ ComputeSystemPaths()
   TEC_SYSTEM_INC=/usr/include
 
   if [ $TEC_SYSNAME == Haiku ]; then
-  	TEC_SYSTEM_LIB=`finddir B_SYSTEM_LIB_DIRECTORY`
-  	TEC_SYSTEM_INC=`finddir B_SYSTEM_HEADERS_DIRECTORY`
+    TEC_SYSTEM_LIB=`finddir B_SYSTEM_LIB_DIRECTORY`
+    TEC_SYSTEM_INC=`finddir B_SYSTEM_HEADERS_DIRECTORY`
   fi
 
   TEC_LUA_LIB=$TEC_SYSTEM_LIB/lua/$LUA_VER
 }
 
+ComputeLuaVersion()
+{
+  if [ -n "$USE_LUA51" ]; then
+    LUA_VER=5.1
+    LUA_SFX=51
+  fi
+
+  if [ -n "$USE_LUA52" ]; then
+    LUA_VER=5.2
+    LUA_SFX=52
+  fi
+
+  if [ -n "$USE_LUA53" ]; then
+    LUA_VER=5.3
+    LUA_SFX=53
+  fi
+
+  # Default Lua version  
+  if [ -z "$LUA_VER" ]; then
+    LUA_VER=5.1
+    LUA_SFX=51
+  fi
+}
+
 PrintInfo()
 {
   echo ' '