19143600 Subversion should link against APR/APR-util 1.5
authorPetr Sumbera <petr.sumbera@oracle.com>
Thu, 03 Jul 2014 05:31:14 -0700
changeset 1982 358faa08fa31
parent 1981 66b174f4707e
child 1983 3ecae322d7a8
19143600 Subversion should link against APR/APR-util 1.5
components/subversion/Makefile
components/subversion/resolve.deps
--- a/components/subversion/Makefile	Wed Jun 11 10:40:29 2014 -0700
+++ b/components/subversion/Makefile	Thu Jul 03 05:31:14 2014 -0700
@@ -106,10 +106,10 @@
 LIBSVNDIR.32 = $(CONFIGURE_PREFIX)/lib/svn
 LIBSVNDIR.64 = $(CONFIGURE_PREFIX)/lib/svn/$(MACH64)
 
-APR-CONFIG.32 = /usr/apr/1.3/bin/apr-1-config
-APR-CONFIG.64 = /usr/apr/1.3/bin/$(MACH64)/apr-1-config
-APU-CONFIG.32 = /usr/apr-util/1.3/bin/apu-1-config
-APU-CONFIG.64 = /usr/apr-util/1.3/bin/$(MACH64)/apu-1-config
+APR-CONFIG.32 = /usr/apr/1.5/bin/apr-1-config
+APR-CONFIG.64 = /usr/apr/1.5/bin/$(MACH64)/apr-1-config
+APU-CONFIG.32 = /usr/apr-util/1.5/bin/apu-1-config
+APU-CONFIG.64 = /usr/apr-util/1.5/bin/$(MACH64)/apu-1-config
 APXS.32 = /usr/apache2/2.2/bin/apxs
 APXS.64 = /usr/apache2/2.2/bin/$(MACH64)/apxs
 
@@ -129,8 +129,8 @@
 CONFIGURE_OPTIONS += --with-ssl 
 CONFIGURE_OPTIONS += --with-zlib=$(CONFIGURE_PREFIX)
 CONFIGURE_OPTIONS += --with-jdk=$(JAVA_ROOT)
-CONFIGURE_OPTIONS += --with-apr=/usr/apr/1.3
-CONFIGURE_OPTIONS += --with-apr-util=/usr/apr-util/1.3
+CONFIGURE_OPTIONS += --with-apr=/usr/apr/1.5
+CONFIGURE_OPTIONS += --with-apr-util=/usr/apr-util/1.5
 CONFIGURE_OPTIONS += --enable-nls
 CONFIGURE_OPTIONS += --disable-mod-activation
 CONFIGURE_OPTIONS += --enable-javahl
--- a/components/subversion/resolve.deps	Wed Jun 11 10:40:29 2014 -0700
+++ b/components/subversion/resolve.deps	Thu Jul 03 05:31:14 2014 -0700
@@ -1,7 +1,7 @@
 database/sqlite-3
 developer/versioning/subversion
-library/apr-13
-library/apr-util-13
+library/apr-15
+library/apr-util-15
 library/expat
 library/neon
 library/zlib