Updating to run on both Lua 5.0 and 5.1

4 files changed, 41 insertions, 20 deletions

diff --git a/lualdap/Makefile b/lualdap/Makefile
index 6b2b251..4b9ee1c 100755
--- a/lualdap/Makefile
+++ b/lualdap/Makefile
@@ -1,12 +1,16 @@
-# $Id: Makefile,v 1.28 2005-12-26 21:26:03 tomas Exp $
+# $Id: Makefile,v 1.29 2006-07-24 01:42:06 tomas Exp $
 
 T= lualdap
-V= 1.0
+V= 1.0.2
 CONFIG= ./config
 
 include $(CONFIG)
 
-OBJS= src/lualdap.o $(COMPAT_DIR)/compat-5.1.o
+ifeq "$(LUA_VERSION_NUM)" "500"
+COMPAT_O= $(COMPAT_DIR)/compat-5.1.o
+endif
+
+OBJS= src/lualdap.o $(COMPAT_O)
 
 
 src/$(LIBNAME): $(OBJS)
diff --git a/lualdap/config b/lualdap/config
index 1aefa3a..84543b3 100755
--- a/lualdap/config
+++ b/lualdap/config
@@ -12,6 +12,8 @@ OPENLDAP_LIB= -lldap
 LIB_OPTION= -shared #for Linux
 #LIB_OPTION= -bundle -undefined dynamic_lookup #for MacOS X
 
+# Lua version number (first and second digits of target version)
+LUA_VERSION_NUM= 500
 LIBNAME= $T.so.$V
 COMPAT_DIR= ../compat/src
 
@@ -21,4 +23,4 @@ INCS= -I$(LUA_INC) -I$(OPENLDAP_INC) -I$(COMPAT_DIR)
 CFLAGS= $(WARN) $(INCS)
 CC= gcc
 
-# $Id: config,v 1.4 2005-12-26 21:26:03 tomas Exp $
+# $Id: config,v 1.5 2006-07-24 01:42:06 tomas Exp $
diff --git a/lualdap/doc/us/index.html b/lualdap/doc/us/index.html
index caaed1d..9f45d30 100755
--- a/lualdap/doc/us/index.html
+++ b/lualdap/doc/us/index.html
@@ -40,6 +40,7 @@
         <li><a href="manual.html">Manual</a>
             <ul>
                 <li><a href="manual.html#introduction">Introduction</a></li>
+                <li><a href="manual.html#building">Building</a></li>
                 <li><a href="manual.html#installation">Installation</a></li>
                 <li><a href="manual.html#attributes">Attributes</a></li>
                 <li><a href="manual.html#dn">DN</a></li>
@@ -74,18 +75,13 @@ fact it is a bind to
 </ul>
 
 <p>LuaLDAP is free software and uses the same
-<a href="license.html">license</a> as Lua 5.0.</p>
+<a href="license.html">license</a> as Lua 5.1.</p>
 
 <h2><a name="status"></a>Status</h2>
 
-<p>Current version is 1.0.1. It was developed for Lua 5.0 and
+<p>Current version is 1.0.2. It was developed for both Lua 5.0 and Lua 5.1, and
 <a href="http://www.openldap.org">OpenLDAP</a> 2.1.</p>
 
-<p>Version 1.0.1 follows the
-<a href="http://www.keplerproject.org/compat">package model</a> for Lua
-5.1 (see <a href="manual.html#installation">Installation</a> for more
-details).</p>
-
 <h2><a name="download"></a>Download</h2>
 
 <p>LuaLDAP can be downloaded in source code from the
@@ -98,6 +94,9 @@ LuaForge page.</p>
 <h2><a name="history"></a>History</h2>
 
 <dl class="history">
+    <dt><strong>Version 1.0.2</strong> [?/?/2006]</dt>
+    <dd>adapted to work on both Lua 5.0 and Lua 5.1.</dd>
+
     <dt><strong>Version 1.0.1</strong> [04/Apr/2006]</dt>
     <dd>Compatible with Compat-5.1 R5.</dd>
 
@@ -134,7 +133,7 @@ Comments are welcome!</p>
 <div id="about">
 	<p><a href="http://validator.w3.org/check?uri=referer">
 		<img src="http://www.w3.org/Icons/valid-xhtml10" alt="Valid XHTML 1.0!" height="31" width="88" /></a></p>
-	<p><small>$Id: index.html,v 1.32 2006-06-26 18:28:45 carregal Exp $</small></p>
+	<p><small>$Id: index.html,v 1.33 2006-07-24 01:42:06 tomas Exp $</small></p>
 </div> <!-- id="about" -->
 
 </div> <!-- id="container" -->
diff --git a/lualdap/doc/us/manual.html b/lualdap/doc/us/manual.html
index 80b08dc..2313334 100755
--- a/lualdap/doc/us/manual.html
+++ b/lualdap/doc/us/manual.html
@@ -38,6 +38,7 @@
         <li><strong>Manual</strong>
             <ul>
                 <li><a href="manual.html#introduction">Introduction</a></li>
+                <li><a href="manual.html#building">Building</a></li>
                 <li><a href="manual.html#installation">Installation</a></li>
                 <li><a href="manual.html#attributes">Attributes</a></li>
                 <li><a href="manual.html#dn">DN</a></li>
@@ -83,15 +84,30 @@ download OpenLDAP from the
 <a href="http://www.openldap.org/software/download">OpenLDAP download</a>
 page.</p>
 
+<h2><a name="building"></a>Building</h2>
+
+<p>
+LuaLDAP could be built to Lua 5.0 or to Lua 5.1.
+In both cases,
+the language library and headers files for the target version
+must be installed properly.
+</p>
+<p>
+LuaLDAP offers a Makefile and a separate configuration file,
+<code>config</code>,
+which should be edited to suit your installation before runnig
+<code>make</code>.
+The file has some definitions like paths to the external libraries,
+compiler options and the like.
+One important definition is the version of Lua language,
+which is not obtained from the installed software.
+</p>
+
 <h2><a name="installation"></a>Installation</h2>
 
-<p>LuaLDAP follows the
-<a href="http://www.keplerproject.org/compat/">package model</a>
-for Lua 5.1, therefore it should be "installed". Refer to
-<a href="http://www.keplerproject.org/compat/manual.html#configuration">
-Compat-5.1 configuration</a> section about how to install the compiled
-binary properly. The compiled binary should be copied to a directory in your
-<code>LUA_CPATH</code>.</p>
+<p>The LuaLDAP compiled binary should be copied to a directory in your
+<a href="http://www.lua.org/manual/5.1/manual.html#pdf-package.cpath">C path</a>. 
+Lua 5.0 users should install <a href="http://www.keplerproject.org/compat">Compat-5.1</a> also.</p>
 
 <p>Windows users can use the binary versions of LuaLDAP
 (<code>lualdap.dll</code>) and OpenLDAP 
@@ -328,7 +344,7 @@ ld:delete ("mydn=newuser,ou=people,dc=ldp,dc=world")()
 <div id="about">
 	<p><a href="http://validator.w3.org/check?uri=referer">
     <img src="http://www.w3.org/Icons/valid-xhtml10" alt="Valid XHTML 1.0!" height="31" width="88" /></a></p>
-	<p><small>$Id: manual.html,v 1.30 2006-04-04 20:11:51 carregal Exp $</small></p>
+	<p><small>$Id: manual.html,v 1.31 2006-07-24 01:42:06 tomas Exp $</small></p>
 </div> <!-- id="about" -->
 
 </div> <!-- id="container" -->