From: Jeff Trawick <trawick@apache.org>
Date: Sun, 8 Sep 2013 11:57:35 +0000 (+0000)
Subject: support mod_lua; add some tweaks/disclaimers to the README
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=872d5926e86e841bd70b23d6bcc5a5c2a72d7071;p=thirdparty%2Fapache%2Fhttpd.git

support mod_lua; add some tweaks/disclaimers to the README

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1520856 13f79535-47bb-0310-9956-ffa450edef68
---

diff --git a/CMakeLists.txt b/CMakeLists.txt
index e2e7977e959..fcdf9060760 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -232,7 +232,7 @@ SET(MODULE_LIST
   "modules/loggers/mod_log_debug.c+I+configurable debug logging"
   "modules/loggers/mod_log_forensic.c+I+forensic logging"
   "modules/loggers/mod_logio.c+I+input and output logging"
-  "modules/lua/mod_lua.c+O+Apache Lua Framework"
+  "modules/lua/mod_lua.c+i+Apache Lua Framework"
   "modules/mappers/mod_actions.c+I+Action triggering on requests"
   "modules/mappers/mod_alias.c+A+mapping of requests to different filesystem parts"
   "modules/mappers/mod_dir.c+A+directory request handling"
@@ -333,6 +333,15 @@ SET(mod_ldap_extra_sources
 )
 SET(mod_ldap_main_source             modules/ldap/util_ldap.c)
 SET(mod_ldap_requires                APR_HAS_LDAP)
+SET(mod_lua_extra_defines            AP_LUA_DECLARE_EXPORT)
+SET(mod_lua_extra_includes           ${LUA_INCLUDE_DIR})
+SET(mod_lua_extra_libs               ${LUA_LIBRARIES})
+SET(mod_lua_extra_sources
+  modules/lua/lua_apr.c              modules/lua/lua_config.c
+  modules/lua/lua_passwd.c           modules/lua/lua_request.c
+  modules/lua/lua_vmprep.c           modules/lua/lua_dbd.c
+)
+SET(mod_lua_requires                 LUA51_FOUND)
 SET(mod_optional_hook_export_extra_defines AP_DECLARE_EXPORT) # bogus reuse of core API prefix
 SET(mod_proxy_extra_defines          PROXY_DECLARE_EXPORT)
 SET(mod_proxy_extra_sources          modules/proxy/proxy_util.c)
diff --git a/README.cmake b/README.cmake
index 9f972979839..1c55980797a 100644
--- a/README.cmake
+++ b/README.cmake
@@ -172,7 +172,7 @@ This can be resolved in several different ways:
 * Update PATH to include the bin directories of all necessary support
   libraries.
 
-  Depending on where PATH is set, it may not effect starting httpd as
+  Depending on where PATH is set, it may not affect starting httpd as
   a service.
 
 * Maintain a script which combines required binaries into a common 
@@ -189,9 +189,11 @@ This can be resolved in several different ways:
 Known Bugs and Limitations
 --------------------------
 
+* no standard script or makefile is provided to tie together the builds
+  of httpd and support libraries in a manner suitable for typical users
 * no logic to find support libraries needed by some modules (distcache, serf)
 * no working support for building these modules:
-  + mod_socache_dc, mod_lua, mod_serf, apreq+mod_apreq
+  + mod_socache_dc, mod_serf, apreq+mod_apreq
   + additionally, mod_lbmethod_rr and mod_firehose don't compile on Windows
     anyway
 * buildmark.c isn't necessarily rebuilt when httpd.exe is regenerated