From 96ab7c2d9652de5dff52df5f64cfa7261e04a5d8 Mon Sep 17 00:00:00 2001 From: Tomas Guisasola Date: Mon, 24 Jul 2006 01:42:06 +0000 Subject: Updating to run on both Lua 5.0 and 5.1 --- lualdap/Makefile | 10 +++++++--- lualdap/config | 4 +++- lualdap/doc/us/index.html | 15 +++++++-------- lualdap/doc/us/manual.html | 32 ++++++++++++++++++++++++-------- 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 @@
  • Manual

    LuaLDAP is free software and uses the same -license as Lua 5.0.

    +license as Lua 5.1.

    Status

    -

    Current version is 1.0.1. It was developed for Lua 5.0 and +

    Current version is 1.0.2. It was developed for both Lua 5.0 and Lua 5.1, and OpenLDAP 2.1.

    -

    Version 1.0.1 follows the -package model for Lua -5.1 (see Installation for more -details).

    -

    Download

    LuaLDAP can be downloaded in source code from the @@ -98,6 +94,9 @@ LuaForge page.

    History

    +
    Version 1.0.2 [?/?/2006]
    +
    adapted to work on both Lua 5.0 and Lua 5.1.
    +
    Version 1.0.1 [04/Apr/2006]
    Compatible with Compat-5.1 R5.
    @@ -134,7 +133,7 @@ Comments are welcome!

    Valid XHTML 1.0!

    -

    $Id: index.html,v 1.32 2006-06-26 18:28:45 carregal Exp $

    +

    $Id: index.html,v 1.33 2006-07-24 01:42:06 tomas Exp $

    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 @@
  • Manual
    • Introduction
      • +
    • Building
    • Installation
    • Attributes
    • DN
      • @@ -83,15 +84,30 @@ download OpenLDAP from the OpenLDAP download page.

      +

      Building

      + +

      +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. +

      +

      +LuaLDAP offers a Makefile and a separate configuration file, +config, +which should be edited to suit your installation before runnig +make. +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. +

      +

      Installation

      -

      LuaLDAP follows the -package model -for Lua 5.1, therefore it should be "installed". Refer to - -Compat-5.1 configuration section about how to install the compiled -binary properly. The compiled binary should be copied to a directory in your -LUA_CPATH.

      +

      The LuaLDAP compiled binary should be copied to a directory in your +C path. +Lua 5.0 users should install Compat-5.1 also.

      Windows users can use the binary versions of LuaLDAP (lualdap.dll) and OpenLDAP @@ -328,7 +344,7 @@ ld:delete ("mydn=newuser,ou=people,dc=ldp,dc=world")()

      Valid XHTML 1.0!

      -

      $Id: manual.html,v 1.30 2006-04-04 20:11:51 carregal Exp $

      +

      $Id: manual.html,v 1.31 2006-07-24 01:42:06 tomas Exp $

      -- cgit v1.2.3-59-g8ed1b