# HG changeset patch
# User Petr Sumbera <petr.sumbera@oracle.com>
# Date 1401101752 25200
# Node ID 0f52d63640865cdc904d15da16bfad0488898b3e
# Parent  c02f96475fe6201b641afa81eeb792e0b3359981
18751802 Apache should link against APR/APR-util 1.5

diff -r c02f96475fe6 -r 0f52d6364086 components/apache2/Makefile
--- a/components/apache2/Makefile	Wed May 21 10:22:05 2014 +0100
+++ b/components/apache2/Makefile	Mon May 26 03:55:52 2014 -0700
@@ -93,15 +93,16 @@
 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
 CONFIGURE_OPTIONS.64 +=	--enable-layout=Solaris-Apache2-$(MACH64)
-CONFIGURE_OPTIONS.32 +=	--with-apr=/usr/apr/1.3/bin/apr-1-config
-CONFIGURE_OPTIONS.64 +=	--with-apr=/usr/apr/1.3/bin/$(MACH64)/apr-1-config
-CONFIGURE_OPTIONS.32 +=	--with-apr-util=/usr/apr-util/1.3/bin/apu-1-config
-CONFIGURE_OPTIONS.64 +=	--with-apr-util=/usr/apr-util/1.3/bin/$(MACH64)/apu-1-config
+CONFIGURE_OPTIONS.32 +=	--with-apr=/usr/apr/1.5/bin/apr-1-config
+CONFIGURE_OPTIONS.64 +=	--with-apr=/usr/apr/1.5/bin/$(MACH64)/apr-1-config
+CONFIGURE_OPTIONS.32 +=	--with-apr-util=/usr/apr-util/1.5/bin/apu-1-config
+CONFIGURE_OPTIONS.64 +=	--with-apr-util=/usr/apr-util/1.5/bin/$(MACH64)/apu-1-config
+CONFIGURE_OPTIONS.32 +=	--with-pcre=/usr/bin/pcre-config
+CONFIGURE_OPTIONS.64 +=	--with-pcre=/usr/bin/$(MACH64)/pcre-config
 
 PATH=$(SPRO_VROOT)/bin:/usr/bin:/usr/gnu/bin
 
diff -r c02f96475fe6 -r 0f52d6364086 components/apache2/apache-22.p5m
--- a/components/apache2/apache-22.p5m	Wed May 21 10:22:05 2014 +0100
+++ b/components/apache2/apache-22.p5m	Mon May 26 03:55:52 2014 -0700
@@ -620,13 +620,13 @@
 link path=var/apache2/2.2/libexec/64 target=$(MACH64)
 
 depend fmri=__TBD \
-    pkg.debug.depend.file=usr/apr-util/1.3/lib/apr-util-1/apr_dbd_mysql.so \
+    pkg.debug.depend.file=usr/apr-util/1.5/lib/apr-util-1/apr_dbd_mysql.so \
     type=require 
 depend fmri=__TBD \
-    pkg.debug.depend.file=usr/apr-util/1.3/lib/apr-util-1/apr_dbd_sqlite3.so \
+    pkg.debug.depend.file=usr/apr-util/1.5/lib/apr-util-1/apr_dbd_sqlite3.so \
     type=require 
 depend fmri=__TBD \
-    pkg.debug.depend.file=usr/apr-util/1.3/lib/apr-util-1/apr_ldap-1.so \
+    pkg.debug.depend.file=usr/apr-util/1.5/lib/apr-util-1/apr_ldap-1.so \
     type=require 
 
 depend type=conditional \
diff -r c02f96475fe6 -r 0f52d6364086 components/apache2/resolve.deps
--- a/components/apache2/resolve.deps	Wed May 21 10:22:05 2014 +0100
+++ b/components/apache2/resolve.deps	Mon May 26 03:55:52 2014 -0700
@@ -1,8 +1,8 @@
-library/apr-13
-library/apr-util-13
-library/apr-util-13/apr-ldap
-library/apr-util-13/dbd-mysql
-library/apr-util-13/dbd-sqlite
+library/apr-15
+library/apr-util-15
+library/apr-util-15/apr-ldap
+library/apr-util-15/dbd-mysql
+library/apr-util-15/dbd-sqlite
 library/openldap
 library/pcre
 library/security/openssl