diff options
Diffstat (limited to 'subversion/libsvn_ra_local')
| -rw-r--r-- | subversion/libsvn_ra_local/libsvn_ra_local.pc.in | 8 | ||||
| -rw-r--r-- | subversion/libsvn_ra_local/ra_plugin.c | 3 |
2 files changed, 7 insertions, 4 deletions
diff --git a/subversion/libsvn_ra_local/libsvn_ra_local.pc.in b/subversion/libsvn_ra_local/libsvn_ra_local.pc.in index 1333df0b7de5..bef11b2b4da5 100644 --- a/subversion/libsvn_ra_local/libsvn_ra_local.pc.in +++ b/subversion/libsvn_ra_local/libsvn_ra_local.pc.in @@ -6,7 +6,7 @@ includedir=@includedir@ Name: libsvn_ra_local Description: Subversion Local Repository Access Library Version: @PACKAGE_VERSION@ -Requires: apr-@SVN_APR_MAJOR_VERSION@ -Requires.private: libsvn_repos libsvn_fs libsvn_delta libsvn_subr -Libs: -L${libdir} -lsvn_ra_local -Cflags: -I${includedir} +Requires: apr-@SVN_APR_MAJOR_VERSION@ +Requires.private: libsvn_repos, libsvn_fs, libsvn_delta, libsvn_subr +Libs: -L${libdir} -lsvn_ra_local-1 +Cflags: -I${includedir}/subversion-1 diff --git a/subversion/libsvn_ra_local/ra_plugin.c b/subversion/libsvn_ra_local/ra_plugin.c index 7bff85f3b84a..8dcb3a99fbcc 100644 --- a/subversion/libsvn_ra_local/ra_plugin.c +++ b/subversion/libsvn_ra_local/ra_plugin.c @@ -554,6 +554,7 @@ ignore_warnings(void *baton, static svn_error_t * svn_ra_local__open(svn_ra_session_t *session, const char **corrected_url, + const char **redirect_url, const char *repos_URL, const svn_ra_callbacks2_t *callbacks, void *callback_baton, @@ -576,6 +577,8 @@ svn_ra_local__open(svn_ra_session_t *session, /* We don't support redirections in ra-local. */ if (corrected_url) *corrected_url = NULL; + if (redirect_url) + *redirect_url = NULL; /* Allocate and stash the session_sess args we have already. */ sess = apr_pcalloc(pool, sizeof(*sess)); |