- next release is 1.4.13

- allow --with-lua with a package-name for pkg-config


git-svn-id: svn://svn.lighttpd.net/lighttpd/branches/lighttpd-1.4.x@1370 152afb58-edef-0310-8abb-c4023f1b3aa9

NEWS

@@ -3,6 +3,16 @@
 NEWS
 ====
 
+- 1.4.13 - 
+
+  * added initgroups in spawn-fcgi (#871)
+  * added apr1 support htpasswd in mod-auth (#870)
+  * fixed segfault in splitted CRLF CRLF sequences 
+    (introduced in 1.4.12) (#876)
+  * fixed compilation of LOCK support in mod-webdav
+  * fixed fragments in request-URLs (#869)
+  * fixed pkg-config check for lua5.1 on debian
+
 - 1.4.12 - 2006-09-23
 
   * added experimental LOCK support for webdav

SConstruct

@@ -5,7 +5,7 @@ import string
 from stat import *
 
 package = 'lighttpd'
-version = '1.4.11'
+version = '1.4.13'
 
 def checkCHeaders(autoconf, hdrs):
 	p = re.compile('[^A-Z0-9]')

configure.in

@@ -1,7 +1,7 @@
 #                                               -*- Autoconf -*-
 # Process this file with autoconf to produce a configure script.
 AC_PREREQ(2.57)
-AC_INIT(lighttpd, 1.4.12, jan@kneschke.de)
+AC_INIT(lighttpd, 1.4.13, jan@kneschke.de)
 AC_CONFIG_SRCDIR([src/server.c])
 
 AC_CANONICAL_TARGET
@@ -381,30 +381,13 @@ AC_ARG_WITH(lua, AC_HELP_STRING([--with-lua],[lua engine for mod_cml]),
 
 AC_MSG_RESULT($WITH_LUA)
 if test "$WITH_LUA" != "no"; then
- AC_PATH_PROG(LUACONFIG, lua-config)
-
- if test x"$LUACONFIG" != x; then
-   LUA_CFLAGS=`$LUACONFIG --include`
-   LUA_LIBS=`$LUACONFIG --libs --extralibs`
+ if test "$WITH_LUA" == "yes"; then
+  WITH_LUA=lua
+ fi
+ PKG_CHECK_MODULES(LUA, $WITH_LUA >= 5.1, [
    AC_DEFINE([HAVE_LUA], [1], [liblua])
    AC_DEFINE([HAVE_LUA_H], [1], [lua.h])
- else
-   AC_CHECK_LIB(lua, lua_open, [
-     AC_CHECK_HEADERS([lua.h],[
-       LUA_LIBS="-llua -llualib"
-       AC_DEFINE([HAVE_LUA], [1], [liblua])
-       AC_DEFINE([HAVE_LUA_H], [1], [lua.h])
-     ])
-   ])
- fi
-
- if test x"$LUA_LIBS" = x; then
-   # try pkgconfig
-   PKG_CHECK_MODULES(LUA, lua >= 5.0, [
-     AC_DEFINE([HAVE_LUA], [1], [liblua])
-     AC_DEFINE([HAVE_LUA_H], [1], [lua.h])
-   ])
- fi
+ ])
 
  AC_SUBST(LUA_CFLAGS)
  AC_SUBST(LUA_LIBS)