fix pcre detection in configure (thanks bero for reporting), bump release number

SVN-Revision: 1819

diff --git a/openwrt/package/lighttpd/Makefile b/openwrt/package/lighttpd/Makefile
index 92ba78f908243efc736333f654c43f7a0852600f..254a29dcbc1b55c70c3b93178be3331dc73ffcfa 100644 (file)
--- a/openwrt/package/lighttpd/Makefile
+++ b/openwrt/package/lighttpd/Makefile
@@ -4,7 +4,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=lighttpd
 PKG_VERSION:=1.3.13
-PKG_RELEASE:=1
+PKG_RELEASE:=2
 PKG_MD5SUM:=2f017b936be376ad6f6c2ee26db93467
 
 PKG_SOURCE_URL:=http://www.lighttpd.net/download/

diff --git a/openwrt/package/lighttpd/patches/500-configure_cross.patch b/openwrt/package/lighttpd/patches/500-configure_cross.patch
index 8f8099823fbc19ffa5fe1da9effb7187c52f0f3c..cf24343ba6eed084bfa49ffa755ed488a4b1775b 100644 (file)
--- a/openwrt/package/lighttpd/patches/500-configure_cross.patch
+++ b/openwrt/package/lighttpd/patches/500-configure_cross.patch
@@ -1,24 +1,42 @@
-diff -ruN lighttpd-1.4.2-old/configure lighttpd-1.4.2-new/configure
---- lighttpd-1.4.2-old/configure       2005-08-29 14:18:11.000000000 +0200
-+++ lighttpd-1.4.2-new/configure       2005-09-01 09:06:29.000000000 +0200
-@@ -23849,7 +23849,7 @@
- echo "$as_me:$LINENO: result: $WITH_PCRE" >&5
- echo "${ECHO_T}$WITH_PCRE" >&6
- 
--if test "x$cross_compiling" = xno -a "$WITH_PCRE" != "no"; then
-+if test "$WITH_PCRE" != "no"; then
+diff -ruN lighttpd-1.3.13-old/configure lighttpd-1.3.13-new/configure
+--- lighttpd-1.3.13-old/configure      2005-03-06 11:53:51.000000000 +0100
++++ lighttpd-1.3.13-new/configure      2005-09-01 09:10:36.000000000 +0200
+@@ -22623,7 +22623,7 @@
+ 
+ fi
+ 
+-if test "x$cross_compiling" = xno; then
++#if test "x$cross_compiling" = xno; then
    # Extract the first word of "pcre-config", so it can be a program name with args.
  set dummy pcre-config; ac_word=$2
  echo "$as_me:$LINENO: checking for $ac_word" >&5
-diff -ruN lighttpd-1.4.2-old/configure.in lighttpd-1.4.2-new/configure.in
---- lighttpd-1.4.2-old/configure.in    2005-08-29 14:06:03.000000000 +0200
-+++ lighttpd-1.4.2-new/configure.in    2005-09-01 09:05:39.000000000 +0200
-@@ -222,7 +222,7 @@
-     [WITH_PCRE=$withval],[WITH_PCRE=yes])
- AC_MSG_RESULT([$WITH_PCRE])
- 
--if test "x$cross_compiling" = xno -a "$WITH_PCRE" != "no"; then
-+if test "$WITH_PCRE" != "no"; then
+@@ -22882,7 +22882,7 @@
+ 
+     LIBS="$OLDLIBS"
+   fi
+-fi
++#fi
+ 
+ 
+ 
+diff -ruN lighttpd-1.3.13-old/configure.in lighttpd-1.3.13-new/configure.in
+--- lighttpd-1.3.13-old/configure.in   2005-03-06 11:53:39.000000000 +0100
++++ lighttpd-1.3.13-new/configure.in   2005-09-01 08:44:12.000000000 +0200
+@@ -207,7 +207,7 @@
+     AC_SUBST(SSL_LIB)
+ fi
+ 
+-if test "x$cross_compiling" = xno; then
++#if test "x$cross_compiling" = xno; then
    AC_PATH_PROG(PCRECONFIG, pcre-config)
  
    if test x"$PCRECONFIG" != x; then 
+@@ -223,7 +223,7 @@
+     ])
+     LIBS="$OLDLIBS"
+   fi
+-fi
++#fi
+ 
+ AC_SUBST(PCRE_LIB)
+