aboutsummaryrefslogtreecommitdiffstats
path: root/devel
diff options
context:
space:
mode:
authorlev <lev@FreeBSD.org>2013-06-20 01:29:44 +0800
committerlev <lev@FreeBSD.org>2013-06-20 01:29:44 +0800
commit5a34ca938445e0681d3951f8878be076ab4fffc1 (patch)
tree25f1fea0dfae2c70c27de64042b439b87d92c404 /devel
parentc96d385dfe7e8501e074a852143156a99f04a4cc (diff)
downloadfreebsd-ports-gnome-5a34ca938445e0681d3951f8878be076ab4fffc1.tar.gz
freebsd-ports-gnome-5a34ca938445e0681d3951f8878be076ab4fffc1.tar.zst
freebsd-ports-gnome-5a34ca938445e0681d3951f8878be076ab4fffc1.zip
Upgrade subversion to 1.8.0.
Re-enable ruby-subversion, as it supports ruby 1.9
Diffstat (limited to 'devel')
-rw-r--r--devel/ruby-subversion/Makefile9
-rw-r--r--devel/subversion/Makefile39
-rw-r--r--devel/subversion/Makefile.common20
-rw-r--r--devel/subversion/distinfo12
-rw-r--r--devel/subversion/files/extra-patch-enhanced-keyword457
-rw-r--r--devel/subversion/files/patch-configure44
-rw-r--r--devel/subversion/files/patch-configure.ac1533
-rw-r--r--devel/subversion/pkg-plist83
8 files changed, 1628 insertions, 569 deletions
diff --git a/devel/ruby-subversion/Makefile b/devel/ruby-subversion/Makefile
index 9bc71bf43451..8266b07bb309 100644
--- a/devel/ruby-subversion/Makefile
+++ b/devel/ruby-subversion/Makefile
@@ -6,9 +6,6 @@ PKGNAMEPREFIX= ruby-
MAINTAINER= lev@FreeBSD.org
COMMENT= Ruby bindings for version control system
-DEPRECATED= Does not work with Ruby 1.9
-EXPIRATION_DATE= 2013-05-02
-
.if defined(WITH_SUBVERSION_VER) && ${WITH_SUBVERSION_VER} == 16
MASTERDIR= ${.CURDIR}/../../devel/subversion16
.else
@@ -16,7 +13,7 @@ MASTERDIR= ${.CURDIR}/../../devel/subversion
.endif
PKGDIR= ${.CURDIR}
-USE_RUBY= yes
+USE_RUBY= yes
SVN_BUILD_BINDINGS=yes
@@ -30,8 +27,4 @@ do-build:
do-install:
cd ${WRKSRC} ; ${MAKE} install-swig-rb
-.if ${RUBY_VER} == 1.9
-BROKEN= does not work with ruby 1.9
-.endif
-
.include <bsd.port.post.mk>
diff --git a/devel/subversion/Makefile b/devel/subversion/Makefile
index 5cdb9c525645..5ddac63a051c 100644
--- a/devel/subversion/Makefile
+++ b/devel/subversion/Makefile
@@ -4,39 +4,36 @@
MAINTAINER= lev@FreeBSD.org
COMMENT= Version control system
-CONFLICTS_INSTALL= subversion-1.[6|8].[0-9]*
+CONFLICTS_INSTALL= subversion-1.[6|7].[0-9]*
USE_RC_SUBR= svnserve
MAN1= svn.1 svnadmin.1 svnlook.1 svndumpfilter.1 svnrdump.1 \
- svnsync.1 svnversion.1
+ svnsync.1 svnversion.1 svnmucc.1
MAN5= svnserve.conf.5
MAN8= svnserve.8
TXT_DOCS= BUGS CHANGES COMMITTERS INSTALL README
-OPTIONS_DEFINE= P4_STYLE_MARKERS ENHANCED_KEYWORD FREEBSD_TEMPLATE \
+OPTIONS_DEFINE= P4_STYLE_MARKERS FREEBSD_TEMPLATE \
MOD_DAV_SVN MOD_DONTDOTHAT SVNAUTHZ_VALIDATE \
- NEON SERF \
+ SERF \
SASL BDB \
MAINTAINER_DEBUG \
- SVNSERVE_WRAPPER SVNMUCC \
+ SVNSERVE_WRAPPER \
STATIC \
GNOME_KEYRING KDE_KWALLET \
BOOK TEST
-OPTIONS_DEFAULT=P4_STYLE_MARKERS ENHANCED_KEYWORD FREEBSD_TEMPLATE NEON
+OPTIONS_DEFAULT=P4_STYLE_MARKERS FREEBSD_TEMPLATE SERF
P4_STYLE_MARKERS_DESC= Perforce-style conflict markers
-ENHANCED_KEYWORD_DESC= Enhanced svn:keyword support
FREEBSD_TEMPLATE_DESC= FreeBSD Project log template
MOD_DAV_SVN_DESC= mod_dav_svn module for Apache 2.X
MOD_DONTDOTHAT_DESC= mod_dontdothat for Apache 2.X
-NEON_DESC= WebDAV/Delta-V repo access module (neon)
SERF_DESC= WebDAV/Delta-V repo access module (serf)
MAINTAINER_DEBUG_DESC= Build debug version
SVNSERVE_WRAPPER_DESC= Enable svnserve wrapper
-SVNMUCC_DESC= Install Multiple URL Command Client
SVNAUTHZ_VALIDATE_DESC= install svnauthz-validate
STATIC_DESC= Build static version (no shared libs)
GNOME_KEYRING_DESC= Build with GNOME Keyring auth support
@@ -54,7 +51,7 @@ SVNFSTYPE?= fsfs
SUB_FILES= pkg-install \
pkg-deinstall
-BOOK_VERSION= 4304
+BOOK_VERSION= 4515
.if make(repository)
WITH_REPOSITORY_CREATION= yes
@@ -68,9 +65,6 @@ MKREPOS_TARGET= _mkrepos
.if ${PORT_OPTIONS:MP4_STYLE_MARKERS}
EXTRA_PATCHES+= ${PATCHDIR}/extra-patch-3way-conflict-markers
.endif
-.if ${PORT_OPTIONS:MENHANCED_KEYWORD}
-EXTRA_PATCHES+= ${PATCHDIR}/extra-patch-enhanced-keyword
-.endif
.if ${PORT_OPTIONS:MFREEBSD_TEMPLATE}
EXTRA_PATCHES+= ${PATCHDIR}/extra-patch-fbsd-template
.endif
@@ -88,12 +82,6 @@ PLIST_SUB+= SVNSERVE_WRAPPER="@comment "
SUB_LIST+= SVNSERVE_BIN_EXT=""
.endif
-.if ${PORT_OPTIONS:MSVNMUCC}
-PLIST_SUB+= SVNMUCC=""
-.else
-PLIST_SUB+= SVNMUCC="@comment "
-.endif
-
.if ${PORT_OPTIONS:MDOCS} && ${PORT_OPTIONS:MBOOK}
BOOK_HTML= svn-book-html-r${BOOK_VERSION}.tar.bz2
BOOK_PDF= svn-book-r${BOOK_VERSION}.pdf
@@ -133,12 +121,6 @@ LIB_DEPENDS=
pre-everything::
@${ECHO_MSG} ""
-.if ${PORT_OPTIONS:MNEON}
- @${ECHO_MSG} "WebDAV/Delta-V repository access module enabled."
-.else
- @${ECHO_MSG} "WebDAV/Delta-V repository access module disabled."
-.endif
- @${ECHO_MSG} ""
.if ${PORT_OPTIONS:MBDB}
@${ECHO_MSG} "Berkeley DB (4 or 5) repository backend enabled."
.else
@@ -293,13 +275,6 @@ post-install: ${MKREPOS_TARGET}
.if ${PORT_OPTIONS:MSVNSERVE_WRAPPER}
@${INSTALL_SCRIPT} ${FILESDIR}/svnserve.wrapper ${PREFIX}/bin/svnserve
.endif
-.if ${PORT_OPTIONS:MSVNMUCC}
-. if ${PORT_OPTIONS:MSTATIC}
- @${INSTALL} ${WRKSRC}/tools/client-side/svnmucc/svnmucc ${PREFIX}/bin
-. else
- @${INSTALL} ${WRKSRC}/tools/client-side/svnmucc/.libs/svnmucc ${PREFIX}/bin
-. endif
-.endif
repository: _mkrepos
diff --git a/devel/subversion/Makefile.common b/devel/subversion/Makefile.common
index fab2b55e23c5..a567db39302e 100644
--- a/devel/subversion/Makefile.common
+++ b/devel/subversion/Makefile.common
@@ -2,13 +2,13 @@
# $FreeBSD$
PORTNAME= subversion
-PORTVERSION= 1.7.10
+PORTVERSION= 1.8.0
PORTREVISION?= 0
CATEGORIES+= devel
MASTER_SITES= ${MASTER_SITE_APACHE:S/$/:main/} \
${MASTER_SITE_LOCAL:S/$/:book/}
DISTFILES= ${DISTNAME}${EXTRACT_SUFX}:main
-DIST_SUBDIR= subversion17
+DIST_SUBDIR= subversion18
MASTER_SITE_SUBDIR= subversion/:main \
lev/:book
@@ -19,18 +19,17 @@ USE_KDE4= # Used below if KWallet support is enabled
LICENSE= AL2
-CONFLICTS_INSTALL+= ${PKGNAMEPREFIX}${PORTNAME}${PKGNAMESUFFIX}-1.[6|8].[0-9]*
+CONFLICTS_INSTALL+= ${PKGNAMEPREFIX}${PORTNAME}${PKGNAMESUFFIX}-1.[6|7].[0-9]*
LIB_DEPENDS+= sqlite3.8:${PORTSDIR}/databases/sqlite3 \
expat:${PORTSDIR}/textproc/expat2
-CONFIGURE_ARGS+= --with-ssl \
- --without-swig \
+CONFIGURE_ARGS+= --without-swig \
--with-sqlite=${LOCALBASE} \
--with-expat=/usr/local/include:/usr/local/lib:expat
.if defined(SVN_BUILD_BINDINGS)
-CONFLICTS_BUILD+= ${PORTNAME}-1.[6|8].[0-9]*
+CONFLICTS_BUILD+= ${PORTNAME}-1.[6|7].[0-9]*
LIB_DEPENDS+= svn_client-1.0:${PORTSDIR}/devel/subversion
OPTIONSFILE= ${PORT_DBDIR}/${PORTNAME}/options
OPTIONS= # Dirty hack: if OPTIONS is not defined, OPTIONSFILE will not be included
@@ -38,15 +37,6 @@ OPTIONS= # Dirty hack: if OPTIONS is not defined, OPTIONSFILE will not be inclu
.include <bsd.port.options.mk>
-# Default is "on"
-.if ${PORT_OPTIONS:MNEON}
-LIB_DEPENDS+= neon.27:${PORTSDIR}/www/neon29
-PLIST_SUB+= NEON=""
-.else
-CONFIGURE_ARGS+=--without-neon
-PLIST_SUB+= NEON="@comment "
-.endif
-
.if ${PORT_OPTIONS:MSASL}
LIB_DEPENDS+= sasl2:${PORTSDIR}/security/cyrus-sasl2
CONFIGURE_ARGS+=--with-sasl=${LOCALBASE}
diff --git a/devel/subversion/distinfo b/devel/subversion/distinfo
index 4a4f7e6747a7..a0e51c4024d3 100644
--- a/devel/subversion/distinfo
+++ b/devel/subversion/distinfo
@@ -1,6 +1,6 @@
-SHA256 (subversion17/subversion-1.7.10.tar.bz2) = c1df222bec83d014d17785e2ceba6bc80962f64b280967de0285836d8d77a8e7
-SIZE (subversion17/subversion-1.7.10.tar.bz2) = 5952121
-SHA256 (subversion17/svn-book-html-r4304.tar.bz2) = a63d958b1ae70daf2ac93a53ece70a0ba0f8f7de7af3f74a665fe44b8f50ca14
-SIZE (subversion17/svn-book-html-r4304.tar.bz2) = 467806
-SHA256 (subversion17/svn-book-r4304.pdf) = 1b2cada79db8268fd6cd55fac4e5ee04c1e2977bbc587fa1098bd3613b9689b2
-SIZE (subversion17/svn-book-r4304.pdf) = 1921443
+SHA256 (subversion18/subversion-1.8.0.tar.bz2) = a470803293a8aced445cff0f7b24b95ad276600af55d4b24b1e196fd2de87f10
+SIZE (subversion18/subversion-1.8.0.tar.bz2) = 6711904
+SHA256 (subversion18/svn-book-html-r4515.tar.bz2) = 666cef147abc9b917a6bb6527da4f4869221d793126289c715f002bfb2baa508
+SIZE (subversion18/svn-book-html-r4515.tar.bz2) = 473182
+SHA256 (subversion18/svn-book-r4515.pdf) = 962d524ae2c861ec48a45723c484f4f5e1826ee2f9ccfe58b07b96af67b0bf5e
+SIZE (subversion18/svn-book-r4515.pdf) = 1943481
diff --git a/devel/subversion/files/extra-patch-enhanced-keyword b/devel/subversion/files/extra-patch-enhanced-keyword
deleted file mode 100644
index 7f9c35654efe..000000000000
--- a/devel/subversion/files/extra-patch-enhanced-keyword
+++ /dev/null
@@ -1,457 +0,0 @@
-diff -ruN subversion/include/private/svn_subst_private.h subversion/include/private/svn_subst_private.h
---- subversion/include/private/svn_subst_private.h 1970-01-01 03:00:00.000000000 +0300
-+++ subversion/include/private/svn_subst_private.h 2012-04-02 18:49:12.000000000 +0400
-@@ -0,0 +1,68 @@
-+/**
-+ * @copyright
-+ * ====================================================================
-+ * Licensed to the Apache Software Foundation (ASF) under one
-+ * or more contributor license agreements. See the NOTICE file
-+ * distributed with this work for additional information
-+ * regarding copyright ownership. The ASF licenses this file
-+ * to you under the Apache License, Version 2.0 (the
-+ * "License"); you may not use this file except in compliance
-+ * with the License. You may obtain a copy of the License at
-+ *
-+ * http://www.apache.org/licenses/LICENSE-2.0
-+ *
-+ * Unless required by applicable law or agreed to in writing,
-+ * software distributed under the License is distributed on an
-+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-+ * KIND, either express or implied. See the License for the
-+ * specific language governing permissions and limitations
-+ * under the License.
-+ * ====================================================================
-+ * @endcopyright
-+ *
-+ * @file svn_subst_private.h
-+ * @brief Non-public subst utility functions.
-+ */
-+
-+
-+#ifndef SVN_SUBST_PRIVATE_H
-+#define SVN_SUBST_PRIVATE_H
-+
-+#include "svn_subst.h" /* for svn_boolean_t, svn_error_t */
-+
-+#ifdef __cplusplus
-+extern "C" {
-+#endif /* __cplusplus */
-+
-+/**
-+ * Set @a *kw to a new keywords hash filled with the appropriate contents
-+ * given a @a keywords_string (the contents of the svn:keywords
-+ * property for the file in question), the revision @a rev, the @a url,
-+ * the url of the root of the @a repos, the @a date the file was committed
-+ * on, and the @a author of the last commit. Any of these can be @c NULL
-+ * to indicate that the information is not present, or @c 0 for @a date.
-+ *
-+ * Hash keys are of type <tt>const char *</tt>.
-+ * Hash values are of type <tt>svn_string_t *</tt>.
-+ *
-+ * All memory is allocated out of @a pool.
-+ *
-+ * @since New in 1.6
-+ */
-+svn_error_t *
-+svn_subst_build_keywords3(apr_hash_t **kw,
-+ const char *keywords_string,
-+ const char *rev,
-+ const char *url,
-+ const char *repos,
-+ apr_time_t date,
-+ const char *author,
-+ apr_pool_t *pool);
-+
-+
-+
-+#ifdef __cplusplus
-+}
-+#endif /* __cplusplus */
-+
-+#endif /* SVN_SUBST_PRIVATE_H */
-diff -ruN subversion/libsvn_client/cat.c subversion/libsvn_client/cat.c
---- subversion/libsvn_client/cat.c 2011-08-18 18:05:35.000000000 +0400
-+++ subversion/libsvn_client/cat.c 2012-04-02 18:46:56.000000000 +0400
-@@ -40,6 +40,7 @@
-
- #include "svn_private_config.h"
- #include "private/svn_wc_private.h"
-+#include "private/svn_subst_private.h"
-
-
- /*** Code. ***/
-@@ -137,12 +138,15 @@
- const char *rev_str;
- const char *author;
- const char *url;
-+ const char *repos;
-
- SVN_ERR(svn_wc__node_get_changed_info(&changed_rev, NULL, &author, wc_ctx,
- local_abspath, scratch_pool,
- scratch_pool));
- SVN_ERR(svn_wc__node_get_url(&url, wc_ctx, local_abspath, scratch_pool,
- scratch_pool));
-+ SVN_ERR(svn_wc__node_get_repos_info(&repos, NULL, wc_ctx, local_abspath,
-+ scratch_pool, scratch_pool));
-
- if (local_mod)
- {
-@@ -158,8 +162,8 @@
- rev_str = apr_psprintf(scratch_pool, "%ld", changed_rev);
- }
-
-- SVN_ERR(svn_subst_build_keywords2(&kw, keywords->data, rev_str, url, tm,
-- author, scratch_pool));
-+ SVN_ERR(svn_subst_build_keywords3(&kw, keywords->data, rev_str, url,
-+ repos, tm, author, scratch_pool));
- }
-
- /* Wrap the output stream if translation is needed. */
-@@ -188,6 +192,7 @@
- svn_string_t *keywords;
- apr_hash_t *props;
- const char *url;
-+ const char *repos_root_url;
- svn_stream_t *output = out;
- svn_error_t *err;
-
-@@ -231,6 +236,8 @@
- &url, path_or_url, NULL,
- peg_revision,
- revision, ctx, pool));
-+ /* Find the repos root URL */
-+ SVN_ERR(svn_ra_get_repos_root2(ra_session, &repos_root_url, pool));
-
- /* Grab some properties we need to know in order to figure out if anything
- special needs to be done with this file. */
-@@ -281,10 +288,11 @@
- if (cmt_date)
- SVN_ERR(svn_time_from_cstring(&when, cmt_date->data, pool));
-
-- SVN_ERR(svn_subst_build_keywords2
-+ SVN_ERR(svn_subst_build_keywords3
- (&kw, keywords->data,
- cmt_rev->data,
- url,
-+ repos_root_url,
- when,
- cmt_author ? cmt_author->data : NULL,
- pool));
-diff -ruN subversion/libsvn_client/commit.c subversion/libsvn_client/commit.c
---- subversion/libsvn_client/commit.c 2011-11-28 21:04:12.000000000 +0400
-+++ subversion/libsvn_client/commit.c 2012-04-02 18:46:52.000000000 +0400
-@@ -50,6 +50,7 @@
- #include "client.h"
- #include "private/svn_wc_private.h"
- #include "private/svn_magic.h"
-+#include "private/svn_subst_private.h"
-
- #include "svn_private_config.h"
-
-@@ -126,9 +127,9 @@
- }
-
- if (keywords_val)
-- SVN_ERR(svn_subst_build_keywords2(&keywords, keywords_val->data,
-+ SVN_ERR(svn_subst_build_keywords3(&keywords, keywords_val->data,
- APR_STRINGIFY(SVN_INVALID_REVNUM),
-- "", 0, "", pool));
-+ "", "", 0, "", pool));
- else
- keywords = NULL;
-
-diff -ruN subversion/libsvn_client/export.c subversion/libsvn_client/export.c
---- subversion/libsvn_client/export.c 2012-02-10 08:00:30.000000000 +0400
-+++ subversion/libsvn_client/export.c 2012-04-02 18:46:47.000000000 +0400
-@@ -43,6 +43,7 @@
-
- #include "svn_private_config.h"
- #include "private/svn_wc_private.h"
-+#include "private/svn_subst_private.h"
-
-
- /*** Code. ***/
-@@ -274,6 +275,7 @@
- svn_revnum_t changed_rev;
- const char *suffix;
- const char *url;
-+ const char *repos;
- const char *author;
-
- SVN_ERR(svn_wc__node_get_changed_info(&changed_rev, NULL, &author,
-@@ -296,11 +298,13 @@
-
- SVN_ERR(svn_wc__node_get_url(&url, wc_ctx, from_abspath,
- scratch_pool, scratch_pool));
-+ SVN_ERR(svn_wc__node_get_repos_info(&repos, NULL, wc_ctx, from_abspath,
-+ scratch_pool, scratch_pool));
-
-- SVN_ERR(svn_subst_build_keywords2
-+ SVN_ERR(svn_subst_build_keywords3
- (&kw, keywords->data,
- apr_psprintf(scratch_pool, "%ld%s", changed_rev, suffix),
-- url, tm, author, scratch_pool));
-+ url, repos, tm, author, scratch_pool));
- }
-
- /* For atomicity, we translate to a tmp file and then rename the tmp file
-@@ -702,6 +706,7 @@
- /* Any keyword vals to be substituted */
- const char *revision;
- const char *url;
-+ const char *repos;
- const char *author;
- apr_time_t date;
-
-@@ -823,6 +828,7 @@
- fb->edit_baton = eb;
- fb->path = full_path;
- fb->url = full_url;
-+ fb->repos = eb->root_url;
- fb->pool = pool;
-
- *baton = fb;
-@@ -987,8 +993,8 @@
- }
-
- if (fb->keywords_val)
-- SVN_ERR(svn_subst_build_keywords2(&final_kw, fb->keywords_val->data,
-- fb->revision, fb->url, fb->date,
-+ SVN_ERR(svn_subst_build_keywords3(&final_kw, fb->keywords_val->data,
-+ fb->revision, fb->url, fb->repos, fb->date,
- fb->author, pool));
-
- SVN_ERR(svn_subst_copy_and_translate4(fb->tmppath, fb->path,
-diff -ruN subversion/libsvn_subr/subst.c subversion/libsvn_subr/subst.c
---- subversion/libsvn_subr/subst.c 2011-07-29 21:28:11.000000000 +0400
-+++ subversion/libsvn_subr/subst.c 2012-04-02 18:47:06.000000000 +0400
-@@ -49,6 +49,7 @@
- #include "svn_private_config.h"
-
- #include "private/svn_string_private.h"
-+#include "private/svn_subst_private.h"
-
- /**
- * The textual elements of a detranslated special file. One of these
-@@ -135,8 +136,11 @@
- * %b basename of the URL of this file
- * %d short format of date of this revision
- * %D long format of date of this revision
-+ * %P path relative to root of repos
- * %r number of this revision
-+ * %R root url of repository
- * %u URL of this file
-+ * %_ a space
- * %% a literal %
- *
- * All memory is allocated out of @a pool.
-@@ -145,12 +149,14 @@
- keyword_printf(const char *fmt,
- const char *rev,
- const char *url,
-+ const char *repos,
- apr_time_t date,
- const char *author,
- apr_pool_t *pool)
- {
- svn_stringbuf_t *value = svn_stringbuf_ncreate("", 0, pool);
- const char *cur;
-+ const char *relative;
- size_t n;
-
- for (;;)
-@@ -203,6 +209,23 @@
- svn_stringbuf_appendcstr(value,
- svn_time_to_human_cstring(date, pool));
- break;
-+ case 'P': /* relative path of this file */
-+ relative = url;
-+ if (relative && repos)
-+ {
-+ int len = strlen(repos);
-+
-+ if (strncmp(repos, relative, len) == 0
-+ && relative[len] == '/')
-+ relative += len + 1;
-+ }
-+ if (relative)
-+ svn_stringbuf_appendcstr(value, relative);
-+ break;
-+ case 'R': /* root of repos */
-+ if (repos)
-+ svn_stringbuf_appendcstr(value, repos);
-+ break;
- case 'r': /* number of this revision */
- if (rev)
- svn_stringbuf_appendcstr(value, rev);
-@@ -211,6 +234,9 @@
- if (url)
- svn_stringbuf_appendcstr(value, url);
- break;
-+ case '_': /* '%_' => a space */
-+ svn_stringbuf_appendbytes(value, " ", 1);
-+ break;
- case '%': /* '%%' => a literal % */
- svn_stringbuf_appendbyte(value, *cur);
- break;
-@@ -246,8 +272,8 @@
- apr_hash_t *kwhash;
- const svn_string_t *val;
-
-- SVN_ERR(svn_subst_build_keywords2(&kwhash, keywords_val, rev,
-- url, date, author, pool));
-+ SVN_ERR(svn_subst_build_keywords3(&kwhash, keywords_val, rev,
-+ url, "", date, author, pool));
-
- /* The behaviour of pre-1.3 svn_subst_build_keywords, which we are
- * replicating here, is to write to a slot in the svn_subst_keywords_t
-@@ -286,6 +312,21 @@
- const char *author,
- apr_pool_t *pool)
- {
-+ SVN_ERR(svn_subst_build_keywords3(kw, keywords_val, rev,
-+ url, "", date, author, pool));
-+ return SVN_NO_ERROR;
-+}
-+
-+svn_error_t *
-+svn_subst_build_keywords3(apr_hash_t **kw,
-+ const char *keywords_val,
-+ const char *rev,
-+ const char *url,
-+ const char *repos,
-+ apr_time_t date,
-+ const char *author,
-+ apr_pool_t *pool)
-+{
- apr_array_header_t *keyword_tokens;
- int i;
- *kw = apr_hash_make(pool);
-@@ -296,6 +337,24 @@
- for (i = 0; i < keyword_tokens->nelts; ++i)
- {
- const char *keyword = APR_ARRAY_IDX(keyword_tokens, i, const char *);
-+ apr_array_header_t *keyword_tokens2;
-+
-+ keyword_tokens2 = svn_cstring_split(keyword, "=", TRUE /* chop */, pool);
-+ if (keyword_tokens2->nelts == 2)
-+ {
-+ svn_string_t *custom_val;
-+ const char *custom_expand;
-+
-+ keyword = APR_ARRAY_IDX(keyword_tokens2, 0, const char*);
-+ custom_expand = APR_ARRAY_IDX(keyword_tokens2, 1, const char*);
-+ if (! strcmp(custom_expand, "%H"))
-+ custom_expand = "%P %r %d %a";
-+ else if (! strcmp(custom_expand, "%I"))
-+ custom_expand = "%b %r %d %a";
-+ custom_val = keyword_printf(custom_expand, rev, url, repos, date, author, pool);
-+ apr_hash_set(*kw, keyword, APR_HASH_KEY_STRING, custom_val);
-+ return SVN_NO_ERROR;
-+ }
-
- if ((! strcmp(keyword, SVN_KEYWORD_REVISION_LONG))
- || (! strcmp(keyword, SVN_KEYWORD_REVISION_MEDIUM))
-@@ -303,7 +362,7 @@
- {
- svn_string_t *revision_val;
-
-- revision_val = keyword_printf("%r", rev, url, date, author, pool);
-+ revision_val = keyword_printf("%r", rev, url, repos, date, author, pool);
- apr_hash_set(*kw, SVN_KEYWORD_REVISION_LONG,
- APR_HASH_KEY_STRING, revision_val);
- apr_hash_set(*kw, SVN_KEYWORD_REVISION_MEDIUM,
-@@ -316,7 +375,7 @@
- {
- svn_string_t *date_val;
-
-- date_val = keyword_printf("%D", rev, url, date, author, pool);
-+ date_val = keyword_printf("%D", rev, url, repos, date, author, pool);
- apr_hash_set(*kw, SVN_KEYWORD_DATE_LONG,
- APR_HASH_KEY_STRING, date_val);
- apr_hash_set(*kw, SVN_KEYWORD_DATE_SHORT,
-@@ -327,7 +386,7 @@
- {
- svn_string_t *author_val;
-
-- author_val = keyword_printf("%a", rev, url, date, author, pool);
-+ author_val = keyword_printf("%a", rev, url, repos, date, author, pool);
- apr_hash_set(*kw, SVN_KEYWORD_AUTHOR_LONG,
- APR_HASH_KEY_STRING, author_val);
- apr_hash_set(*kw, SVN_KEYWORD_AUTHOR_SHORT,
-@@ -338,7 +397,7 @@
- {
- svn_string_t *url_val;
-
-- url_val = keyword_printf("%u", rev, url, date, author, pool);
-+ url_val = keyword_printf("%u", rev, url, repos, date, author, pool);
- apr_hash_set(*kw, SVN_KEYWORD_URL_LONG,
- APR_HASH_KEY_STRING, url_val);
- apr_hash_set(*kw, SVN_KEYWORD_URL_SHORT,
-@@ -348,7 +407,7 @@
- {
- svn_string_t *id_val;
-
-- id_val = keyword_printf("%b %r %d %a", rev, url, date, author,
-+ id_val = keyword_printf("%b %r %d %a", rev, url, repos, date, author,
- pool);
- apr_hash_set(*kw, SVN_KEYWORD_ID,
- APR_HASH_KEY_STRING, id_val);
-@@ -357,7 +416,7 @@
- {
- svn_string_t *header_val;
-
-- header_val = keyword_printf("%u %r %d %a", rev, url, date, author,
-+ header_val = keyword_printf("%u %r %d %a", rev, url, repos, date, author,
- pool);
- apr_hash_set(*kw, SVN_KEYWORD_HEADER,
- APR_HASH_KEY_STRING, header_val);
-diff -ruN subversion/libsvn_wc/translate.c subversion/libsvn_wc/translate.c
---- subversion/libsvn_wc/translate.c 2011-07-07 15:29:08.000000000 +0400
-+++ subversion/libsvn_wc/translate.c 2012-04-02 18:47:00.000000000 +0400
-@@ -46,6 +46,7 @@
-
- #include "svn_private_config.h"
- #include "private/svn_wc_private.h"
-+#include "private/svn_subst_private.h"
-
-
-
-@@ -313,10 +314,10 @@
- apr_time_t changed_date;
- const char *changed_author;
- const char *url;
-+ const char *repos_root_url;
-
- if (! for_normalization)
- {
-- const char *repos_root_url;
- const char *repos_relpath;
-
- SVN_ERR(svn_wc__db_read_info(NULL, NULL, NULL, &repos_relpath,
-@@ -341,13 +342,23 @@
- changed_rev = SVN_INVALID_REVNUM;
- changed_date = 0;
- changed_author = "";
-+
-+ SVN_ERR(svn_wc__db_read_info(NULL, NULL, NULL, NULL,
-+ &repos_root_url, NULL, NULL,
-+ NULL, NULL, NULL,
-+ NULL, NULL, NULL, NULL, NULL, NULL,
-+ NULL, NULL, NULL, NULL, NULL, NULL, NULL,
-+ NULL, NULL, NULL, NULL,
-+ db, local_abspath,
-+ scratch_pool, scratch_pool));
- }
-
-- SVN_ERR(svn_subst_build_keywords2(keywords,
-+ SVN_ERR(svn_subst_build_keywords3(keywords,
- keyword_list,
- apr_psprintf(scratch_pool, "%ld",
- changed_rev),
- url,
-+ repos_root_url,
- changed_date,
- changed_author,
- result_pool));
diff --git a/devel/subversion/files/patch-configure b/devel/subversion/files/patch-configure
index 78b85dafcece..333682690234 100644
--- a/devel/subversion/files/patch-configure
+++ b/devel/subversion/files/patch-configure
@@ -1,6 +1,6 @@
---- configure.orig 2011-11-29 20:16:31.000000000 +0400
-+++ configure 2011-12-05 23:43:08.000000000 +0400
-@@ -4326,7 +4326,7 @@
+--- configure.orig 2013-06-13 13:08:08.000000000 +0400
++++ configure 2013-06-19 19:54:23.000000000 +0400
+@@ -4496,7 +4496,7 @@
# ==== Libraries, for which we may have source to build ======================
@@ -8,37 +8,27 @@
+APR_VER_REGEXES="0\.9\.[7-9] 0\.9\.[12][0-9] 1\. 2\."
- do_subdir_config="yes"
-@@ -19106,11 +19106,11 @@
- SVN_KWALLET_INCLUDES="$DBUS_CPPFLAGS $qt_include_dirs -I$kde_dir/include"
- qt_libs_other_options="`$PKG_CONFIG --libs-only-other QtCore QtDBus QtGui`"
- SVN_KWALLET_LIBS="$DBUS_LIBS -lQtCore -lQtDBus -lQtGui -lkdecore -lkdeui $qt_libs_other_options"
-- CXXFLAGS="$CXXFLAGS $SVN_KWALLET_INCLUDES"
-+ CXXFLAGS="$SVN_KWALLET_INCLUDES $CXXFLAGS"
- LIBS="$LIBS $SVN_KWALLET_LIBS"
- qt_lib_dirs="`$PKG_CONFIG --libs-only-L QtCore QtDBus QtGui`"
- kde_lib_suffix="`$KDE4_CONFIG --libsuffix`"
-- LDFLAGS="$old_LDFLAGS `
-+ LDFLAGS="`
+ APR_WANTED_REGEXES="$APR_VER_REGEXES"
+@@ -18971,11 +18971,11 @@
+ SVN_KWALLET_INCLUDES="$DBUS_CPPFLAGS $qt_include_dirs -I$kde_dir/include"
+ qt_libs_other_options="`$PKG_CONFIG --libs-only-other QtCore QtDBus QtGui`"
+ SVN_KWALLET_LIBS="$DBUS_LIBS -lQtCore -lQtDBus -lQtGui -lkdecore -lkdeui $qt_libs_other_options"
+- CXXFLAGS="$CXXFLAGS $SVN_KWALLET_INCLUDES"
++ CXXFLAGS="$SVN_KWALLET_INCLUDES $CXXFLAGS"
+ LIBS="$LIBS $SVN_KWALLET_LIBS"
+ qt_lib_dirs="`$PKG_CONFIG --libs-only-L QtCore QtDBus QtGui`"
+ kde_lib_suffix="`$KDE4_CONFIG --libsuffix`"
+- LDFLAGS="$old_LDFLAGS `
++ LDFLAGS="`
input_flags="$qt_lib_dirs -L$kde_dir/lib$kde_lib_suffix"
output_flags=""
filtered_dirs="/lib /lib64 /usr/lib /usr/lib64"
-@@ -19129,7 +19129,7 @@
+@@ -18994,7 +18994,7 @@
if test -n "$output_flags"; then
printf "%s" "${output_flags# }"
fi
-`"
+` $old_LDFLAGS"
- ac_ext=cpp
+ ac_ext=cpp
ac_cpp='$CXXCPP $CPPFLAGS'
ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-@@ -20762,6 +20762,9 @@
-
- fi
- if test "$RUBY" != "none"; then
-+ if [ -z "$PTHREAD_LIBS" ]; then
-+ PTHREAD_LIBS=-pthread
-+ fi
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking rb_hash_foreach" >&5
- $as_echo_n "checking rb_hash_foreach... " >&6; }
- if "$RUBY" -r mkmf -e 'exit(have_func("rb_hash_foreach") ? 0 : 1)' >/dev/null; then
diff --git a/devel/subversion/files/patch-configure.ac b/devel/subversion/files/patch-configure.ac
index d92a7a9c8940..1ac293452032 100644
--- a/devel/subversion/files/patch-configure.ac
+++ b/devel/subversion/files/patch-configure.ac
@@ -1,11 +1,1524 @@
---- configure.ac.orig 2011-08-17 17:01:30.000000000 +0400
-+++ configure.ac 2011-12-05 23:43:19.000000000 +0400
-@@ -92,7 +92,7 @@
- dnl them. Only .7 and later can guarantee repository
- dnl integrity with FSFS.
-
--APR_VER_REGEXES=["0\.9\.[7-9] 0\.9\.1[0-9] 1\. 2\."]
+--- configure.orig.ac 1970-01-01 03:00:00.000000000 +0300
++++ configure.ac 2013-06-19 19:55:21.000000000 +0400
+@@ -0,0 +1,1521 @@
++dnl Licensed to the Apache Software Foundation (ASF) under one
++dnl or more contributor license agreements. See the NOTICE file
++dnl distributed with this work for additional information
++dnl regarding copyright ownership. The ASF licenses this file
++dnl to you under the Apache License, Version 2.0 (the
++dnl "License"); you may not use this file except in compliance
++dnl with the License. You may obtain a copy of the License at
++dnl
++dnl http://www.apache.org/licenses/LICENSE-2.0
++dnl
++dnl Unless required by applicable law or agreed to in writing,
++dnl software distributed under the License is distributed on an
++dnl "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
++dnl KIND, either express or implied. See the License for the
++dnl specific language governing permissions and limitations
++dnl under the License.
++
++dnl configure.ac: Autoconfiscation for Subversion
++dnl Process this file with autoconf to produce a configure script.
++
++AC_PREREQ(2.59)
++
++dnl Get the version of Subversion, using m4's esyscmd() command to do this
++dnl at m4-time, since AC_INIT() requires it then.
++AC_INIT([subversion],
++ [esyscmd(python build/getversion.py SVN subversion/include/svn_version.h)],
++ [http://subversion.apache.org/])
++
++AC_CONFIG_SRCDIR(subversion/include/svn_types.h)
++AC_CONFIG_AUX_DIR([build])
++
++AC_MSG_NOTICE([Configuring Subversion ]AC_PACKAGE_VERSION)
++
++AC_SUBST([abs_srcdir], ["`cd $srcdir && pwd`"])
++AC_SUBST([abs_builddir], ["`pwd`"])
++if test "$abs_srcdir" = "$abs_builddir"; then
++ canonicalized_srcdir=""
++else
++ canonicalized_srcdir="$srcdir/"
++fi
++AC_SUBST([canonicalized_srcdir])
++
++SWIG_LDFLAGS="$LDFLAGS"
++AC_SUBST([SWIG_LDFLAGS])
++
++# Generate config.nice early (before the arguments are munged)
++SVN_CONFIG_NICE(config.nice)
++
++# ==== Check for programs ====================================================
++
++# Look for a C compiler (before anything can set CFLAGS)
++CMAINTAINERFLAGS="$CUSERFLAGS"
++CUSERFLAGS="$CFLAGS"
++AC_PROG_CC
++SVN_CC_MODE_SETUP
++
++# Look for a C++ compiler (before anything can set CXXFLAGS)
++CXXMAINTAINERFLAGS="$CXXUSERFLAGS"
++CXXUSERFLAGS="$CXXFLAGS"
++AC_PROG_CXX
++SVN_CXX_MODE_SETUP
++
++# Look for a C pre-processor
++AC_PROG_CPP
++
++# Look for a good sed
++# AC_PROG_SED was introduced in Autoconf 2.59b
++m4_ifdef([AC_PROG_SED], [AC_PROG_SED], [SED="${SED:-sed}"])
++
++# Grab target_cpu, so we can use it in the Solaris pkginfo file
++AC_CANONICAL_TARGET
++
++# Look for an extended grep
++AC_PROG_EGREP
++
++AC_PROG_LN_S
++
++AC_PROG_INSTALL
++# If $INSTALL is relative path to our fallback install-sh, then convert
++# to an absolute path, as in some cases (e.g. Solaris VPATH build), libtool
++# may try to use it from a changed working directory.
++if test "$INSTALL" = "build/install-sh -c"; then
++ INSTALL="$abs_srcdir/$INSTALL"
++fi
++
++if test -z "$MKDIR"; then
++ MKDIR="$INSTALL -d"
++fi
++AC_SUBST([MKDIR])
++
++# ==== Libraries, for which we may have source to build ======================
++
++dnl verify apr version and set apr flags
++dnl These regular expressions should not contain "\(" and "\)".
++dnl The specific reason we require APR 0.9.7 is:
++dnl It contains fixes to its file writing routines
++dnl now generating errors instead of silently ignoring
++dnl them. Only .7 and later can guarantee repository
++dnl integrity with FSFS.
++
+APR_VER_REGEXES=["0\.9\.[7-9] 0\.9\.[12][0-9] 1\. 2\."]
-
- SVN_LIB_APR($APR_VER_REGEXES)
-
++
++SVN_LIB_APR($APR_VER_REGEXES)
++
++if test `expr $apr_version : 2` -ne 0; then
++ dnl Bump the library so-version to 2 if using APR-2
++ dnl (Debian uses so-version 1 for APR-1-with-largefile)
++ svn_lib_ver=2
++ dnl APR-2 provides APRUTIL
++ apu_config=$apr_config
++ AC_SUBST(SVN_APRUTIL_INCLUDES)
++ AC_SUBST(SVN_APRUTIL_CONFIG, ["$apu_config"])
++ AC_SUBST(SVN_APRUTIL_LIBS)
++else
++ svn_lib_ver=0
++ APU_VER_REGEXES=["0\.9\.[7-9] 0\.9\.1[0-9] 1\."]
++ SVN_LIB_APRUTIL($APU_VER_REGEXES)
++fi
++SVN_LT_SOVERSION="-version-info $svn_lib_ver"
++AC_SUBST(SVN_LT_SOVERSION)
++AC_DEFINE_UNQUOTED(SVN_SOVERSION, $svn_lib_ver,
++ [Subversion library major verson])
++
++dnl Search for pkg-config
++AC_PATH_PROG(PKG_CONFIG, pkg-config)
++
++dnl Search for serf
++SVN_LIB_SERF(1,2,1)
++
++if test "$svn_lib_serf" = "yes"; then
++ AC_DEFINE([SVN_HAVE_SERF], 1,
++ [Defined if support for Serf is enabled])
++fi
++
++dnl Search for apr_memcache (only affects fs_fs)
++SVN_LIB_APR_MEMCACHE
++
++if test "$svn_lib_apr_memcache" = "yes"; then
++ AC_DEFINE(SVN_HAVE_MEMCACHE, 1,
++ [Defined if apr_memcache (standalone or in apr-util) is present])
++fi
++
++
++dnl Find Apache with a recent-enough magic module number
++SVN_FIND_APACHE(20020903)
++
++dnl Search for SQLite. If you change SQLITE_URL from a .zip to
++dnl something else also update build/ac-macros/sqlite.m4 to reflect
++dnl the correct command to unpack the downloaded file.
++SQLITE_MINIMUM_VER="3.7.12"
++SQLITE_RECOMMENDED_VER="3.7.15.1"
++SQLITE_URL="http://www.sqlite.org/sqlite-amalgamation-$(printf %d%02d%02d%02d $(echo ${SQLITE_RECOMMENDED_VER} | sed -e 's/\./ /g')).zip"
++
++SVN_LIB_SQLITE(${SQLITE_MINIMUM_VER}, ${SQLITE_RECOMMENDED_VER},
++ ${SQLITE_URL})
++
++AC_ARG_ENABLE(sqlite-compatibility-version,
++ AS_HELP_STRING([--enable-sqlite-compatibility-version=X.Y.Z],
++ [Allow binary to run against SQLite as old as ARG]),
++ [sqlite_compat_ver=$enableval],[sqlite_compat_ver=no])
++
++if test -n "$sqlite_compat_ver" && test "$sqlite_compat_ver" != no; then
++ SVN_SQLITE_VERNUM_PARSE([$sqlite_compat_ver],
++ [sqlite_compat_ver_num])
++ CFLAGS="-DSVN_SQLITE_MIN_VERSION='\"$sqlite_compat_ver\"' $CFLAGS"
++ CFLAGS="-DSVN_SQLITE_MIN_VERSION_NUMBER=$sqlite_compat_ver_num $CFLAGS"
++fi
++
++SVN_CHECK_FOR_ATOMIC_BUILTINS
++
++if test "$svn_cv_atomic_builtins" = "yes"; then
++ AC_DEFINE(SVN_HAS_ATOMIC_BUILTINS, 1, [Define if compiler provides atomic builtins])
++fi
++
++dnl Set up a number of directories ---------------------
++
++dnl Create SVN_BINDIR for proper substitution
++if test "${bindir}" = '${exec_prefix}/bin'; then
++ if test "${exec_prefix}" = "NONE"; then
++ if test "${prefix}" = "NONE"; then
++ SVN_BINDIR="${ac_default_prefix}/bin"
++ else
++ SVN_BINDIR="${prefix}/bin"
++ fi
++ else
++ SVN_BINDIR="${exec_prefix}/bin"
++ fi
++else
++ SVN_BINDIR="${bindir}"
++fi
++
++dnl fully evaluate this value. when we substitute it into our tool scripts,
++dnl they will not have things such as ${bindir} available
++SVN_BINDIR="`eval echo ${SVN_BINDIR}`"
++AC_SUBST(SVN_BINDIR)
++
++dnl provide ${bindir} in svn_private_config.h for use in compiled code
++AC_DEFINE_UNQUOTED(SVN_BINDIR, "${SVN_BINDIR}",
++ [Defined to be the path to the installed binaries])
++
++dnl This purposely does *not* allow for multiple parallel installs.
++dnl However, it is compatible with most gettext usages.
++localedir='${datadir}/locale'
++AC_SUBST(localedir)
++
++dnl For SVN_LOCALE_DIR, we have to expand it to something. See SVN_BINDIR.
++if test "${datadir}" = '${prefix}/share' && test "${prefix}" = "NONE"; then
++ exp_localedir='${ac_default_prefix}/share/locale'
++else
++ exp_localedir=$localedir
++fi
++SVN_EXPAND_VAR(svn_localedir, "${exp_localedir}")
++AC_DEFINE_UNQUOTED(SVN_LOCALE_DIR, "${svn_localedir}",
++ [Defined to be the path to the installed locale dirs])
++
++dnl Check for libtool -- we'll definitely need it for all our shared libs!
++AC_MSG_NOTICE([configuring libtool now])
++ifdef([LT_INIT], [LT_INIT], [AC_PROG_LIBTOOL])
++AC_ARG_ENABLE(experimental-libtool,
++ AS_HELP_STRING([--enable-experimental-libtool],[Use APR's libtool]),
++ [experimental_libtool=$enableval],[experimental_libtool=no])
++
++if test "$experimental_libtool" = "yes"; then
++ echo "using APR's libtool"
++ sh_libtool="`$apr_config --apr-libtool`"
++ LIBTOOL="$sh_libtool"
++ SVN_LIBTOOL="$sh_libtool"
++else
++ sh_libtool="$abs_builddir/libtool"
++ SVN_LIBTOOL="\$(SHELL) $sh_libtool"
++fi
++AC_SUBST(SVN_LIBTOOL)
++
++dnl Determine the libtool version
++changequote(, )dnl
++lt_pversion=`$LIBTOOL --version 2>/dev/null|$SED -e 's/([^)]*)//g;s/^[^0-9]*//;s/[- ].*//g;q'`
++lt_version=`echo $lt_pversion|$SED -e 's/\([a-z]*\)$/.\1/'`
++lt_major_version=`echo $lt_version | cut -d'.' -f 1`
++changequote([, ])dnl
++
++dnl set the default parameters
++svn_enable_static=yes
++svn_enable_shared=yes
++
++dnl check for --enable-static option
++AC_ARG_ENABLE(static,
++ AS_HELP_STRING([--enable-static],
++ [Build static libraries]),
++ [svn_enable_static="$enableval"], [svn_enable_static="yes"])
++
++dnl check for --enable-shared option
++AC_ARG_ENABLE(shared,
++ AS_HELP_STRING([--enable-shared],
++ [Build shared libraries]),
++ [svn_enable_shared="$enableval"], [svn_enable_shared="yes"])
++
++if test "$svn_enable_static" = "yes" && test "$svn_enable_shared" = "yes" ; then
++ AC_MSG_NOTICE([building both shared and static libraries])
++elif test "$svn_enable_static" = "yes" ; then
++ AC_MSG_NOTICE([building static libraries only])
++ LT_CFLAGS="-static $LT_CFLAGS"
++ LT_LDFLAGS="-static $LT_LDFLAGS"
++elif test "$svn_enable_shared" = "yes" ; then
++ AC_MSG_NOTICE([building shared libraries only])
++ if test "$lt_major_version" = "1" ; then
++ LT_CFLAGS="-prefer-pic $LT_CFLAGS"
++ elif test "$lt_major_version" = "2" ; then
++ LT_CFLAGS="-shared $LT_CFLAGS"
++ fi
++ LT_LDFLAGS="-shared $LT_LDFLAGS"
++else
++ AC_MSG_ERROR([cannot disable both shared and static libraries])
++fi
++
++dnl Check for --enable-all-static option
++AC_ARG_ENABLE(all-static,
++ AS_HELP_STRING([--enable-all-static],
++ [Build completely static (standalone) binaries.]),
++ [
++ if test "$enableval" = "yes" ; then
++ LT_LDFLAGS="-all-static $LT_LDFLAGS"
++ elif test "$enableval" != "no" ; then
++ AC_MSG_ERROR([--enable-all-static doesn't accept argument])
++ fi
++])
++
++AC_SUBST(LT_CFLAGS)
++AC_SUBST(LT_LDFLAGS)
++
++AC_ARG_ENABLE(local-library-preloading,
++ AS_HELP_STRING([--enable-local-library-preloading],
++ [Enable preloading of locally built libraries in locally
++ built executables. This may be necessary for testing
++ prior to installation on some platforms. It does not
++ work on some platforms (Darwin, OpenBSD, ...).]),
++ [
++ if test "$enableval" != "no"; then
++ if test "$svn_enable_shared" = "yes"; then
++ TRANSFORM_LIBTOOL_SCRIPTS="transform-libtool-scripts"
++ else
++ AC_MSG_ERROR([--enable-local-library-preloading conflicts with --disable-shared])
++ fi
++ else
++ TRANSFORM_LIBTOOL_SCRIPTS=""
++ fi
++ ], [
++ TRANSFORM_LIBTOOL_SCRIPTS=""
++])
++AC_SUBST(TRANSFORM_LIBTOOL_SCRIPTS)
++
++dnl Check if -no-undefined is needed for the platform.
++dnl It should always work but with libtool 1.4.3 on OS X it breaks the build.
++dnl So we only turn it on for platforms where we know we really need it.
++AC_MSG_CHECKING([whether libtool needs -no-undefined])
++case $host in
++ *-*-cygwin*)
++ AC_MSG_RESULT([yes])
++ LT_NO_UNDEFINED="-no-undefined"
++ ;;
++ *)
++ AC_MSG_RESULT([no])
++ LT_NO_UNDEFINED=""
++ ;;
++esac
++AC_SUBST(LT_NO_UNDEFINED)
++
++AC_MSG_CHECKING([whether to avoid circular linkage at all costs])
++case $host in
++ *-*-cygwin*)
++ AC_MSG_RESULT([yes])
++ AC_DEFINE([SVN_AVOID_CIRCULAR_LINKAGE_AT_ALL_COSTS_HACK], 1,
++ [Define if circular linkage is not possible on this platform.])
++ ;;
++ *)
++ AC_MSG_RESULT([no])
++ ;;
++esac
++
++dnl Check for trang.
++trang=yes
++AC_ARG_WITH(trang,
++AS_HELP_STRING([--with-trang=PATH],
++ [Specify the command to run the trang schema converter]),
++[
++ trang="$withval"
++])
++if test "$trang" = "yes"; then
++ AC_PATH_PROG(TRANG, trang, none)
++else
++ TRANG="$trang"
++ AC_SUBST(TRANG)
++fi
++
++dnl Check for doxygen
++doxygen=yes
++AC_ARG_WITH(doxygen,
++AC_HELP_STRING([--with-doxygen=PATH],
++ [Specify the command to run doxygen]),
++[
++ doxygen="$withval"
++])
++if test "$doxygen" = "yes"; then
++ AC_PATH_PROG(DOXYGEN, doxygen, none)
++else
++ DOXYGEN="$doxygen"
++ AC_SUBST(DOXYGEN)
++fi
++
++
++dnl Check for libraries --------------------
++
++dnl Expat -------------------
++
++AC_ARG_WITH(expat,
++ AS_HELP_STRING([--with-expat=INCLUDES:LIB_SEARCH_DIRS:LIBS],
++ [Specify location of Expat]),
++ [svn_lib_expat="$withval"],
++ [svn_lib_expat="::expat"])
++
++# APR-util accepts "builtin" as an argument to this option so if the user
++# passed "builtin" pretend the user didn't specify the --with-expat option
++# at all. Expat will (hopefully) be found in apr-util.
++test "_$svn_lib_expat" = "_builtin" && svn_lib_expat="::expat"
++
++AC_MSG_CHECKING([for Expat])
++if test -n "`echo "$svn_lib_expat" | $EGREP ":.*:"`"; then
++ SVN_XML_INCLUDES=""
++ for i in [`echo "$svn_lib_expat" | $SED -e "s/\([^:]*\):.*/\1/"`]; do
++ SVN_XML_INCLUDES="$SVN_XML_INCLUDES -I$i"
++ done
++ SVN_XML_INCLUDES="${SVN_XML_INCLUDES## }"
++ for l in [`echo "$svn_lib_expat" | $SED -e "s/.*:\([^:]*\):.*/\1/"`]; do
++ LDFLAGS="$LDFLAGS -L$l"
++ done
++ for l in [`echo "$svn_lib_expat" | $SED -e "s/.*:\([^:]*\)/\1/"`]; do
++ SVN_XML_LIBS="$SVN_XML_LIBS -l$l"
++ done
++ SVN_XML_LIBS="${SVN_XML_LIBS## }"
++ old_CPPFLAGS="$CPPFLAGS"
++ old_LIBS="$LIBS"
++ CPPFLAGS="$CPPFLAGS $SVN_XML_INCLUDES"
++ LIBS="$LIBS $SVN_XML_LIBS"
++ AC_LINK_IFELSE([AC_LANG_SOURCE([[
++#include <expat.h>
++int main()
++{XML_ParserCreate(NULL);}]])], svn_lib_expat="yes", svn_lib_expat="no")
++ LIBS="$old_LIBS"
++ if test "$svn_lib_expat" = "yes"; then
++ AC_MSG_RESULT([yes])
++ else
++ SVN_XML_INCLUDES=""
++ SVN_XML_LIBS=""
++ CPPFLAGS="$CPPFLAGS $SVN_APRUTIL_INCLUDES"
++ if test "$enable_all_static" != "yes"; then
++ SVN_APRUTIL_LIBS="$SVN_APRUTIL_LIBS `$apu_config --libs`"
++ fi
++ AC_COMPILE_IFELSE([AC_LANG_SOURCE([[
++#include <expat.h>
++int main()
++{XML_ParserCreate(NULL);}]])], svn_lib_expat="yes", svn_lib_expat="no")
++ if test "$svn_lib_expat" = "yes"; then
++ AC_MSG_RESULT([yes])
++ AC_MSG_WARN([Expat found amongst libraries used by APR-Util, but Subversion libraries might be needlessly linked against additional unused libraries. It can be avoided by specifying exact location of Expat in argument of --with-expat option.])
++ else
++ AC_MSG_RESULT([no])
++ AC_MSG_ERROR([Expat not found])
++ fi
++ fi
++ CPPFLAGS="$old_CPPFLAGS"
++else
++ AC_MSG_RESULT([no])
++ if test "$svn_lib_expat" = "yes"; then
++ AC_MSG_ERROR([--with-expat option requires argument])
++ elif test "$svn_lib_expat" = "no"; then
++ AC_MSG_ERROR([Expat is required])
++ else
++ AC_MSG_ERROR([Invalid syntax of argument of --with-expat option])
++ fi
++fi
++AC_SUBST(SVN_XML_INCLUDES)
++AC_SUBST(SVN_XML_LIBS)
++
++dnl Berkeley DB -------------------
++
++# Berkeley DB on SCO OpenServer needs -lsocket
++AC_CHECK_LIB(socket, socket)
++
++# Build the BDB filesystem library only if we have an appropriate
++# version of Berkeley DB.
++case "$host" in
++powerpc-apple-darwin*)
++ # Berkeley DB 4.0 does not work on OS X.
++ SVN_FS_WANT_DB_MAJOR=4
++ SVN_FS_WANT_DB_MINOR=1
++ SVN_FS_WANT_DB_PATCH=25
++ ;;
++*)
++ SVN_FS_WANT_DB_MAJOR=4
++ SVN_FS_WANT_DB_MINOR=0
++ SVN_FS_WANT_DB_PATCH=14
++ ;;
++esac
++# Look for libdb4.so first:
++SVN_LIB_BERKELEY_DB($SVN_FS_WANT_DB_MAJOR, $SVN_FS_WANT_DB_MINOR,
++ $SVN_FS_WANT_DB_PATCH, [db4 db])
++
++AC_DEFINE_UNQUOTED(SVN_FS_WANT_DB_MAJOR, $SVN_FS_WANT_DB_MAJOR,
++ [The desired major version for the Berkeley DB])
++AC_DEFINE_UNQUOTED(SVN_FS_WANT_DB_MINOR, $SVN_FS_WANT_DB_MINOR,
++ [The desired minor version for the Berkeley DB])
++AC_DEFINE_UNQUOTED(SVN_FS_WANT_DB_PATCH, $SVN_FS_WANT_DB_PATCH,
++ [The desired patch version for the Berkeley DB])
++
++AC_SUBST(SVN_DB_INCLUDES)
++AC_SUBST(SVN_DB_LIBS)
++
++SVN_LIB_SASL
++
++if test "$svn_lib_sasl" = "yes"; then
++ AC_DEFINE(SVN_HAVE_SASL, 1,
++ [Defined if Cyrus SASL v2 is present on the system])
++fi
++
++dnl Mac OS specific features -------------------
++
++SVN_LIB_MACHO_ITERATE
++SVN_LIB_MACOS_PLIST
++SVN_LIB_MACOS_KEYCHAIN
++
++dnl APR_HAS_DSO -------------------
++
++AC_MSG_CHECKING([whether APR has support for DSOs])
++old_CPPFLAGS="$CPPFLAGS"
++CPPFLAGS="$CPPFLAGS $SVN_APR_INCLUDES"
++AC_PREPROC_IFELSE([AC_LANG_SOURCE([[
++#include <apr.h>
++#if !APR_HAS_DSO
++#error
++#endif]])],
++ APR_HAS_DSO="yes"
++ AC_MSG_RESULT([yes]),
++ APR_HAS_DSO="no"
++ AC_MSG_RESULT([no]))
++CPPFLAGS="$old_CPPFLAGS"
++
++
++dnl D-Bus (required for support for KWallet) -------------------
++
++if test -n "$PKG_CONFIG"; then
++ AC_MSG_CHECKING([for D-Bus .pc file])
++ if $PKG_CONFIG --exists dbus-1; then
++ AC_MSG_RESULT([yes])
++ old_CPPFLAGS="$CPPFLAGS"
++ old_LIBS="$LIBS"
++ DBUS_CPPFLAGS="`$PKG_CONFIG --cflags dbus-1`"
++ AC_MSG_CHECKING([D-Bus version])
++ DBUS_VERSION="`$PKG_CONFIG --modversion dbus-1`"
++ AC_MSG_RESULT([$DBUS_VERSION])
++ # D-Bus 0.* requires DBUS_API_SUBJECT_TO_CHANGE
++ if test -n ["`echo "$DBUS_VERSION" | $EGREP '^0\.[[:digit:]]+'`"]; then
++ DBUS_CPPFLAGS="$DBUS_CPPFLAGS -DDBUS_API_SUBJECT_TO_CHANGE"
++ fi
++ DBUS_LIBS="`$PKG_CONFIG --libs dbus-1`"
++ CPPFLAGS="$CPPFLAGS $DBUS_CPPFLAGS"
++ LIBS="$LIBS $DBUS_LIBS"
++ AC_MSG_CHECKING([for D-Bus])
++ AC_LINK_IFELSE([AC_LANG_SOURCE([[
++#include <dbus/dbus.h>
++int main()
++{dbus_bus_get(DBUS_BUS_SESSION, NULL);}]])], HAVE_DBUS="yes", HAVE_DBUS="no")
++ if test "$HAVE_DBUS" = "yes"; then
++ AC_MSG_RESULT([yes])
++ else
++ AC_MSG_RESULT([no])
++ fi
++ CPPFLAGS="$old_CPPFLAGS"
++ LIBS="$old_LIBS"
++ else
++ AC_MSG_RESULT([no])
++ fi
++fi
++
++dnl GPG Agent -------------------
++
++AC_ARG_WITH(gpg_agent,
++AS_HELP_STRING([--without-gpg-agent],
++ [Disable support for GPG-Agent]),
++ [], [with_gpg_agent=yes])
++AC_MSG_CHECKING([whether to support GPG-Agent])
++if test "$with_gpg_agent" = "yes"; then
++ AC_MSG_RESULT([yes])
++ AC_DEFINE([SVN_HAVE_GPG_AGENT], [1],
++ [Is GPG Agent support enabled?])
++else
++ AC_MSG_RESULT([no])
++fi
++
++AC_SUBST(SVN_HAVE_GPG_AGENT)
++
++dnl GNOME Keyring -------------------
++
++AC_ARG_WITH(gnome_keyring,
++ AS_HELP_STRING([--with-gnome-keyring],
++ [Enable use of GNOME Keyring for auth credentials (enabled by default if found)]),
++ [with_gnome_keyring="$withval"],
++ [with_gnome_keyring=auto])
++
++found_gnome_keyring=no
++AC_MSG_CHECKING([whether to look for GNOME Keyring])
++if test "$with_gnome_keyring" != "no"; then
++ AC_MSG_RESULT([yes])
++ if test "$svn_enable_shared" = "yes"; then
++ if test "$APR_HAS_DSO" = "yes"; then
++ if test -n "$PKG_CONFIG"; then
++ AC_MSG_CHECKING([for GLib and GNOME Keyring .pc files])
++ if $PKG_CONFIG --exists glib-2.0 gnome-keyring-1; then
++ AC_MSG_RESULT([yes])
++ old_CPPFLAGS="$CPPFLAGS"
++ SVN_GNOME_KEYRING_INCLUDES="`$PKG_CONFIG --cflags glib-2.0 gnome-keyring-1`"
++ CPPFLAGS="$CPPFLAGS $SVN_GNOME_KEYRING_INCLUDES"
++ AC_CHECK_HEADER(gnome-keyring.h, found_gnome_keyring=yes, found_gnome_keyring=no)
++ AC_MSG_CHECKING([for GNOME Keyring])
++ if test "$found_gnome_keyring" = "yes"; then
++ AC_MSG_RESULT([yes])
++ AC_DEFINE([SVN_HAVE_GNOME_KEYRING], [1],
++ [Is GNOME Keyring support enabled?])
++ CPPFLAGS="$old_CPPFLAGS"
++ SVN_GNOME_KEYRING_LIBS="`$PKG_CONFIG --libs glib-2.0 gnome-keyring-1`"
++ else
++ AC_MSG_RESULT([no])
++ if test "$with_gnome_keyring" = "yes"; then
++ AC_MSG_ERROR([cannot find GNOME Keyring])
++ fi
++ fi
++ else
++ AC_MSG_RESULT([no])
++ if test "$with_gnome_keyring" = "yes"; then
++ AC_MSG_ERROR([cannot find GLib and GNOME Keyring .pc files.])
++ else
++ with_gnome_keyring=no
++ fi
++ fi
++ else
++ if test "$with_gnome_keyring" = "yes"; then
++ AC_MSG_ERROR([cannot find pkg-config. GNOME Keyring requires this.])
++ else
++ with_gnome_keyring=no
++ fi
++ fi
++ else
++ if test "$with_gnome_keyring" = "yes"; then
++ AC_MSG_ERROR([APR does not have support for DSOs. GNOME Keyring requires this.])
++ else
++ with_gnome_keyring=no
++ fi
++ fi
++ else
++ if test "$with_gnome_keyring" = "yes"; then
++ AC_MSG_ERROR([--with-gnome-keyring conflicts with --disable-shared])
++ else
++ with_gnome_keyring=no
++ fi
++ fi
++else
++ AC_MSG_RESULT([no])
++fi
++AC_SUBST(SVN_GNOME_KEYRING_INCLUDES)
++AC_SUBST(SVN_GNOME_KEYRING_LIBS)
++
++
++dnl Ev2 experimental features ----------------------
++dnl Note: The Ev2 implementations will be built unconditionally, but by
++dnl providing this flag, users can choose to use the currently-shimmed Ev2
++dnl editor implementations for various operations. This will probably
++dnl negatively impact performance, but is useful for testing.
++AC_ARG_ENABLE(ev2-impl,
++ AS_HELP_STRING([--enable-ev2-impl],
++ [Use Ev2 implementations, where available [EXPERIMENTAL]]),
++ [enable_ev2_impl=$enableval],[enable_ev2_impl=no])
++if test "$enable_ev2_impl" = "yes"; then
++ AC_DEFINE(ENABLE_EV2_IMPL, 1,
++ [Define to 1 if Ev2 implementations should be used.])
++fi
++
++
++dnl I18n -------------------
++
++AC_ARG_ENABLE(nls,
++ AS_HELP_STRING([--disable-nls],[Disable gettext functionality]),
++ [enable_nls=$enableval],[enable_nls=yes])
++
++USE_NLS="no"
++if test "$enable_nls" = "yes"; then
++ dnl First, check to see if there is a working msgfmt.
++ AC_PATH_PROG(MSGFMT, msgfmt, none)
++ AC_PATH_PROG(MSGMERGE, msgmerge, none)
++ AC_PATH_PROG(XGETTEXT, xgettext, none)
++ if test "$MSGFMT" != "none"; then
++ AC_SEARCH_LIBS(bindtextdomain, [intl], [],
++ [
++ enable_nls="no"
++ ])
++ if test "$enable_nls" = "no"; then
++ # Destroy the cached result so we can test again
++ unset ac_cv_search_bindtextdomain
++ # On some systems, libintl needs libiconv to link properly,
++ # so try again with -liconv.
++ AC_SEARCH_LIBS(bindtextdomain, [intl],
++ [
++ enable_nls="yes"
++ # This is here so that -liconv ends up in LIBS
++ # if it worked with -liconv.
++ AC_CHECK_LIB(iconv, libiconv_open)
++ ],
++ [
++ AC_MSG_WARN([bindtextdomain() not found. Disabling NLS.])
++ enable_nls="no"
++ ], -liconv)
++ fi
++ if test "$enable_nls" = "yes"; then
++ AC_DEFINE(ENABLE_NLS, 1,
++ [Define to 1 if translation of program messages to the user's
++ native language is requested.])
++ USE_NLS="yes"
++ fi
++ fi
++fi
++
++AH_BOTTOM([
++/* Indicate to translators that string X should be translated. Do not look
++ up the translation at run time; just expand to X. This macro is suitable
++ for use where a constant string is required at compile time. */
++#define N_(x) x
++/* Indicate to translators that we have decided the string X should not be
++ translated. Expand to X. */
++#define U_(x) x
++#ifdef ENABLE_NLS
++#include <locale.h>
++#include <libintl.h>
++/* Indicate to translators that string X should be translated. At run time,
++ look up and return the translation of X. */
++#define _(x) dgettext(PACKAGE_NAME, x)
++/* Indicate to translators that strings X1 and X2 are singular and plural
++ forms of the same message, and should be translated. At run time, return
++ an appropriate translation depending on the number N. */
++#define Q_(x1, x2, n) dngettext(PACKAGE_NAME, x1, x2, n)
++#else
++#define _(x) (x)
++#define Q_(x1, x2, n) (((n) == 1) ? x1 : x2)
++#define gettext(x) (x)
++#define dgettext(domain, x) (x)
++#endif
++])
++
++dnl Used to simulate makefile conditionals.
++GETTEXT_CODESET=\#
++NO_GETTEXT_CODESET=\#
++if test $USE_NLS = "yes"; then
++ AC_CHECK_FUNCS(bind_textdomain_codeset,
++ [ GETTEXT_CODESET="" ],
++ [ NO_GETTEXT_CODESET="" ])
++fi
++AC_SUBST(GETTEXT_CODESET)
++AC_SUBST(NO_GETTEXT_CODESET)
++
++# Check if we are using GNU gettext.
++GNU_GETTEXT=no
++MSGFMTFLAGS=''
++if test $USE_NLS = "yes"; then
++ AC_MSG_CHECKING(if we are using GNU gettext)
++ if $MSGFMT --version 2>&1 | $EGREP GNU > /dev/null; then
++ GNU_GETTEXT=yes
++ MSGFMTFLAGS='-c'
++ fi
++ AC_MSG_RESULT($GNU_GETTEXT)
++fi
++AC_SUBST(MSGFMTFLAGS)
++
++dnl libmagic -------------------
++
++libmagic_found=no
++
++AC_ARG_WITH(libmagic,AS_HELP_STRING([--with-libmagic=PREFIX],
++ [libmagic filetype detection library]),
++[
++ if test "$withval" = "yes" ; then
++ AC_CHECK_HEADER(magic.h, [
++ AC_CHECK_LIB(magic, magic_open, [libmagic_found="builtin"])
++ ])
++ libmagic_prefix="the default locations"
++ elif test "$withval" != "no"; then
++ libmagic_prefix=$withval
++ save_cppflags="$CPPFLAGS"
++ CPPFLAGS="$CPPFLAGS -I$libmagic_prefix/include"
++ AC_CHECK_HEADERS(magic.h,[
++ save_ldflags="$LDFLAGS"
++ LDFLAGS="-L$libmagic_prefix/lib"
++ AC_CHECK_LIB(magic, magic_open, [libmagic_found="yes"])
++ LDFLAGS="$save_ldflags"
++ ])
++ CPPFLAGS="$save_cppflags"
++ fi
++ if test "$withval" != "no" && test "$libmagic_found" = "no"; then
++ AC_MSG_ERROR([[--with-libmagic requested, but libmagic not found at $libmagic_prefix]])
++ fi
++],
++[
++ AC_CHECK_HEADER(magic.h, [
++ AC_CHECK_LIB(magic, magic_open, [libmagic_found="builtin"])
++ ])
++])
++
++if test "$libmagic_found" != "no"; then
++ AC_DEFINE([SVN_HAVE_LIBMAGIC], [1], [Defined if libmagic support is enabled])
++ SVN_MAGIC_LIBS="-lmagic"
++fi
++
++if test "$libmagic_found" = "yes"; then
++ SVN_MAGIC_INCLUDES="-I$libmagic_prefix/include"
++ LDFLAGS="$LDFLAGS `SVN_REMOVE_STANDARD_LIB_DIRS(-L$libmagic_prefix/lib)`"
++fi
++
++AC_SUBST(SVN_MAGIC_INCLUDES)
++AC_SUBST(SVN_MAGIC_LIBS)
++
++dnl KWallet -------------------
++SVN_LIB_KWALLET
++
++if test "$svn_lib_kwallet" = "yes"; then
++ AC_DEFINE([SVN_HAVE_KWALLET], 1,
++ [Defined if KWallet support is enabled])
++fi
++
++dnl plaintext passwords -------------------
++AC_ARG_ENABLE(plaintext-password-storage,
++AS_HELP_STRING([--disable-plaintext-password-storage],
++ [Disable on-disk caching of plaintext passwords and passphrases.
++ (Leaving this functionality enabled will not force Subversion
++ to store passwords in plaintext, but does permit users to
++ explicitly allow that behavior via runtime configuration.)]),
++[
++ if test "$enableval" = "no"; then
++ AC_MSG_NOTICE([Disabling plaintext password/passphrase storage])
++ AC_DEFINE(SVN_DISABLE_PLAINTEXT_PASSWORD_STORAGE, 1,
++ [Defined if plaintext password/passphrase storage is disabled])
++ fi
++])
++
++dnl Build and install rules -------------------
++
++INSTALL_STATIC_RULES="install-bin install-docs"
++INSTALL_RULES="install-fsmod-lib install-ramod-lib install-lib install-include install-static"
++INSTALL_RULES="$INSTALL_RULES $INSTALL_APACHE_RULE"
++BUILD_RULES="fsmod-lib ramod-lib lib bin test sub-test $BUILD_APACHE_RULE tools"
++
++if test "$svn_lib_berkeley_db" = "yes"; then
++ BUILD_RULES="$BUILD_RULES bdb-lib bdb-test"
++ INSTALL_RULES="`echo $INSTALL_RULES | $SED 's/install-fsmod-lib/install-fsmod-lib install-bdb-lib/'`"
++ INSTALL_STATIC_RULES="$INSTALL_STATIC_RULES install-bdb-lib"
++ BDB_TEST_DEPS="\$(BDB_TEST_DEPS)"
++ BDB_TEST_PROGRAMS="\$(BDB_TEST_PROGRAMS)"
++fi
++
++if test "$svn_lib_serf" = "yes"; then
++ BUILD_RULES="$BUILD_RULES serf-lib"
++ INSTALL_RULES="`echo $INSTALL_RULES | $SED 's/install-ramod-lib/install-ramod-lib install-serf-lib/'`"
++ INSTALL_STATIC_RULES="$INSTALL_STATIC_RULES install-serf-lib"
++fi
++
++if test "$svn_lib_kwallet" = "yes"; then
++ BUILD_RULES="$BUILD_RULES kwallet-lib"
++ INSTALL_RULES="`echo $INSTALL_RULES | $SED 's/install-lib/install-lib install-kwallet-lib/'`"
++ INSTALL_STATIC_RULES="$INSTALL_STATIC_RULES install-kwallet-lib"
++fi
++
++if test "$found_gnome_keyring" = "yes"; then
++ BUILD_RULES="$BUILD_RULES gnome-keyring-lib"
++ INSTALL_RULES="`echo $INSTALL_RULES | $SED 's/install-lib/install-lib install-gnome-keyring-lib/'`"
++ INSTALL_STATIC_RULES="$INSTALL_STATIC_RULES install-gnome-keyring-lib"
++fi
++
++if test "$USE_NLS" = "yes"; then
++ BUILD_RULES="$BUILD_RULES locale"
++ INSTALL_RULES="$INSTALL_RULES install-locale"
++fi
++
++AC_SUBST(BUILD_RULES)
++AC_SUBST(INSTALL_STATIC_RULES)
++AC_SUBST(INSTALL_RULES)
++AC_SUBST(BDB_TEST_DEPS)
++AC_SUBST(BDB_TEST_PROGRAMS)
++
++dnl Check for header files ----------------
++
++dnl Standard C headers
++AC_HEADER_STDC
++
++dnl Check for typedefs, structures, and compiler characteristics ----------
++
++dnl if compiler doesn't understand `const', then define it empty
++AC_C_CONST
++
++dnl if non-existent, define size_t to be `unsigned'
++AC_TYPE_SIZE_T
++
++
++dnl Check for library functions ----------
++
++AC_FUNC_MEMCMP
++
++dnl svn_error's default warning handler uses vfprintf()
++AC_FUNC_VPRINTF
++
++dnl check for functions needed in special file handling
++AC_CHECK_FUNCS(symlink readlink)
++
++dnl check for uname
++AC_CHECK_HEADERS(sys/utsname.h, [AC_CHECK_FUNCS(uname)], [])
++
++dnl check for termios
++AC_CHECK_HEADER(termios.h,[
++ AC_CHECK_FUNCS(tcgetattr tcsetattr,[
++ AC_DEFINE(HAVE_TERMIOS_H,1,[Defined if we have a usable termios library.])
++ ])
++])
++
++dnl Process some configuration options ----------
++
++AC_ARG_WITH(openssl,
++AS_HELP_STRING([--with-openssl],
++ [This option does NOT affect the Subversion build process in any
++ way. It tells an integrated Serf HTTP client library build
++ process where to locate the OpenSSL library when (and only when)
++ building Serf as an integrated part of the Subversion build
++ process. When linking to a previously installed version of Serf
++ instead, you do not need to use this option.]),
++[])
++
++AC_ARG_ENABLE(debug,
++AS_HELP_STRING([--enable-debug],
++ [Turn on debugging]),
++[
++ if test "$enableval" = "yes" ; then
++ enable_debugging="yes"
++ else
++ enable_debugging="no"
++ fi
++],
++[
++ # Neither --enable-debug nor --disable-debug was passed.
++ enable_debugging="maybe"
++])
++
++AC_ARG_ENABLE(optimize,
++AS_HELP_STRING([--enable-optimize],
++ [Turn on optimizations]),
++[
++ if test "$enableval" = "yes" ; then
++ enable_optimization="yes"
++ else
++ enable_optimization="no"
++ fi
++],
++[
++ # Neither --enable-optimize nor --disable-optimize was passed.
++ enable_optimization="maybe"
++])
++
++dnl Use -Wl,--no-undefined during linking of some libraries
++AC_ARG_ENABLE(disallowing-of-undefined-references,
++ [AS_HELP_STRING([--enable-disallowing-of-undefined-references],
++ [Use -Wl,--no-undefined flag during linking of some libraries to disallow undefined references])])
++if test "$enable_disallowing_of_undefined_references" != "yes" && test "`uname`" != "Linux"; then
++ enable_disallowing_of_undefined_references="no"
++fi
++if test "$enable_disallowing_of_undefined_references" != "no"; then
++ AC_MSG_CHECKING([for -Wl,--no-undefined])
++ old_LDFLAGS="$LDFLAGS"
++ LDFLAGS="$LDFLAGS -Wl,--no-undefined"
++ AC_LINK_IFELSE([AC_LANG_SOURCE([[int main(){;}]])], [svn_wl_no_undefined="yes"], [svn_wl_no_undefined="no"])
++ LDFLAGS="$old_LDFLAGS"
++ if test "$svn_wl_no_undefined" = "yes"; then
++ AC_MSG_RESULT([yes])
++ for library_dir in "$abs_srcdir/subversion/libsvn_"*; do
++ eval "`basename $library_dir`_LDFLAGS=-Wl,--no-undefined"
++ done
++ else
++ AC_MSG_RESULT([no])
++ if test "$enable_disallowing_of_undefined_references" = "yes"; then
++ AC_MSG_ERROR([--enable-disallowing-of-undefined-references explicitly requested, but -Wl,--no-undefined not supported])
++ fi
++ fi
++fi
++AC_SUBST([libsvn_auth_gnome_keyring_LDFLAGS])
++AC_SUBST([libsvn_auth_kwallet_LDFLAGS])
++AC_SUBST([libsvn_client_LDFLAGS])
++AC_SUBST([libsvn_delta_LDFLAGS])
++AC_SUBST([libsvn_diff_LDFLAGS])
++AC_SUBST([libsvn_fs_LDFLAGS])
++AC_SUBST([libsvn_fs_base_LDFLAGS])
++AC_SUBST([libsvn_fs_fs_LDFLAGS])
++AC_SUBST([libsvn_fs_util_LDFLAGS])
++AC_SUBST([libsvn_ra_LDFLAGS])
++AC_SUBST([libsvn_ra_local_LDFLAGS])
++AC_SUBST([libsvn_ra_serf_LDFLAGS])
++AC_SUBST([libsvn_ra_svn_LDFLAGS])
++AC_SUBST([libsvn_repos_LDFLAGS])
++AC_SUBST([libsvn_subr_LDFLAGS])
++AC_SUBST([libsvn_wc_LDFLAGS])
++
++
++AC_ARG_ENABLE(maintainer-mode,
++AS_HELP_STRING([--enable-maintainer-mode],
++ [Turn on debugging and very strict compile-time warnings]),
++[
++ if test "$enableval" = "yes" ; then
++ if test "$enable_debugging" = "no" ; then
++ AC_MSG_ERROR([Can't have --disable-debug and --enable-maintainer-mode])
++ fi
++ enable_debugging=yes
++
++ dnl Enable some extra warnings. Put these before the user's flags
++ dnl so the user can specify flags that override these.
++ if test "$GCC" = "yes"; then
++ AC_MSG_NOTICE([maintainer-mode: adding GCC warning flags])
++
++ dnl some additional flags that can be handy for an occasional review,
++ dnl but throw too many warnings in svn code, of too little importance,
++ dnl to keep these enabled. Remove the "dnl" to do a run with these
++ dnl switches enabled.
++ dnl ./configure CUSERFLAGS="-Wswitch-enum -Wswitch-default"
++
++ dnl Add each of the following flags only if the C compiler accepts it.
++ CFLAGS_KEEP="$CFLAGS"
++ CFLAGS=""
++
++ SVN_CFLAGS_ADD_IFELSE([-Werror=implicit-function-declaration])
++ SVN_CFLAGS_ADD_IFELSE([-Werror=declaration-after-statement])
++ SVN_CFLAGS_ADD_IFELSE([-Wextra-tokens])
++ SVN_CFLAGS_ADD_IFELSE([-Wnewline-eof])
++ SVN_CFLAGS_ADD_IFELSE([-Wshorten-64-to-32])
++ SVN_CFLAGS_ADD_IFELSE([-Wold-style-definition])
++ SVN_CFLAGS_ADD_IFELSE([-Wno-system-headers])
++ SVN_CFLAGS_ADD_IFELSE([-Wno-format-nonliteral])
++
++ CMAINTAINERFLAGS="$CFLAGS $CMAINTAINERFLAGS"
++ CFLAGS="$CFLAGS_KEEP"
++
++ dnl Add flags that all versions of GCC (should) support
++ CMAINTAINERFLAGS="-Wall -Wpointer-arith -Wwrite-strings -Wshadow -Wformat=2 -Wunused -Waggregate-return -Wstrict-prototypes -Wmissing-prototypes -Wmissing-declarations -Wno-multichar -Wredundant-decls -Wnested-externs -Winline -Wno-long-long $CMAINTAINERFLAGS"
++ fi
++ if test "$GXX" = "yes"; then
++ AC_MSG_NOTICE([maintainer-mode: adding G++ warning flags])
++
++ dnl Add each of the following flags only if the C++ compiler accepts it.
++ CXXFLAGS_KEEP="$CXXFLAGS"
++ CXXFLAGS=""
++
++ SVN_CXXFLAGS_ADD_IFELSE([-Wextra-tokens])
++ SVN_CXXFLAGS_ADD_IFELSE([-Wnewline-eof])
++ SVN_CXXFLAGS_ADD_IFELSE([-Wshorten-64-to-32])
++ SVN_CXXFLAGS_ADD_IFELSE([-Wno-system-headers])
++
++ CXXMAINTAINERFLAGS="$CXXFLAGS $CXXMAINTAINERFLAGS"
++ CXXFLAGS="$CXXFLAGS_KEEP"
++
++ dnl Add flags that all versions of G++ (should) support
++ CXXMAINTAINERFLAGS="-Wall -Wpointer-arith -Wwrite-strings -Wshadow -Wunused -Wunreachable-code $CXXMAINTAINERFLAGS"
++ fi
++ fi
++])
++
++if test "$enable_debugging" = "yes" ; then
++ dnl At the moment, we don't want optimization, because we're
++ dnl debugging. Unless optiization was explicitly enabled.
++ if test "$enable_optimization" != "yes"; then
++ AC_MSG_NOTICE([Disabling optimizations for debugging])
++ CFLAGS=["`echo $CFLAGS' ' | $SED -e 's/-O[^ ]* //g'`"]
++ CXXFLAGS=["`echo $CXXFLAGS' ' | $SED -e 's/-O[^ ]* //g'`"]
++ fi
++ dnl Add debugging flags, unless they were set by the user
++ if test -z ["`echo $CUSERFLAGS' ' | $EGREP -- '-g[0-9]? '`"]; then
++ AC_MSG_NOTICE([Enabling debugging for C])
++ CFLAGS=["`echo $CFLAGS' ' | $SED -e 's/-g[0-9] //g' -e 's/-g //g'`"]
++ SVN_CFLAGS_ADD_IFELSE([-fno-inline])
++ SVN_CFLAGS_ADD_IFELSE([-fno-omit-frame-pointer])
++ SVN_CFLAGS_ADD_IFELSE([-g3],[],[
++ SVN_CFLAGS_ADD_IFELSE([-g2],[],[
++ SVN_CFLAGS_ADD_IFELSE([-g])])])
++ fi
++ if test -z ["`echo $CXXUSERFLAGS' ' | $EGREP -- '-g[0-9]? '`"]; then
++ AC_MSG_NOTICE([Enabling debugging for C++])
++ CXXFLAGS=["`echo $CXXFLAGS' ' | $SED -e 's/-g[0-9] //g' -e 's/-g //g'`"]
++ SVN_CXXFLAGS_ADD_IFELSE([-fno-inline])
++ SVN_CXXFLAGS_ADD_IFELSE([-fno-omit-frame-pointer])
++ SVN_CXXFLAGS_ADD_IFELSE([-g3],[],[
++ SVN_CXXFLAGS_ADD_IFELSE([-g2],[],[
++ SVN_CXXFLAGS_ADD_IFELSE([-g])])])
++ fi
++ dnl SVN_DEBUG enables specific features for developer builds
++ dnl AP_DEBUG enables specific (Apache) features for developer builds
++ CFLAGS="$CFLAGS -DSVN_DEBUG -DAP_DEBUG"
++ CXXFLAGS="$CXXFLAGS -DSVN_DEBUG -DAP_DEBUG"
++elif test "$enable_debugging" = "no" ; then
++ AC_MSG_NOTICE([Disabling debugging])
++ CFLAGS=["`echo $CFLAGS' ' | $SED -e 's/-g[0-9] //g' -e 's/-g //g'`"]
++ CXXFLAGS=["`echo $CXXFLAGS' ' | $SED -e 's/-g[0-9] //g' -e 's/-g //g'`"]
++ dnl Compile with NDEBUG to get rid of assertions
++ CFLAGS="$CFLAGS -DNDEBUG"
++ CXXFLAGS="$CXXFLAGS -DNDEBUG"
++# elif test "$enable_debugging" = "maybe" ; then
++# # do nothing
++fi
++
++if test "$enable_optimization" = "yes"; then
++ dnl Add optimization flags, unless they were set by the user
++ if test -z ["`echo $CUSERFLAGS' ' | $EGREP -- '-O[^ ]* '`"]; then
++ CFLAGS=["`echo $CFLAGS' ' | $SED -e 's/-O[^ ]* //g'`"]
++ if test "$enable_debugging" = "yes"; then
++ AC_MSG_NOTICE([Enabling optimizations for C (with debugging enabled)])
++ SVN_CFLAGS_ADD_IFELSE([-O1],[],[
++ SVN_CFLAGS_ADD_IFELSE([-O])])
++ else
++ AC_MSG_NOTICE([Enabling optimizations for C])
++ SVN_CFLAGS_ADD_IFELSE([-O3],[],[
++ SVN_CFLAGS_ADD_IFELSE([-O2],[],[
++ SVN_CFLAGS_ADD_IFELSE([-O1],[],[
++ SVN_CFLAGS_ADD_IFELSE([-O])])])])
++ SVN_CFLAGS_ADD_IFELSE([-Wno-clobbered])
++ SVN_CFLAGS_ADD_IFELSE([-flto])
++ SVN_CFLAGS_ADD_IFELSE([-fwhole-program])
++ fi
++ fi
++ if test -z ["`echo $CXXUSERFLAGS' ' | $EGREP -- '-O[^ ]* '`"]; then
++ CXXFLAGS=["`echo $CXXFLAGS' ' | $SED -e 's/-O[^ ]* //g'`"]
++ if test "$enable_debugging" = "yes"; then
++ AC_MSG_NOTICE([Enabling optimizations for C++ (with debugging enabled)])
++ SVN_CXXFLAGS_ADD_IFELSE([-O1],[],[
++ SVN_CXXFLAGS_ADD_IFELSE([-O])])
++ else
++ AC_MSG_NOTICE([Enabling optimizations for C++])
++ SVN_CXXFLAGS_ADD_IFELSE([-O3],[],[
++ SVN_CXXFLAGS_ADD_IFELSE([-O2],[],[
++ SVN_CXXFLAGS_ADD_IFELSE([-O1],[],[
++ SVN_CXXFLAGS_ADD_IFELSE([-O])])])])
++ SVN_CXXFLAGS_ADD_IFELSE([-Wno-clobbered])
++ SVN_CXXFLAGS_ADD_IFELSE([-flto])
++ SVN_CXXFLAGS_ADD_IFELSE([-fwhole-program])
++ fi
++ fi
++elif test "$enable_optimization" = "no"; then
++ dnl Remove all optimization flags
++ AC_MSG_NOTICE([Disabling optimizations])
++ CFLAGS=["`echo $CFLAGS' ' | $SED -e 's/-O[^ ]* //g'`"]
++ CXXFLAGS=["`echo $CXXFLAGS' ' | $SED -e 's/-O[^ ]* //g'`"]
++# elif test "$enable_optimization" = "maybe" ; then
++# # do nothing
++fi
++
++
++AC_ARG_ENABLE(full-version-match,
++AS_HELP_STRING([--disable-full-version-match],
++ [Disable the full version match rules when checking
++ Subversion library compatibility.]),
++[
++ if test "$enableval" = "no" ; then
++ AC_MSG_NOTICE([Disabling svn full version matching])
++ AC_DEFINE(SVN_DISABLE_FULL_VERSION_MATCH, 1,
++ [Defined if the full version matching rules are disabled])
++ fi
++])
++
++AC_ARG_WITH(editor,
++AS_HELP_STRING([--with-editor=PATH],
++ [Specify a default editor for the subversion client.]),
++[
++
++ if test "$withval" = "yes" ; then
++ AC_MSG_ERROR([--with-editor requires an argument.])
++ else
++ SVN_CLIENT_EDITOR=$withval
++ AC_DEFINE_UNQUOTED(SVN_CLIENT_EDITOR, "$SVN_CLIENT_EDITOR",
++ [The path of a default editor for the client.])
++
++ fi
++
++])
++
++SVN_LIB_Z
++
++MOD_ACTIVATION=""
++AC_ARG_ENABLE(mod-activation,
++AS_HELP_STRING([--enable-mod-activation],
++ [Enable mod_dav_svn in httpd.conf]),
++[
++ if test "$enableval" = "yes" ; then
++ MOD_ACTIVATION="-a"
++ AC_MSG_NOTICE([Enabling apache module activation])
++ else
++ AC_MSG_NOTICE([Disabling apache module activation])
++ fi
++])
++AC_SUBST(MOD_ACTIVATION)
++
++
++
++AC_ARG_ENABLE(gcov,
++AC_HELP_STRING([--enable-gcov],
++ [Turn on gcov coverage testing (GCC only).]),
++[
++ if test "$enableval" = "yes" ; then
++ dnl Probably other compilers support something similar;
++ dnl feel free to extend this to include them.
++ if test "$GCC" = "yes"; then
++ if test "$svn_enable_shared" = "yes" ; then
++ AC_MSG_ERROR([Can't have --enable-gcov without --disable-shared (we
++ recommend also using --enable-all-static).])
++ fi
++ if test ! "$enable_all_static" = "yes" ; then
++ AC_MSG_WARN(We recommend --enable-all-static with --enable-gcov.)
++ fi
++ AC_MSG_NOTICE([Enabling gcov coverage testing.])
++ CFLAGS="$CFLAGS -fprofile-arcs -ftest-coverage"
++ CXXFLAGS="$CXXFLAGS -fprofile-arcs -ftest-coverage"
++ else
++ AC_MSG_ERROR([We only support --enable-gcov with GCC right now.])
++ fi
++ fi
++])
++
++AC_ARG_ENABLE(gprof,
++AS_HELP_STRING([--enable-gprof],
++ [Produce gprof profiling data in 'gmon.out' (GCC only).]),
++[
++ if test "$enableval" = "yes" ; then
++ dnl Probably other compilers support -pg or something similar;
++ dnl feel free to extend this to include them.
++ if test "$GCC" = "yes"; then
++ if test "$svn_enable_shared" = "yes" ; then
++ AC_MSG_ERROR([Can't have --enable-gprof without --disable-shared (we
++ recommend also using --enable-all-static).])
++ fi
++ if test ! "$enable_all_static" = "yes" ; then
++ AC_MSG_WARN(We recommend --enable-all-static with --enable-gprof.)
++ fi
++ AC_MSG_NOTICE([Enabling gprof profiling data (to gmon.out).])
++ CFLAGS="$CFLAGS -pg"
++ CXXFLAGS="$CXXFLAGS -pg"
++ LT_LDFLAGS="$LT_LDFLAGS -pg"
++ else
++ AC_MSG_ERROR([We only support --enable-gprof with GCC right now.])
++ fi
++ fi
++])
++
++
++# Scripting and Bindings languages
++
++# Python: Used for testsuite, and bindings
++
++
++PYTHON="`$abs_srcdir/build/find_python.sh`"
++if test -z "$PYTHON"; then
++ AC_MSG_WARN([Python 2.5 or later is required to run the testsuite])
++ AC_MSG_WARN([or to use the Subversion Python bindings])
++ AC_MSG_WARN([])
++ AC_MSG_WARN([If you have a suitable Python installed, but not on the])
++ AC_MSG_WARN([PATH, set the environment variable PYTHON to the full path])
++ AC_MSG_WARN([to the Python executable, and re-run configure])
++fi
++AC_PATH_PROGS(PYTHON, "$PYTHON", none)
++
++# The minimum version for the JVM runtime for our Java bytecode.
++JAVA_OLDEST_WORKING_VER='1.5'
++# SVN_CHECK_JDK sets $JAVA_CLASSPATH
++SVN_CHECK_JDK($JAVA_OLDEST_WORKING_VER)
++
++AC_PATH_PROG(PERL, perl, none)
++
++if test -n "$RUBY"; then
++ AC_PATH_PROG(RUBY, "$RUBY", none)
++else
++ AC_PATH_PROGS(RUBY, ruby ruby1.8 ruby18 ruby1.9 ruby1 ruby1.9.3 ruby193, none)
++fi
++if test "$RUBY" != "none"; then
++ AC_MSG_CHECKING([rb_hash_foreach])
++ if "$RUBY" -r mkmf -e 'exit(have_func("rb_hash_foreach") ? 0 : 1)' >/dev/null; then
++ AC_MSG_RESULT([yes])
++ if test -n "$RDOC"; then
++ AC_PATH_PROG(RDOC, "$RDOC", none)
++ else
++ AC_PATH_PROGS(RDOC, rdoc rdoc1.8 rdoc18 rdoc1.9 rdoc19 rdoc1.9.3 rdoc193, none)
++ fi
++ AC_CACHE_CHECK([for Ruby major version], [svn_cv_ruby_major],[
++ svn_cv_ruby_major="`$RUBY -rrbconfig -e 'print RbConfig::CONFIG.fetch(%q(MAJOR))'`"
++ ])
++ RUBY_MAJOR="$svn_cv_ruby_major"
++
++ AC_CACHE_CHECK([for Ruby minor version], [svn_cv_ruby_minor],[
++ svn_cv_ruby_minor="`$RUBY -rrbconfig -e 'print RbConfig::CONFIG.fetch(%q(MINOR))'`"
++ ])
++ RUBY_MINOR="$svn_cv_ruby_minor"
++
++ AC_CACHE_CHECK([for Ruby teeny version], [svn_cv_ruby_teeny],[
++ svn_cv_ruby_teeny="`$RUBY -rrbconfig -e 'major, minor, teeny = RUBY_VERSION.split("."); print teeny;'`"
++ ])
++ RUBY_TEENY="$svn_cv_ruby_teeny"
++
++ AC_SUBST(RUBY_MAJOR)
++ AC_SUBST(RUBY_MINOR)
++ AC_SUBST(RUBY_TEENY)
++ if test \( "$RUBY_MAJOR" -eq "1" -a "$RUBY_MINOR" -gt "8" -a "$RUBY_TEENY" -lt "3" \); then
++ # Disallow Ruby between 1.8.7 and 1.9.3
++ RUBY="none"
++ AC_MSG_WARN([The detected Ruby is between 1.9 and 1.9.3])
++ AC_MSG_WARN([Only 1.8.x and 1.9.3 releases are supported at this time])
++ elif test \( "$RUBY_MAJOR" -eq "1" -a "$RUBY_MINOR" -eq "9" -a "$RUBY_TEENY" -eq "3" \); then
++ #Warn about 1.9.3 support
++ AC_MSG_WARN([WARNING: The detected Ruby is 1.9.3])
++ AC_MSG_WARN([WARNING: Only 1.8.x releases are fully supported, 1.9.3 support is new])
++ fi
++ else
++ AC_MSG_RESULT([no])
++ RUBY="none"
++ AC_MSG_WARN([The detected Ruby is too old for Subversion to use])
++ AC_MSG_WARN([A Ruby which has rb_hash_foreach is required to use the])
++ AC_MSG_WARN([Subversion Ruby bindings])
++ AC_MSG_WARN([Upgrade to the official 1.8.2 release, or later])
++ fi
++fi
++
++SVN_CHECK_SWIG
++
++SVN_CHECK_CTYPESGEN
++
++dnl decide whether we want to link against the RA/FS libraries
++AC_ARG_ENABLE(runtime-module-search,
++AS_HELP_STRING([--enable-runtime-module-search],
++ [Turn on dynamic loading of RA/FS libraries including
++ third-party FS libraries]),
++[
++ if test "$enableval" = "yes"; then
++ use_dso=yes
++ if test "$svn_enable_shared" = "no"; then
++ AC_MSG_ERROR([--enable-runtime-module-search conflicts with --disable-shared])
++ fi
++ AC_DEFINE(SVN_USE_DSO, 1,
++ [Defined if svn should try to load DSOs])
++ fi
++])
++
++if test "$svn_enable_shared" = "no" || test "$use_dso" != "yes"; then
++ AC_DEFINE(SVN_LIBSVN_CLIENT_LINKS_RA_LOCAL, 1,
++ [Defined if libsvn_client should link against libsvn_ra_local])
++ svn_ra_lib_deps="\$(RA_LOCAL_DEPS)"
++ svn_ra_lib_install_deps="install-ramod-lib"
++ svn_ra_lib_link="\$(RA_LOCAL_LINK)"
++
++ AC_DEFINE(SVN_LIBSVN_CLIENT_LINKS_RA_SVN, 1,
++ [Defined if libsvn_client should link against libsvn_ra_svn])
++ svn_ra_lib_deps="$svn_ra_lib_deps \$(RA_SVN_DEPS)"
++ svn_ra_lib_link="$svn_ra_lib_link \$(RA_SVN_LINK)"
++
++ if test "$svn_lib_serf" = "yes"; then
++ AC_DEFINE(SVN_LIBSVN_CLIENT_LINKS_RA_SERF, 1,
++ [Defined if libsvn_client should link against libsvn_ra_serf])
++ svn_ra_lib_deps="$svn_ra_lib_deps \$(RA_SERF_DEPS)"
++ svn_ra_lib_install_deps="$svn_ra_lib_install_deps install-serf-lib"
++ svn_ra_lib_link="$svn_ra_lib_link \$(RA_SERF_LINK)"
++ fi
++
++ SVN_RA_LIB_DEPS=$svn_ra_lib_deps
++ SVN_RA_LIB_INSTALL_DEPS=$svn_ra_lib_install_deps
++ SVN_RA_LIB_LINK=$svn_ra_lib_link
++
++ AC_DEFINE(SVN_LIBSVN_FS_LINKS_FS_FS, 1,
++ [Defined if libsvn_fs should link against libsvn_fs_fs])
++ svn_fs_lib_deps="\$(FS_FS_DEPS)"
++ svn_fs_lib_install_deps="install-fsmod-lib"
++ svn_fs_lib_link="\$(FS_FS_LINK)"
++
++ if test "$svn_lib_berkeley_db" = "yes"; then
++ AC_DEFINE(SVN_LIBSVN_FS_LINKS_FS_BASE, 1,
++ [Defined if libsvn_fs should link against libsvn_fs_base])
++ svn_fs_lib_deps="$svn_fs_lib_deps \$(FS_BASE_DEPS)"
++ svn_fs_lib_install_deps="$svn_fs_lib_install_deps install-bdb-lib"
++ svn_fs_lib_link="$svn_fs_lib_link \$(FS_BASE_LINK)"
++ fi
++
++ SVN_FS_LIB_DEPS=$svn_fs_lib_deps
++ SVN_FS_LIB_INSTALL_DEPS=$svn_fs_lib_install_deps
++ SVN_FS_LIB_LINK=$svn_fs_lib_link
++fi
++
++AC_SUBST(SVN_RA_LIB_DEPS)
++AC_SUBST(SVN_RA_LIB_INSTALL_DEPS)
++AC_SUBST(SVN_RA_LIB_LINK)
++AC_SUBST(SVN_FS_LIB_DEPS)
++AC_SUBST(SVN_FS_LIB_INSTALL_DEPS)
++AC_SUBST(SVN_FS_LIB_LINK)
++
++# ==== JavaHL ================================================================
++
++dnl Possibly compile JavaHL
++do_javahl_build=no
++AC_ARG_ENABLE(javahl,
++ AS_HELP_STRING([--enable-javahl],
++ [Enable compilation of Java high-level bindings (requires C++)]),
++ [ if test "$enableval" = "yes" ; then
++ do_javahl_build="yes"
++ fi
++ ])
++
++JAVAHL_OBJDIR=""
++INSTALL_EXTRA_JAVAHL_LIB=""
++FIX_JAVAHL_LIB=""
++JAVAHL_TESTS_TARGET=""
++JAVAHL_COMPAT_TESTS_TARGET=""
++LT_CXX_LIBADD=""
++if test "$do_javahl_build" = "yes"; then
++ dnl Check for suitable JDK
++ if test "$JDK_SUITABLE" = "no"; then
++ AC_MSG_ERROR([Cannot compile JavaHL without a suitable JDK.
++ Please specify a suitable JDK using the --with-jdk option.])
++ fi
++
++ dnl The temporary directory where libtool compiles libsvnjavahl.
++ JAVAHL_OBJDIR='$(libsvnjavahl_PATH)/.libs'
++
++ os_arch=`uname`
++ if test "$os_arch" = "Darwin"; then
++ dnl On Darwin, JNI libs must be installed as .jnilib
++ INSTALL_EXTRA_JAVAHL_LIB='ln -sf $(libdir)/libsvnjavahl-1.dylib $(libdir)/libsvnjavahl-1.jnilib'
++ FIX_JAVAHL_LIB="ln -sf libsvnjavahl-1.dylib $JAVAHL_OBJDIR/libsvnjavahl-1.jnilib"
++ fi
++ # This segment (and the rest of r10800) is very likely unnecessary
++ # with libtool 1.5, which automatically adds libstdc++ as a
++ # dependency to the C++ libraries it builds. So at some future time
++ # when autogen.sh requires libtool 1.5 or higher, we can get rid of
++ # it.
++ AC_MSG_CHECKING([for additional flags to link C++ libraries])
++ if test "x$ac_compiler_gnu" = "xyes"; then
++ LT_CXX_LIBADD="-lstdc++"
++ AC_MSG_RESULT([$LT_CXX_LIBADD])
++ else
++ AC_MSG_RESULT([none needed])
++ fi
++fi
++AC_SUBST(INSTALL_EXTRA_JAVAHL_LIB)
++AC_SUBST(JAVAHL_OBJDIR)
++AC_SUBST(FIX_JAVAHL_LIB)
++AC_SUBST(LT_CXX_LIBADD)
++
++AC_ARG_WITH(junit,
++AS_HELP_STRING([--with-junit=PATH],
++ [Specify a path to the junit JAR file.]),
++[
++ if test "$withval" != "no"; then
++ if test -n "$JAVA_CLASSPATH"; then
++ JAVA_CLASSPATH="$withval:$JAVA_CLASSPATH"
++ else
++ JAVA_CLASSPATH="$withval"
++ fi
++ JAVAHL_TESTS_TARGET="javahl-tests"
++ JAVAHL_COMPAT_TESTS_TARGET="javahl-compat-tests"
++ fi
++])
++AC_SUBST(JAVA_CLASSPATH)
++AC_SUBST(JAVAHL_TESTS_TARGET)
++AC_SUBST(JAVAHL_COMPAT_TESTS_TARGET)
++
++# ==== Miscellaneous bits ====================================================
++
++# Strip '-no-cpp-precomp' from CPPFLAGS for the clang compiler
++### I think we get this flag from APR, so the fix probably belongs there
++if test "$CC" = "clang"; then
++ SVN_STRIP_FLAG(CPPFLAGS, [-no-cpp-precomp ])
++fi
++
++dnl Since this is used only on Unix-y systems, define the path separator as '/'
++AC_DEFINE_UNQUOTED(SVN_PATH_LOCAL_SEPARATOR, '/',
++ [Defined to be the path separator used on your local filesystem])
++
++AC_DEFINE_UNQUOTED(SVN_NULL_DEVICE_NAME, "/dev/null",
++ [Defined to be the null device for the system])
++
++DEFAULT_FS_TYPE="fsfs"
++AC_DEFINE_UNQUOTED(DEFAULT_FS_TYPE, "$DEFAULT_FS_TYPE",
++ [The fs type to use by default])
++
++DEFAULT_HTTP_LIBRARY="serf"
++AC_DEFINE_UNQUOTED(DEFAULT_HTTP_LIBRARY, "$DEFAULT_HTTP_LIBRARY",
++ [The http library to use by default])
++
++# BSD/OS (BSDi) needs to use a different include syntax in Makefile
++INCLUDE_OUTPUTS="include \$(top_srcdir)/build-outputs.mk"
++case "$host" in
++ *bsdi*)
++ # Check whether they've installed GNU make
++ if ! make --version > /dev/null 2>&1; then
++ # BSDi make
++ INCLUDE_OUTPUTS=".include \"\$(top_srcdir)/build-outputs.mk\""
++ fi
++ ;;
++esac
++AC_SUBST(INCLUDE_OUTPUTS)
++
++# ==== Detection complete - output and run config.status =====================
++
++AC_CONFIG_HEADERS(subversion/svn_private_config.h.tmp:subversion/svn_private_config.h.in)
++AC_CONFIG_COMMANDS([svn_private_config.h.tmp],
++ [svn_cf=subversion/svn_private_config.h;
++ $SED -e "s/@SVN_DB_HEADER@/$SVN_DB_HEADER/" $svn_cf.tmp > $svn_cf.tmp.new
++ cmp -s $svn_cf.tmp.new $svn_cf || mv -f $svn_cf.tmp.new $svn_cf
++ rm -f $svn_cf.tmp.new $svn_cf.tmp],
++ [SED="$SED"
++ SVN_DB_HEADER="$SVN_DB_HEADER"])
++AC_CONFIG_FILES([Makefile])
++
++SVN_CONFIG_SCRIPT(tools/backup/hot-backup.py)
++SVN_CONFIG_SCRIPT(tools/hook-scripts/commit-access-control.pl)
++SVN_CONFIG_SCRIPT(subversion/bindings/swig/perl/native/Makefile.PL)
++if test -e packages/solaris/pkginfo.in; then
++ SVN_CONFIG_SCRIPT(packages/solaris/pkginfo)
++fi
++AC_SUBST(SVN_CONFIG_SCRIPT_FILES)
++
++# Ensure that SWIG is checked after reconfiguration.
++rm -f .swig_checked
++
++dnl Provide ${host} for use in compiled code (for svn --version)
++AC_DEFINE_UNQUOTED([SVN_BUILD_HOST], "${host}",
++ [Defined to the config.guess name of the build system])
++
++dnl Provide ${target} for use in compiled code (for user-agent string)
++AC_DEFINE_UNQUOTED([SVN_BUILD_TARGET], "${target}",
++ [Defined to the config.guess name of the build target])
++
++AC_OUTPUT
++
++# ==== Print final messages to user ==========================================
++
++dnl Configure is long - users tend to miss warnings printed during it.
++dnl Hence, print a warnings about what we did and didn't configure at the
++dnl end, where people will actually see them.
++
++if test "$svn_lib_berkeley_db" = "no" && test "$with_berkeley_db" != "no"; then
++ db_version="$SVN_FS_WANT_DB_MAJOR.$SVN_FS_WANT_DB_MINOR.$SVN_FS_WANT_DB_PATCH"
++ AC_MSG_WARN([we have configured without BDB filesystem support
++
++
++You don't seem to have Berkeley DB version $db_version or newer
++installed and linked to APR-UTIL. We have created a Makefile which will build
++Subversion without support for the Berkeley DB back-end. You can find the
++latest version of Berkeley DB here:
++
++ http://www.oracle.com/technetwork/products/berkeleydb/downloads/index.html
++
++or explicitly specify --without-berkeley-db to silence this warning.
++])
++fi
diff --git a/devel/subversion/pkg-plist b/devel/subversion/pkg-plist
index 03bb53473e7d..d20de7fb0b5a 100644
--- a/devel/subversion/pkg-plist
+++ b/devel/subversion/pkg-plist
@@ -3,13 +3,13 @@ bin/svn
bin/svnadmin
bin/svndumpfilter
bin/svnlook
+bin/svnmucc
bin/svnrdump
bin/svnserve
bin/svnsync
%%ASVN%%bin/asvn
%%SVNAUTHZ_VALIDATE%%bin/svnauthz-validate
%%SVNSERVE_WRAPPER%%bin/svnserve.bin
-%%SVNMUCC%%bin/svnmucc
bin/svnversion
include/subversion-1/mod_authz_svn.h
include/subversion-1/mod_dav_svn.h
@@ -96,10 +96,6 @@ lib/libsvn_ra-1.a
lib/libsvn_ra-1.la
%%DYNAMIC_ENABLED%%lib/libsvn_ra-1.so
%%DYNAMIC_ENABLED%%lib/libsvn_ra-1.so.0
-%%NEON%%lib/libsvn_ra_neon-1.a
-%%NEON%%lib/libsvn_ra_neon-1.la
-%%DYNAMIC_ENABLED%%%%NEON%%lib/libsvn_ra_neon-1.so
-%%DYNAMIC_ENABLED%%%%NEON%%lib/libsvn_ra_neon-1.so.0
lib/libsvn_ra_local-1.a
lib/libsvn_ra_local-1.la
%%DYNAMIC_ENABLED%%lib/libsvn_ra_local-1.so
@@ -162,6 +158,66 @@ lib/libsvn_wc-1.la
%%WITHOUT_GETTEXT%%share/locale/sv/LC_MESSAGES/subversion.mo
%%WITHOUT_GETTEXT%%share/locale/zh_CN/LC_MESSAGES/subversion.mo
%%WITHOUT_GETTEXT%%share/locale/zh_TW/LC_MESSAGES/subversion.mo
+%%DATADIR%%/client-side/detach.py
+%%DATADIR%%/client-side/mergeinfo-sanitizer.py
+%%DATADIR%%/client-side/svn-bench/cl.h
+%%DATADIR%%/client-side/svn-bench/client_errors.h
+%%DATADIR%%/client-side/svn-bench/help-cmd.c
+%%DATADIR%%/client-side/svn-bench/notify.c
+%%DATADIR%%/client-side/svn-bench/null-export-cmd.c
+%%DATADIR%%/client-side/svn-bench/null-list-cmd.c
+%%DATADIR%%/client-side/svn-bench/null-log-cmd.c
+%%DATADIR%%/client-side/svn-bench/svn-bench.c
+%%DATADIR%%/client-side/svn-bench/util.c
+%%DATADIR%%/dev/aprerr.txt
+%%DATADIR%%/dev/benchmarks/suite1/generate_charts
+%%DATADIR%%/dev/fsfs-access-map.c
+%%DATADIR%%/dev/fsfs-reorg.c
+%%DATADIR%%/dev/gdb-py/README
+%%DATADIR%%/dev/gdb-py/svndbg/__init__.py
+%%DATADIR%%/dev/gdb-py/svndbg/printers.py
+%%DATADIR%%/dev/histogram.py
+%%DATADIR%%/dev/merge-graph.py
+%%DATADIR%%/dev/mergegraph/__init__.py
+%%DATADIR%%/dev/mergegraph/mergegraph.py
+%%DATADIR%%/dev/mergegraph/save_as_sh.py
+%%DATADIR%%/dev/remove-trailing-whitespace.sh
+%%DATADIR%%/dev/sbox-ospath.py
+%%DATADIR%%/dev/svnraisetreeconflict/svnraisetreeconflict.c
+%%DATADIR%%/dist/_gnupg.py
+%%DATADIR%%/dist/make-deps-tarball.sh
+%%DATADIR%%/dist/templates/download.ezt
+%%DATADIR%%/dist/templates/stable-news.ezt
+%%DATADIR%%/examples/walk-config-auth.py
+%%DATADIR%%/hook-scripts/control-chars.py
+%%DATADIR%%/hook-scripts/persist-ephemeral-txnprops.py
+%%DATADIR%%/hook-scripts/validate-files.conf.example
+%%DATADIR%%/hook-scripts/validate-files.py
+%%DATADIR%%/server-side/fsfs-stats.c
+%%DATADIR%%/server-side/mod_dontdothat/mod_dontdothat.la
+%%DATADIR%%/server-side/svnauthz.c
+%%DATADIR%%/server-side/svnpredumpfilter.py
+%%DATADIR%%/server-side/svnpubsub/README.txt
+%%DATADIR%%/server-side/svnpubsub/commit-hook.py
+%%DATADIR%%/server-side/svnpubsub/daemonize.py
+%%DATADIR%%/server-side/svnpubsub/irkerbridge.py
+%%DATADIR%%/server-side/svnpubsub/rc.d/svnpubsub
+%%DATADIR%%/server-side/svnpubsub/rc.d/svnpubsub.debian
+%%DATADIR%%/server-side/svnpubsub/rc.d/svnpubsub.freebsd
+%%DATADIR%%/server-side/svnpubsub/rc.d/svnpubsub.solaris
+%%DATADIR%%/server-side/svnpubsub/rc.d/svnwcsub
+%%DATADIR%%/server-side/svnpubsub/rc.d/svnwcsub.debian
+%%DATADIR%%/server-side/svnpubsub/rc.d/svnwcsub.freebsd
+%%DATADIR%%/server-side/svnpubsub/rc.d/svnwcsub.solaris
+%%DATADIR%%/server-side/svnpubsub/svnpubsub.tac
+%%DATADIR%%/server-side/svnpubsub/svnpubsub/__init__.py
+%%DATADIR%%/server-side/svnpubsub/svnpubsub/client.py
+%%DATADIR%%/server-side/svnpubsub/svnpubsub/server.py
+%%DATADIR%%/server-side/svnpubsub/svntweet.py
+%%DATADIR%%/server-side/svnpubsub/svnwcsub.conf.example
+%%DATADIR%%/server-side/svnpubsub/svnwcsub.py
+%%DATADIR%%/server-side/svnpubsub/testserver.py
+%%DATADIR%%/server-side/svnpubsub/watcher.py
%%DATADIR%%/backup/hot-backup.py
%%DATADIR%%/bdb/erase-all-text-data.py
%%DATADIR%%/bdb/skel.py
@@ -230,8 +286,6 @@ lib/libsvn_wc-1.la
%%DATADIR%%/client-side/svn-graph.pl
%%DATADIR%%/client-side/svn-ssl-fingerprints.sh
%%DATADIR%%/client-side/svn-viewspec.py
-%%DATADIR%%/client-side/svnmucc/svnmucc.c
-%%DATADIR%%/client-side/svnmucc/svnmucc-test.py
%%DATADIR%%/client-side/wcfind
%%DATADIR%%/dev/analyze-svnlogs.py
%%DATADIR%%/dev/benchmarks/large_dirs/create_bigdir.sh
@@ -245,7 +299,6 @@ lib/libsvn_wc-1.la
%%DATADIR%%/dev/datecheck.py
%%DATADIR%%/dev/find-bad-style.py
%%DATADIR%%/dev/find-unmoved-deprecated.sh
-%%DATADIR%%/dev/gcov.patch
%%DATADIR%%/dev/gen-javahl-errors.py
%%DATADIR%%/dev/gen-py-errors.py
%%DATADIR%%/dev/gen_junit_report.py
@@ -272,7 +325,6 @@ lib/libsvn_wc-1.la
%%DATADIR%%/dev/svn-entries.el
%%DATADIR%%/dev/svn-merge-revs.py
%%DATADIR%%/dev/svnqlite3-dump
-%%DATADIR%%/dev/svnraisetreeconflict/main.c
%%DATADIR%%/dev/trails.py
%%DATADIR%%/dev/unix-build/Makefile.svn
%%DATADIR%%/dev/unix-build/README
@@ -297,15 +349,12 @@ lib/libsvn_wc-1.la
%%DATADIR%%/dist/dist.sh
%%DATADIR%%/dist/download-release.sh
%%DATADIR%%/dist/extract-for-examination.sh
-%%DATADIR%%/dist/getsigs.py
%%DATADIR%%/dist/nightly.sh
%%DATADIR%%/dist/rat-excludes
%%DATADIR%%/dist/release.py
%%DATADIR%%/dist/templates/nightly-candidates.ezt
-%%DATADIR%%/dist/templates/rc-candidates.ezt
%%DATADIR%%/dist/templates/rc-news.ezt
%%DATADIR%%/dist/templates/rc-release-ann.ezt
-%%DATADIR%%/dist/templates/stable-candidates.ezt
%%DATADIR%%/dist/templates/stable-release-ann.ezt
%%DATADIR%%/dist/test.sh
%%DATADIR%%/examples/blame.py
@@ -354,7 +403,6 @@ lib/libsvn_wc-1.la
%%DATADIR%%/server-side/svn-populate-node-origins-index.c
%%DATADIR%%/server-side/svn-rep-sharing-stats.c
%%DATADIR%%/server-side/svn_server_log_parse.py
-%%DATADIR%%/server-side/svnauthz-validate.c
%%DATADIR%%/server-side/test_svn_server_log_parse.py
%%DATADIR%%/xslt/svnindex.css
%%DATADIR%%/xslt/svnindex.xsl
@@ -382,12 +430,15 @@ lib/libsvn_wc-1.la
@dirrm %%DATADIR%%/buildbot/slaves/xp-vc60-ia32
@dirrm %%DATADIR%%/buildbot/slaves
@dirrm %%DATADIR%%/buildbot
-@dirrm %%DATADIR%%/client-side/svnmucc
+@dirrm %%DATADIR%%/client-side/svn-bench
@dirrm %%DATADIR%%/client-side
@dirrm %%DATADIR%%/dev/benchmarks/large_dirs
@dirrm %%DATADIR%%/dev/benchmarks/suite1
@dirrm %%DATADIR%%/dev/benchmarks
@dirrm %%DATADIR%%/dev/iz
+@dirrm %%DATADIR%%/dev/gdb-py/svndbg
+@dirrm %%DATADIR%%/dev/gdb-py
+@dirrm %%DATADIR%%/dev/mergegraph
@dirrm %%DATADIR%%/dev/svnraisetreeconflict
@dirrm %%DATADIR%%/dev/unix-build
@dirrm %%DATADIR%%/dev/wc-ng
@@ -402,6 +453,10 @@ lib/libsvn_wc-1.la
@dirrm %%DATADIR%%/hook-scripts
@dirrm %%DATADIR%%/po
@dirrm %%DATADIR%%/server-side/mod_dontdothat
+@dirrm %%DATADIR%%/server-side/svnpubsub/notes
+@dirrm %%DATADIR%%/server-side/svnpubsub/rc.d
+@dirrm %%DATADIR%%/server-side/svnpubsub/svnpubsub
+@dirrm %%DATADIR%%/server-side/svnpubsub
@dirrm %%DATADIR%%/server-side
@dirrm %%DATADIR%%/xslt
@dirrm %%DATADIR%%
generated by cgit (git 2.34.1) at 2024-11-20 16:24:50 +0800