Browse Source

added lua compile option

git-svn-id: svn://svn.lighttpd.net/lighttpd/branches/lighttpd-merge-1.4.x@859 152afb58-edef-0310-8abb-c4023f1b3aa9
svn/tags/lighttpd-1.4.8
Jan Kneschke 16 years ago
parent
commit
6db887ad3c
  1. 14
      SConstruct
  2. 2
      src/SConscript

14
SConstruct

@ -86,7 +86,8 @@ opts.AddOptions(
BoolOption('with_openssl', 'enable memcache support', 'no'),
BoolOption('with_gzip', 'enable gzip compression', 'no'),
BoolOption('with_bzip2', 'enable bzip2 compression', 'no'),
PackageOption('with_ldap', 'enable ldap auth support', 'no'))
BoolOption('with_lua', 'enable lua support for mod_cml', 'no'),
BoolOption('with_ldap', 'enable ldap auth support', 'no'))
env = Environment(
env = os.environ,
@ -152,7 +153,7 @@ if 1:
autoconf.env.Append( LIBSQLITE3 = '', LIBXML2 = '', LIBMYSQL = '', LIBZ = '',
LIBBZ2 = '', LIBCRYPT = '', LIBMEMCACHE = '', LIBFCGI = '',
LIBLDAP = '', LIBLBER = '')
LIBLDAP = '', LIBLBER = '', LIBLUA = '')
if env['with_fam']:
if autoconf.CheckLibWithHeader('fam', 'fam.h', 'C'):
@ -187,6 +188,10 @@ if 1:
if autoconf.CheckLibWithHeader('sqlite3', 'sqlite3.h', 'C'):
autoconf.env.Append(CPPFLAGS = [ '-DHAVE_SQLITE3_H', '-DHAVE_LIBSQLITE3' ], LIBSQLITE3 = 'sqlite3')
if env['with_lua']:
if autoconf.CheckLibWithHeader('lua', 'lua.h', 'C'):
autoconf.env.Append(CPPFLAGS = [ '-DHAVE_LUA_H', '-DHAVE_LIBLUA' ], LIBLUA = 'lua')
if autoconf.CheckLibWithHeader('fcgi', 'fastcgi.h', 'C'):
autoconf.env.Append(LIBFCGI = 'fcgi')
@ -211,6 +216,11 @@ if env['with_xml']:
env.ParseConfig(xml2_config + ' --cflags --libs')
env.Append(CPPFLAGS = [ '-DHAVE_LIBXML_H', '-DHAVE_LIBXML2' ], LIBXML2 = 'xml2')
if env['with_mysql']:
mysql_config = checkProgram(env, 'mysql', 'mysql_config')
env.ParseConfig(mysql_config + ' --cflags --libs')
env.Append(CPPFLAGS = [ '-DHAVE_MYSQL_H', '-DHAVE_LIBMYSQL' ], LIBMYSQL = 'mysqlclient')
if re.compile("cygwin|mingw").search(env['PLATFORM']):
env.Append(COMMON_LIB = 'bin')
elif re.compile("darwin|aix").search(env['PLATFORM']):

2
src/SConscript

@ -84,7 +84,7 @@ instlib += env.SharedLibrary('mod_auth', [ Split('mod_auth.c http_auth_digest.c
instlib += env.SharedLibrary('mod_webdav', [ 'mod_webdav.c' ], LIBS= [ common_lib, env['LIBXML2'], env['LIBSQLITE3'] ])
instlib += env.SharedLibrary('mod_mysql_vhost', [ 'mod_mysql_vhost.c' ], LIBS= [ common_lib, env['LIBMYSQL'] ])
instlib += env.SharedLibrary('mod_trigger_b4_dl', [ 'mod_trigger_b4_dl.c' ], LIBS= [ common_lib, env['LIBPCRE'] ])
instlib += env.SharedLibrary('mod_cml', [ 'mod_cml_lua.c', 'mod_cml.c' ], LIBS= [ common_lib, env['LIBPCRE'], env['LIBMEMCACHE'] ])
instlib += env.SharedLibrary('mod_cml', [ 'mod_cml_lua.c', 'mod_cml.c' ], LIBS= [ common_lib, env['LIBPCRE'], env['LIBMEMCACHE'], env['LIBLUA'] ])
instlib += env.SharedLibrary('mod_uploadprogress', [ 'mod_uploadprogress.c' ], LIBS= [ common_lib ])
inst = []

Loading…
Cancel
Save