Mercurial Mercurial > lua-lm / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | gz | bz2 | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Small typo and header fixes
authorMyhailo Danylenko <isbear@ukrpost.net>
Mon, 01 Jun 2009 19:57:22 +0300
changeset 27 23393a00c2c1
parent 26 1f7e8b53b255
child 28 2e4650583dd7
Small typo and header fixes
CMakeLists.txt file | annotate | diff | comparison | revisions
lm_types.c file | annotate | diff | comparison | revisions
lm_types.h file | annotate | diff | comparison | revisions 
--- a/CMakeLists.txt	Wed May 20 19:48:34 2009 +0300
+++ b/CMakeLists.txt	Mon Jun 01 19:57:22 2009 +0300
@@ -19,10 +19,10 @@
 
 ## User options
 option(DEBUG "Enable debugging output" OFF)
-set(TEST_USER "test@jabber.org" CACHE TEXT "Testing: Your jabber account name")
-set(TEST_PASSWORD "greatsecret" CACHE TEXT "Testing: Password for your jabber account")
-set(TEST_TO "test@jabber.org/mcabber" CACHE TEXT "Testing: Target jabber entity")
-set(TEST_FINGERPRINT "00:11:22:33:44:55:66:77:88:99:aa:bb:cc:dd:ee:ff" CACHE TEXT "Testing: Your jabber server SSL fingerprint")
+set(TEST_USER "test@jabber.org" CACHE STRING "Testing: Your jabber account name")
+set(TEST_PASSWORD "greatsecret" CACHE STRING "Testing: Password for your jabber account")
+set(TEST_TO "test@jabber.org/mcabber" CACHE STRING "Testing: Target jabber entity")
+set(TEST_FINGERPRINT "00:11:22:33:44:55:66:77:88:99:aa:bb:cc:dd:ee:ff" CACHE STRING "Testing: Your jabber server SSL fingerprint")
 
 ## Define targets
 add_library(loudmouth MODULE util.c lm_types.c lm_proxy.c lm_ssl.c lm_connection.c lm_message.c lm_message_node.c lm_message_handler.c lm.c)
@@ -45,7 +45,7 @@
 # TODO: versions
 set(CPACK_DEBIAN_PACKAGE_DEPENDS "libc6, libglib2.0-0, liblua5.1-0, libloudmouth1-0")
 set(CPACK_SOURCE_GENERATOR TBZ2)
-set(CPACK_GENERATOR DEB CACHE TEXT "Binary package generator, eg DEB, RPM, TGZ, NSIS...")
+set(CPACK_GENERATOR DEB CACHE STRING "Binary package generator, eg DEB, RPM, TGZ, NSIS...")
 # FIXME: Detect architecture. How? Though, it anyway produces nonconformant deb names...
 set(CPACK_SYSTEM_NAME i386)
 # XXX: Set package name directly to get rid of -Sources?
@@ -55,8 +55,10 @@
 ## Gather information about system
 find_package(Lua51 REQUIRED)
 find_program(LUA_EXECUTABLE lua lua5.1 luanoreadline)
-execute_process(COMMAND lua -e "print ( package.path )" OUTPUT_VARIABLE LUA_PATH OUTPUT_STRIP_TRAILING_WHITESPACE)
-execute_process(COMMAND lua -e "print ( package.cpath )" OUTPUT_VARIABLE LUA_CPATH OUTPUT_STRIP_TRAILING_WHITESPACE)
+if(LUA_EXECUTABLE)
+	execute_process(COMMAND ${LUA_EXECUTABLE} -e "print ( package.path )" OUTPUT_VARIABLE LUA_PATH OUTPUT_STRIP_TRAILING_WHITESPACE)
+	execute_process(COMMAND ${LUA_EXECUTABLE} -e "print ( package.cpath )" OUTPUT_VARIABLE LUA_CPATH OUTPUT_STRIP_TRAILING_WHITESPACE)
+endif()
 find_package(PkgConfig REQUIRED)
 pkg_check_modules(GLIB REQUIRED glib-2.0)
 pkg_check_modules(LM REQUIRED loudmouth-1.0)
--- a/lm_types.c	Wed May 20 19:48:34 2009 +0300
+++ b/lm_types.c	Mon Jun 01 19:57:22 2009 +0300
@@ -18,7 +18,7 @@
 
 #include <lua.h>
 #include <lauxlib.h>
-#include <loudmouth/loudmouth.h>  // lm_*ref
+#include <loudmouth/loudmouth.h>
 
 #include "config.h"
 #include "lm_types.h"
@@ -98,4 +98,6 @@
 }
 
 #undef LLM_DEFINE
+#undef LLM_BLESS
+#undef LLM_CHECK
 
--- a/lm_types.h	Wed May 20 19:48:34 2009 +0300
+++ b/lm_types.h	Mon Jun 01 19:57:22 2009 +0300
@@ -39,7 +39,7 @@
 } llm_##WHAT##_t;                                                             \
                                                                               \
 llm_##WHAT##_t *luaL_checklm_##WHAT (lua_State *L, int index);                \
-llm_##WHAT##_t *llm_##WHAT##_bless (lua_State *L, TYPE *WHAT);
+llm_##WHAT##_t *bless_lm_##WHAT (lua_State *L, TYPE *WHAT);
 
 LLM_DECLARE (connection, LmConnection)
 LLM_DECLARE (message, LmMessage)
lua-lm