[oe-commits] Frans Meulenbroeks : apache2: use libprce i.s.o own one

[git version control]

Module: openembedded.git
Branch: org.openembedded.dev
Commit: 88ecddab105e8d1743d4fb73f4917522dc30f7ef
URL:    http://gitweb.openembedded.net/?p=openembedded.git&a=commit;h=88ecddab105e8d1743d4fb73f4917522dc30f7ef

Author: Frans Meulenbroeks <fransmeulenbroeks at gmail.com>
Date:   Sat Dec 12 21:15:03 2009 +0100

apache2: use libprce i.s.o own one

---

 recipes/apache2/apache2-native_2.2.14.bb |    1 -
 recipes/apache2/apache2_2.2.14.bb        |    4 ++--
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/recipes/apache2/apache2-native_2.2.14.bb b/recipes/apache2/apache2-native_2.2.14.bb
index 460c3fd..efa10f7 100644
--- a/recipes/apache2/apache2-native_2.2.14.bb
+++ b/recipes/apache2/apache2-native_2.2.14.bb
@@ -14,7 +14,6 @@ do_configure () {
 
 do_stage () {
 	install -d ${STAGING_BINDIR_NATIVE}
-	cp srclib/pcre/dftables ${STAGING_BINDIR_NATIVE}
 	cp server/gen_test_char ${STAGING_BINDIR_NATIVE}
 	cp srclib/apr/apr-1-config ${STAGING_BINDIR_NATIVE}
 	cp srclib/apr-util/apu-1-config ${STAGING_BINDIR_NATIVE}
diff --git a/recipes/apache2/apache2_2.2.14.bb b/recipes/apache2/apache2_2.2.14.bb
index 8990d53..4ad7743 100644
--- a/recipes/apache2/apache2_2.2.14.bb
+++ b/recipes/apache2/apache2_2.2.14.bb
@@ -3,10 +3,9 @@ DESCRIPTION = "The apache v2 web server"
 DEPENDS = "apache2-native openssl expat pcre"
 RDEPENDS += "openssl"
 
-PR = "r0"
+PR = "r1"
 
 SRC_URI = "http://apache.mirrors.tds.net/httpd/httpd-${PV}.tar.bz2 \
-	   file://dftables-makefile-patch;patch=1 \
 	   file://apr-sockets-patch;patch=1 \
 	   file://configure-patch;patch=1 \
 	   file://server-makefile-patch;patch=1 \
@@ -74,6 +73,7 @@ CFLAGS_prepend = "-I${STAGING_INCDIR}/openssl "
 EXTRA_OECONF = "--enable-ssl \
 		--with-ssl=${STAGING_LIBDIR}/.. \
 		--with-expat=${STAGING_LIBDIR}/.. \
+		--with-pcre=${STAGING_LIBDIR}/.. \
 		--enable-info \
 		--enable-rewrite \
 		--with-dbm=sdbm \