# HG changeset patch
# User Petr Sumbera <petr.sumbera@oracle.com>
# Date 1396358938 25200
# Node ID c77d43725b499a8d7563ef25e6c9e57321519247
# Parent  f6cd58bb9dbaa130caaa4150d8bc9bbe4cfc342f
18480574 Apache should link against system pcre

diff -r f6cd58bb9dba -r c77d43725b49 components/apache2/Makefile
--- a/components/apache2/Makefile	Mon Mar 31 23:00:16 2014 -0700
+++ b/components/apache2/Makefile	Tue Apr 01 06:28:58 2014 -0700
@@ -93,6 +93,7 @@
 CONFIGURE_OPTIONS +=	--enable-ldap
 CONFIGURE_OPTIONS +=	--enable-ssl
 CONFIGURE_OPTIONS +=	--enable-exception-hook
+CONFIGURE_OPTIONS +=	--with-pcre
 CONFIGURE_OPTIONS +=	CFLAGS="$(CFLAGS) -DSSL_EXPERIMENTAL -DSSL_ENGINE"
 CONFIGURE_OPTIONS +=	LTFLAGS="--silent --tag=CC"
 CONFIGURE_OPTIONS.32 +=	--enable-layout=Solaris-Apache2
diff -r f6cd58bb9dba -r c77d43725b49 components/apache2/patches/openldap.patch
--- a/components/apache2/patches/openldap.patch	Mon Mar 31 23:00:16 2014 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,11 +0,0 @@
---- configure.in	Sat Apr 16 12:09:47 2011
-+++ configure.in	Thu Nov 10 07:18:54 2011
-@@ -144,7 +144,7 @@
- 
- APR_ADDTO(LDFLAGS, `$apu_config --ldflags`)
- APU_BINDIR=`$apu_config --bindir`
--APU_INCLUDEDIR=`$apu_config --includedir`
-+APU_INCLUDEDIR="`$apu_config --includedir` -I/usr/include/openldap"
- APU_VERSION=`$apu_config --version`
- APU_CONFIG="$APU_BINDIR/apu-`echo ${APU_VERSION} | sed 's,\..*,,'`-config"
- 
diff -r f6cd58bb9dba -r c77d43725b49 components/apache2/patches/pcre.patch
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/components/apache2/patches/pcre.patch	Tue Apr 01 06:28:58 2014 -0700
@@ -0,0 +1,26 @@
+Patch origin: upstream
+Patch status: already part of 2.4 and HEAD (bacport to 2.2 is unclear)
+
+https://svn.apache.org/viewvc?view=revision&revision=731058
+
+--- configure.in	2014-03-28 07:05:06.506452975 -0700
++++ configure.in	2014-03-28 07:08:12.121620041 -0700
+@@ -184,7 +184,7 @@
+ 
+ if test "$PCRE_CONFIG" != "false"; then
+   AC_MSG_NOTICE([Using external PCRE library from $PCRE_CONFIG])
+-  APR_ADDTO(CFLAGS, [`$PCRE_CONFIG --cflags`])
++  APR_ADDTO(PCRE_INCLUDES, [`$PCRE_CONFIG --cflags`])
+   APR_ADDTO(LIBS, [`$PCRE_CONFIG --libs`])
+ else
+   # Build the bundled PCRE
+@@ -219,6 +219,9 @@
+ APR_ADDTO(INCLUDES, `$apr_config --includes`)
+ APR_ADDTO(INCLUDES, `$apu_config --includes`)
+ 
++dnl Add in path to PCRE includes
++APR_ADDTO(INCLUDES, $PCRE_INCLUDES)
++
+ echo $ac_n "${nl}Applying OS-specific hints for httpd ...${nl}"
+ 
+ case $host in
diff -r f6cd58bb9dba -r c77d43725b49 components/apache2/resolve.deps
--- a/components/apache2/resolve.deps	Mon Mar 31 23:00:16 2014 -0700
+++ b/components/apache2/resolve.deps	Tue Apr 01 06:28:58 2014 -0700
@@ -4,6 +4,7 @@
 library/apr-util-13/dbd-mysql
 library/apr-util-13/dbd-sqlite
 library/openldap
+library/pcre
 library/security/openssl
 library/zlib
 runtime/perl-512