- exclude configure.ac from branch.diff to avoid version bump; rel 7

[packages/lighttpd.git] / lighttpd-branch.diff

diff --git a/lighttpd-branch.diff b/lighttpd-branch.diff
index 257a3b56836beab94811f2da11674ac440ffa2ff..c9ee19e9c4d51d7924b8eb10ba8cb0f92ffdc883 100644 (file)
--- a/lighttpd-branch.diff
+++ b/lighttpd-branch.diff
@@ -2738,44 +2738,6 @@ Index: tests/LightyTest.pm
        return 0;
 Index: configure.ac
 ===================================================================
---- configure.ac       (.../tags/lighttpd-1.4.23)
-+++ configure.ac       (.../branches/lighttpd-1.4.x)
-@@ -1,9 +1,10 @@
- #                                               -*- Autoconf -*-
- # Process this file with autoconf to produce a configure script.
- AC_PREREQ(2.57)
--AC_INIT([lighttpd], [1.4.23], [contact@lighttpd.net])
-+AC_INIT([lighttpd], [1.4.24], [contact@lighttpd.net])
- AC_CONFIG_SRCDIR([src/server.c])
- AC_CONFIG_HEADER([config.h])
-+AC_CONFIG_MACRO_DIR([m4])
- 
- AC_CANONICAL_TARGET
- 
-@@ -417,12 +418,18 @@
-    AC_DEFINE([HAVE_LUA], [1], [liblua])
-    AC_DEFINE([HAVE_LUA_H], [1], [lua.h])
-  ],[
--   # for debian based systems
--   PKG_CHECK_MODULES(LUA, lua5.1 >= 5.1, [
--     AC_DEFINE([HAVE_LUA], [1], [liblua])
--     AC_DEFINE([HAVE_LUA_H], [1], [lua.h])
--   ])
-+ # for debian based systems
-+ PKG_CHECK_MODULES(LUA, lua5.1 >= 5.1, [
-+   AC_DEFINE([HAVE_LUA], [1], [liblua])
-+   AC_DEFINE([HAVE_LUA_H], [1], [lua.h])
-+ ],[
-+ # for freebsd
-+ PKG_CHECK_MODULES(LUA, lua-5.1 >= 5.1, [
-+   AC_DEFINE([HAVE_LUA], [1], [liblua])
-+   AC_DEFINE([HAVE_LUA_H], [1], [lua.h])
-  ])
-+ ])
-+ ])
- 
-  AC_SUBST(LUA_CFLAGS)
-  AC_SUBST(LUA_LIBS)
 Index: doc/.cvsignore
 ===================================================================
 Index: doc/fastcgi.txt