SOURCES: lighttpd-lua-pkgconfig.patch - updated to 1.4.3

[glen]

Author: glen                         Date: Sat Sep  3 17:14:09 2005 GMT
Module: SOURCES                       Tag: HEAD
---- Log message:
- updated to 1.4.3

---- Files affected:
SOURCES:
   lighttpd-lua-pkgconfig.patch (1.1 -> 1.2) 

---- Diffs:

================================================================
Index: SOURCES/lighttpd-lua-pkgconfig.patch
diff -u SOURCES/lighttpd-lua-pkgconfig.patch:1.1 SOURCES/lighttpd-lua-pkgconfig.patch:1.2
--- SOURCES/lighttpd-lua-pkgconfig.patch:1.1	Mon Aug 22 17:17:46 2005
+++ SOURCES/lighttpd-lua-pkgconfig.patch	Sat Sep  3 19:14:03 2005
@@ -1,21 +1,38 @@
 --- ./configure.in	2005-08-22 13:56:17.000000000 +0300
 +++ ../lighttpd-1.4.1-pkgconfig/configure.in	2005-08-22 18:03:23.000000000 +0300
-@@ -328,21 +328,35 @@
+@@ -511,7 +525,7 @@
+ fi
+ 
+ plugins="mod_cml"
+-if test ! "x$LUA_LIB" = x; then
++if test ! "x$LUA_LIBS" = x; then
+ 	do_build="$do_build $plugins"
+ else
+ 	no_build="$no_build $plugins"
+--- ./src/Makefile.am	2005-08-20 12:16:29.000000000 +0300
++++ ../lighttpd-1.4.1-pkgconfig/src/Makefile.am	2005-08-22 18:05:10.000000000 +0300
+@@ -78,7 +78,7 @@
+ mod_cml_la_SOURCES = mod_cml.c mod_cml_lua.c mod_cml_funcs.c
+ mod_cml_la_CFLAGS = $(AM_CFLAGS) $(LUA_CFLAGS)
+ mod_cml_la_LDFLAGS = -module -export-dynamic -avoid-version -no-undefined
+-mod_cml_la_LIBADD = $(MEMCACHE_LIB) $(common_libadd) $(LUA_LIB)
++mod_cml_la_LIBADD = $(MEMCACHE_LIB) $(common_libadd) $(LUA_LIBS)
+ 
+ lib_LTLIBRARIES += mod_trigger_b4_dl.la
+ mod_trigger_b4_dl_la_SOURCES = mod_trigger_b4_dl.c
+--- lighttpd-1.4.3/configure.in~	2005-09-03 19:52:51.000000000 +0300
++++ lighttpd-1.4.3/configure.in	2005-09-03 20:02:03.000000000 +0300
+@@ -353,21 +353,30 @@
  
  AC_MSG_RESULT($WITH_LUA)
  if test "$WITH_LUA" != "no"; then
-+ PKG_CHECK_MODULES(LUA, lua50, [
-+    AC_DEFINE([HAVE_LUA], [1], [liblua])
-+    AC_DEFINE([HAVE_LUA_H], [1], [lua.h])
++ # try pkgconfig
++ PKG_CHECK_MODULES(LUA, lua, [
++   AC_DEFINE([HAVE_LUA], [1], [liblua])
++   AC_DEFINE([HAVE_LUA_H], [1], [lua.h])
 + ])
 +
-+ if test $succeeded = no; then
-+  PKG_CHECK_MODULES(LUA, lua, [
-+    AC_DEFINE([HAVE_LUA], [1], [liblua])
-+    AC_DEFINE([HAVE_LUA_H], [1], [lua.h])
-+  ])
-+ fi
-+
++ # fallback to lua-config
 + if test $succeeded = no; then
   AC_PATH_PROG(LUACONFIG, lua-config)
   if test x"$LUACONFIG" != x; then
@@ -25,37 +42,17 @@
   else
     AC_CHECK_LIB(lua, lua_open, [
           AC_CHECK_HEADERS([lua.h],[
--                 LUA_LIB=-llua 
-+                 LUA_LIBS=-llua 
+-                 LUA_LIB=-llua -llualib
++                 LUA_LIBS=-llua -llualib
                   AC_DEFINE([HAVE_LUA], [1], [liblua])
  		 AC_DEFINE([HAVE_LUA_H], [1], [lua.h])
           ])
     ])
   fi
++ fi # lua-config
   AC_SUBST(LUA_CFLAGS)
 - AC_SUBST(LUA_LIB)
 + AC_SUBST(LUA_LIBS)
-+ fi
  fi
  
  
-@@ -511,7 +525,7 @@
- fi
- 
- plugins="mod_cml"
--if test ! "x$LUA_LIB" = x; then
-+if test ! "x$LUA_LIBS" = x; then
- 	do_build="$do_build $plugins"
- else
- 	no_build="$no_build $plugins"
---- ./src/Makefile.am	2005-08-20 12:16:29.000000000 +0300
-+++ ../lighttpd-1.4.1-pkgconfig/src/Makefile.am	2005-08-22 18:05:10.000000000 +0300
-@@ -78,7 +78,7 @@
- mod_cml_la_SOURCES = mod_cml.c mod_cml_lua.c mod_cml_funcs.c
- mod_cml_la_CFLAGS = $(AM_CFLAGS) $(LUA_CFLAGS)
- mod_cml_la_LDFLAGS = -module -export-dynamic -avoid-version -no-undefined
--mod_cml_la_LIBADD = $(MEMCACHE_LIB) $(common_libadd) $(LUA_LIB)
-+mod_cml_la_LIBADD = $(MEMCACHE_LIB) $(common_libadd) $(LUA_LIBS)
- 
- lib_LTLIBRARIES += mod_trigger_b4_dl.la
- mod_trigger_b4_dl_la_SOURCES = mod_trigger_b4_dl.c
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SOURCES/lighttpd-lua-pkgconfig.patch?r1=1.1&r2=1.2&f=u