List:NDB Connectors« Previous MessageNext Message »
From:Monty Taylor Date:August 1 2007 5:18pm
Subject:Rev 136: Made lua presence optional. in http://bazaar.launchpad.net/~ndb-connectors/ndb-connectors/devel
View as plain text  
At http://bazaar.launchpad.net/~ndb-connectors/ndb-connectors/devel

------------------------------------------------------------
revno: 136
revision-id: mtaylor@stripped
parent: mtaylor@stripped
committer: Monty Taylor <mtaylor@stripped>
branch nick: devel
timestamp: Wed 2007-08-01 10:18:09 -0700
message:
  Made lua presence optional.
modified:
  Makefile.am                    makefile.am-20070228020914-u2pk759xg7thauwf-4
  configure.in                   configure.in-20070228020914-u2pk759xg7thauwf-13
=== modified file 'Makefile.am'
--- a/Makefile.am	2007-04-15 01:27:12 +0000
+++ b/Makefile.am	2007-08-01 17:18:09 +0000
@@ -1,6 +1,9 @@
 ACLOCAL_AMFLAGS = -I m4
 AUTOMAKE_OPTIONS = foreign
-SUBDIRS = java python perl csharp ruby php
+if BUILD_LUA_SUBDIR
+  d_lua = lua
+endif
+SUBDIRS = java python perl csharp ruby php $(d_lua)
 
 distclean-local:
 	rm -fr autom4te.cache

=== modified file 'configure.in'
--- a/configure.in	2007-07-27 22:11:44 +0000
+++ b/configure.in	2007-08-01 17:18:09 +0000
@@ -57,7 +57,9 @@
    PKG_CHECK_MODULES(LUA, lua5.1 >= 5.1, [
      AC_DEFINE([HAVE_LUA], [1], [liblua])
      AC_DEFINE([HAVE_LUA_H], [1], [lua.h])
-   ])
+   ],[
+       AC_DEFINE([HAVE_LUA],["x"],["x"])
+     ])
  ])
 
  AC_SUBST(LUA_CFLAGS)
@@ -100,6 +102,7 @@
 GENERATED="# This file is autogenerated!" 
 AC_SUBST(GENERATED)
 
+AM_CONDITIONAL(BUILD_LUA_SUBDIR, test "x$HAVE_LUA" != "x") 
 
 AC_SUBST(MYSQL_INCLUDES)
 AC_SUBST(SWIG_SOURCES)

Thread
Rev 136: Made lua presence optional. in http://bazaar.launchpad.net/~ndb-connectors/ndb-connectors/develMonty Taylor1 Aug