svn commit: r339232 - in vendor/subversion/dist: . subversion/include subversion/libsvn_auth_gnome_keyring subversion/libsvn_client subversion/libsvn_fs_fs subversion/libsvn_repos subversion/libsvn...
Peter Wemm
peter at FreeBSD.org
Mon Oct 8 08:34:57 UTC 2018
Author: peter
Date: Mon Oct 8 08:34:55 2018
New Revision: 339232
URL: https://svnweb.freebsd.org/changeset/base/339232
Log:
Vendor import svn-1.10.2
Modified:
vendor/subversion/dist/CHANGES
vendor/subversion/dist/COMMITTERS
vendor/subversion/dist/build.conf
vendor/subversion/dist/configure
vendor/subversion/dist/configure.ac
vendor/subversion/dist/subversion/include/svn_version.h
vendor/subversion/dist/subversion/libsvn_auth_gnome_keyring/gnome_keyring.c
vendor/subversion/dist/subversion/libsvn_auth_gnome_keyring/libsvn_auth_gnome_keyring.pc.in
vendor/subversion/dist/subversion/libsvn_client/conflicts.c
vendor/subversion/dist/subversion/libsvn_client/update.c
vendor/subversion/dist/subversion/libsvn_fs_fs/cached_data.c
vendor/subversion/dist/subversion/libsvn_repos/authz_parse.c
vendor/subversion/dist/subversion/libsvn_subr/io.c
vendor/subversion/dist/subversion/libsvn_wc/wc-checks.h
vendor/subversion/dist/subversion/libsvn_wc/wc-metadata.h
vendor/subversion/dist/subversion/svn/help-cmd.c
Modified: vendor/subversion/dist/CHANGES
==============================================================================
--- vendor/subversion/dist/CHANGES Mon Oct 8 08:30:45 2018 (r339231)
+++ vendor/subversion/dist/CHANGES Mon Oct 8 08:34:55 2018 (r339232)
@@ -1,5 +1,35 @@
+Version 1.10.2
+(20 Jul 2018, from /branches/1.10.x)
+http://svn.apache.org/repos/asf/subversion/tags/1.10.2
+
+ User-visible changes:
+ - Client-side bugfixes:
+ * Correctly claim to offer Gnome Keyring support with libsecret (r1831142)
+ * Fix segfault using Gnome Keyring with libsecret (r1835782)
+ * Fix JavaHL local refs capacity warning when unparsing externals (r1831143)
+ * Since on Windows Subversion does not handle symlinks, never check for reparse points (r1835701)
+ * Prune externals after 'update --set-depth=exclude' (r1835702)
+ * Fix issue #4740, "conflict resolver searches too far back ..." (r1835703)
+ - Server-side bugfixes:
+ * Fix regression issue #4741: authz group refers to multiple groups (r1831220)
+
+ Developer-visible changes:
+ - General:
+ * Regression test and FSFS checksum test, part of issue #4722 (r1828043)
+ * Explicit error on configure --without-lz4 or --without-utf8proc (r1831604)
+ * configure.ac: Fix regression relating to path to 'rdoc' (r1833486)
+ * Ensure consistent use of $PYTHON during build and test (r1833487)
+ * Fix libsvn_auth_gnome_keyring.pc when built using libsecret (r1835781)
+ - Bindings:
+ * Fix regression in use of pre-generated Swig bindings in release builds (r1833488)
+
+
+Version 1.10.1
+(Not released; see changes for 1.10.2.)
+
+
Version 1.10.0
-(?? ??? 2018, from /branches/1.10.x)
+(13 Apr 2018, from /branches/1.10.x)
http://svn.apache.org/repos/asf/subversion/tags/1.10.0
See the 1.10 release notes for a more verbose overview of the changes since
@@ -286,6 +316,41 @@ the 1.9 release: https://subversion.apache.org/docs/r
* Ruby: Detect versions up to 2.4 (r1806570)
+Version 1.9.9
+(20 Jul 2018, from /branches/1.9.x)
+http://svn.apache.org/repos/asf/subversion/tags/1.9.9
+
+ User-visible changes:
+ - Client-side bugfixes:
+ * Fix SEGV for 'svn export -rN WC' with relative externals (r1803755)
+ * Fix issue #4677: 'svn up' after a directory replaced a file (r1814248)
+ * Fix segfault when no home directory is available (r1819199)
+ * Performance: Make 'svn info' fast on old repository revisions (r1827690)
+ * Fix RA-serf problem with proxy username and password (r1833571)
+
+ - Server-side bugfixes:
+ * svnadmin: Fix false errors on some valid LOCK_PATH arguments (r1803754)
+ * Fix crash when exiting 'svnserve --config-file' (r1824405)
+ * Fix issue #4722: false "filesystem is corrupt" error on commit (r1827688)
+ * Reword confusing "nested" wording in an httpd.conf warning (r1835700)
+
+ - Bindings bugfixes:
+ * swig-py: svn.core.Stream supports raw binary file-like objects (r1820620)
+ * swig-rb: Don't crash if svn_md5_digest_to_cstring returns NULL (r1823805)
+
+ Developer-visible changes:
+ - General:
+ * Fix CVE-2017-9800: Malicious server can execute arbitrary command on client (r1804698)
+ * Fix test failure if compile- and run-time HTTPD versions differ (r1820523)
+
+ - API changes:
+ (none)
+
+
+Version 1.9.8
+(Not released; see changes for 1.9.9.)
+
+
Version 1.9.7
(10 Aug 2017, from /branches/1.9.x)
http://svn.apache.org/repos/asf/subversion/tags/1.9.7
@@ -5720,7 +5785,7 @@ http://svn.apache.org/repos/asf/subversion/tags/0.28.2
twice as slow and lose all concurrent-client scalability.
This is a temporary fix for a larger design problem. See issue
- http://subversion.tigris.org/issues/show_bug.cgi?id=1499
+ https://issues.apache.org/jira/browse/SVN-1499
Version 0.28.1
Modified: vendor/subversion/dist/COMMITTERS
==============================================================================
--- vendor/subversion/dist/COMMITTERS Mon Oct 8 08:30:45 2018 (r339231)
+++ vendor/subversion/dist/COMMITTERS Mon Oct 8 08:34:55 2018 (r339232)
@@ -27,7 +27,7 @@ Blanket commit access:
dlr Daniel Rall <dlr at finemaltcoding.com>
mbk Mark Benedetto King <mbk at lowlatency.com>
jaa Jani Averbach <jaa at iki.fi>
- julianfoad Julian Foad <julian at foad.me.uk>
+ julianfoad Julian Foad <julianfoad at apache.org>
jszakmeister John Szakmeister <john at szakmeister.net>
ehu Erik Hülsmann <ehuels at gmail.com>
breser Ben Reser <ben at reser.org>
@@ -87,6 +87,7 @@ Partial committers who have asked to be listed as dorm
rassilon Bill Tutt <bill at tutts.org> (Win32, COM, issue-1003-dev br.)
pll Paul lussier <p.lussier at comcast.net> (releases)
rdonch Роман Донченко <dpb at corrigendum.ru> (Swig-Python b.)
+ karolszk Karol Szkudlarek <karol at mikronika.com.pl> (po: pl)
Commit access for specific areas:
@@ -179,7 +180,6 @@ Commit access for specific areas:
oyvindmo Øyvind Møll <svn at moll.no> (po: nb)
sunny256 Øyvind A. Holm <sunny at sunbase.org> (po: nb)
jzgoda Jaroslaw Zgoda <jzgoda at o2.pl> (po: pl)
- karolszk Karol Szkudlarek <karol at mikronika.com.pl> (po: pl)
plasma Wei-Hon Chen <plasma at ms9.hinet.net> (po: zh_TW)
jihuang June-Yen Huang <jihuang at iis.sinica.edu.tw> (po: zh_TW) [EMAIL
IS BOUNCING]
Modified: vendor/subversion/dist/build.conf
==============================================================================
--- vendor/subversion/dist/build.conf Mon Oct 8 08:30:45 2018 (r339231)
+++ vendor/subversion/dist/build.conf Mon Oct 8 08:34:55 2018 (r339232)
@@ -1463,7 +1463,8 @@ external-lib = $(SVN_DB_LIBS)
[gnome-keyring]
type = lib
external-lib = $(SVN_GNOME_KEYRING_LIBS)
-pkg-config = gnome-keyring-1
+pkg-config = @SVN_GNOME_KEYRING_PCLIBS@
+pkg-config-private = yes
[kwallet]
type = lib
Modified: vendor/subversion/dist/configure
==============================================================================
--- vendor/subversion/dist/configure Mon Oct 8 08:30:45 2018 (r339231)
+++ vendor/subversion/dist/configure Mon Oct 8 08:34:55 2018 (r339232)
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.69 for subversion 1.10.0.
+# Generated by GNU Autoconf 2.69 for subversion 1.10.2.
#
# Report bugs to <http://subversion.apache.org/>.
#
@@ -590,8 +590,8 @@ MAKEFLAGS=
# Identity of this package.
PACKAGE_NAME='subversion'
PACKAGE_TARNAME='subversion'
-PACKAGE_VERSION='1.10.0'
-PACKAGE_STRING='subversion 1.10.0'
+PACKAGE_VERSION='1.10.2'
+PACKAGE_STRING='subversion 1.10.2'
PACKAGE_BUGREPORT='http://subversion.apache.org/'
PACKAGE_URL=''
@@ -725,6 +725,7 @@ MSGMERGE
MSGFMT
SVN_USE_GOOGLEMOCK
GOOGLEMOCK_SRCDIR
+SVN_GNOME_KEYRING_PCLIBS
SVN_GNOME_KEYRING_LIBS
SVN_GNOME_KEYRING_INCLUDES
SVN_HAVE_GPG_AGENT
@@ -1487,7 +1488,7 @@ if test "$ac_init_help" = "long"; then
# Omit some internal or obsolete options to make the list less imposing.
# This message is too long to be a string in the A/UX 3.1 sh.
cat <<_ACEOF
-\`configure' configures subversion 1.10.0 to adapt to many kinds of systems.
+\`configure' configures subversion 1.10.2 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1553,7 +1554,7 @@ fi
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of subversion 1.10.0:";;
+ short | recursive ) echo "Configuration of subversion 1.10.2:";;
esac
cat <<\_ACEOF
@@ -1789,7 +1790,7 @@ fi
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-subversion configure 1.10.0
+subversion configure 1.10.2
generated by GNU Autoconf 2.69
Copyright (C) 2012 Free Software Foundation, Inc.
@@ -2333,7 +2334,7 @@ cat >config.log <<_ACEOF
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
-It was created by subversion $as_me 1.10.0, which was
+It was created by subversion $as_me 1.10.2, which was
generated by GNU Autoconf 2.69. Invocation command line was
$ $0 $@
@@ -2713,8 +2714,8 @@ ac_configure="$SHELL $ac_aux_dir/configure" # Please
-{ $as_echo "$as_me:${as_lineno-$LINENO}: Configuring Subversion 1.10.0" >&5
-$as_echo "$as_me: Configuring Subversion 1.10.0" >&6;}
+{ $as_echo "$as_me:${as_lineno-$LINENO}: Configuring Subversion 1.10.2" >&5
+$as_echo "$as_me: Configuring Subversion 1.10.2" >&6;}
abs_srcdir="`cd $srcdir && pwd`"
@@ -19612,6 +19613,7 @@ $as_echo "#define SVN_HAVE_GNOME_KEYRING 1" >>confdefs
CPPFLAGS="$old_CPPFLAGS"
SVN_GNOME_KEYRING_LIBS="`$PKG_CONFIG --libs glib-2.0 gnome-keyring-1`"
+ SVN_GNOME_KEYRING_PCLIBS="glib-2.0 gnome-keyring-1"
else
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
$as_echo "no" >&6; }
@@ -19698,6 +19700,7 @@ $as_echo "#define SVN_HAVE_LIBSECRET 1" >>confdefs.h
SVN_GNOME_KEYRING_INCLUDES="`$PKG_CONFIG --cflags libsecret-1`"
SVN_GNOME_KEYRING_LIBS="`$PKG_CONFIG --libs libsecret-1`"
+ SVN_GNOME_KEYRING_PCLIBS="libsecret-1"
found_gnome_keyring="yes"
else
if test "$with_gnome_keyring" = "yes"; then
@@ -19738,6 +19741,7 @@ $as_echo "no" >&6; }
+
# Check whether --enable-googlemock was given.
if test "${enable_googlemock+set}" = set; then :
enableval=$enable_googlemock;
@@ -23043,6 +23047,9 @@ else
fi
+ if test "$lz4_prefix" = "no"; then
+ as_fn_error $? "Subversion requires LZ4" "$LINENO" 5
+ fi
if test "$lz4_prefix" = "internal"; then
{ $as_echo "$as_me:${as_lineno-$LINENO}: using internal lz4" >&5
$as_echo "$as_me: using internal lz4" >&6;}
@@ -23235,6 +23242,9 @@ else
fi
+ if test "$utf8proc_prefix" = "no"; then
+ as_fn_error $? "Subversion requires UTF8PROC" "$LINENO" 5
+ fi
if test "$utf8proc_prefix" = "internal"; then
{ $as_echo "$as_me:${as_lineno-$LINENO}: using internal utf8proc" >&5
$as_echo "$as_me: using internal utf8proc" >&6;}
@@ -24138,12 +24148,12 @@ do
set dummy $ac_prog; ac_word=$2
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_path_RUBY+:} false; then :
+if ${ac_cv_path_RDOC+:} false; then :
$as_echo_n "(cached) " >&6
else
- case $RUBY in
+ case $RDOC in
[\\/]* | ?:[\\/]*)
- ac_cv_path_RUBY="$RUBY" # Let the user override the test with a path.
+ ac_cv_path_RDOC="$RDOC" # Let the user override the test with a path.
;;
*)
as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
@@ -24153,7 +24163,7 @@ do
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
- ac_cv_path_RUBY="$as_dir/$ac_word$ac_exec_ext"
+ ac_cv_path_RDOC="$as_dir/$ac_word$ac_exec_ext"
$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
fi
@@ -24164,19 +24174,19 @@ IFS=$as_save_IFS
;;
esac
fi
-RUBY=$ac_cv_path_RUBY
-if test -n "$RUBY"; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $RUBY" >&5
-$as_echo "$RUBY" >&6; }
+RDOC=$ac_cv_path_RDOC
+if test -n "$RDOC"; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $RDOC" >&5
+$as_echo "$RDOC" >&6; }
else
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
$as_echo "no" >&6; }
fi
- test -n "$RUBY" && break
+ test -n "$RDOC" && break
done
-test -n "$RUBY" || RUBY="none"
+test -n "$RDOC" || RDOC="none"
fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for Ruby major version" >&5
@@ -24343,69 +24353,70 @@ $as_echo "$as_me: WARNING: Detected SWIG version $SWIG
{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Subversion requires SWIG >= 1.3.24" >&5
$as_echo "$as_me: WARNING: Subversion requires SWIG >= 1.3.24" >&2;}
fi
+ fi
- SWIG_PY_COMPILE="none"
- SWIG_PY_LINK="none"
- if test "$PYTHON" != "none"; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: Configuring python swig binding" >&5
+ SWIG_PY_COMPILE="none"
+ SWIG_PY_LINK="none"
+ if test "$PYTHON" != "none"; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: Configuring python swig binding" >&5
$as_echo "$as_me: Configuring python swig binding" >&6;}
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for Python includes" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for Python includes" >&5
$as_echo_n "checking for Python includes... " >&6; }
if ${ac_cv_python_includes+:} false; then :
$as_echo_n "(cached) " >&6
else
- ac_cv_python_includes="`$PYTHON ${abs_srcdir}/build/get-py-info.py --includes`"
+ ac_cv_python_includes="`$PYTHON ${abs_srcdir}/build/get-py-info.py --includes`"
fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_python_includes" >&5
$as_echo "$ac_cv_python_includes" >&6; }
- SWIG_PY_INCLUDES="\$(SWIG_INCLUDES) $ac_cv_python_includes"
+ SWIG_PY_INCLUDES="\$(SWIG_INCLUDES) $ac_cv_python_includes"
- if test "$ac_cv_python_includes" = "none"; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: python bindings cannot be built without distutils module" >&5
+ if test "$ac_cv_python_includes" = "none"; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: python bindings cannot be built without distutils module" >&5
$as_echo "$as_me: WARNING: python bindings cannot be built without distutils module" >&2;}
- fi
+ fi
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for compiling Python extensions" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for compiling Python extensions" >&5
$as_echo_n "checking for compiling Python extensions... " >&6; }
if ${ac_cv_python_compile+:} false; then :
$as_echo_n "(cached) " >&6
else
- ac_cv_python_compile="`$PYTHON ${abs_srcdir}/build/get-py-info.py --compile`"
+ ac_cv_python_compile="`$PYTHON ${abs_srcdir}/build/get-py-info.py --compile`"
fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_python_compile" >&5
$as_echo "$ac_cv_python_compile" >&6; }
- SWIG_PY_COMPILE="$ac_cv_python_compile $CFLAGS"
+ SWIG_PY_COMPILE="$ac_cv_python_compile $CFLAGS"
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for linking Python extensions" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for linking Python extensions" >&5
$as_echo_n "checking for linking Python extensions... " >&6; }
if ${ac_cv_python_link+:} false; then :
$as_echo_n "(cached) " >&6
else
- ac_cv_python_link="`$PYTHON ${abs_srcdir}/build/get-py-info.py --link`"
+ ac_cv_python_link="`$PYTHON ${abs_srcdir}/build/get-py-info.py --link`"
fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_python_link" >&5
$as_echo "$ac_cv_python_link" >&6; }
- SWIG_PY_LINK="$ac_cv_python_link"
+ SWIG_PY_LINK="$ac_cv_python_link"
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for linking Python libraries" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for linking Python libraries" >&5
$as_echo_n "checking for linking Python libraries... " >&6; }
if ${ac_cv_python_libs+:} false; then :
$as_echo_n "(cached) " >&6
else
- ac_cv_python_libs="`$PYTHON ${abs_srcdir}/build/get-py-info.py --libs`"
+ ac_cv_python_libs="`$PYTHON ${abs_srcdir}/build/get-py-info.py --libs`"
fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_python_libs" >&5
$as_echo "$ac_cv_python_libs" >&6; }
- SWIG_PY_LIBS="`
+ SWIG_PY_LIBS="`
input_flags="$ac_cv_python_libs"
output_flags=""
filtered_dirs="/lib /lib64 /usr/lib /usr/lib64"
@@ -24426,19 +24437,19 @@ $as_echo "$ac_cv_python_libs" >&6; }
fi
`"
- SVN_PYCFMT_SAVE_CPPFLAGS="$CPPFLAGS"
- CPPFLAGS="$CPPFLAGS $SVN_APR_INCLUDES"
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for apr_int64_t Python/C API format string" >&5
+ SVN_PYCFMT_SAVE_CPPFLAGS="$CPPFLAGS"
+ CPPFLAGS="$CPPFLAGS $SVN_APR_INCLUDES"
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for apr_int64_t Python/C API format string" >&5
$as_echo_n "checking for apr_int64_t Python/C API format string... " >&6; }
if ${svn_cv_pycfmt_apr_int64_t+:} false; then :
$as_echo_n "(cached) " >&6
else
- if test "x$svn_cv_pycfmt_apr_int64_t" = "x"; then
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ if test "x$svn_cv_pycfmt_apr_int64_t" = "x"; then
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
#include <apr.h>
- MaTcHtHiS APR_INT64_T_FMT EnDeNd
+ MaTcHtHiS APR_INT64_T_FMT EnDeNd
_ACEOF
if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
$EGREP "MaTcHtHiS +\"lld\" +EnDeNd" >/dev/null 2>&1; then :
@@ -24446,13 +24457,13 @@ if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
fi
rm -f conftest*
- fi
- if test "x$svn_cv_pycfmt_apr_int64_t" = "x"; then
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ fi
+ if test "x$svn_cv_pycfmt_apr_int64_t" = "x"; then
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
r
- #include <apr.h>
- MaTcHtHiS APR_INT64_T_FMT EnDeNd
+ #include <apr.h>
+ MaTcHtHiS APR_INT64_T_FMT EnDeNd
_ACEOF
if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
$EGREP "MaTcHtHiS +\"ld\" +EnDeNd" >/dev/null 2>&1; then :
@@ -24460,12 +24471,12 @@ if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
fi
rm -f conftest*
- fi
- if test "x$svn_cv_pycfmt_apr_int64_t" = "x"; then
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ fi
+ if test "x$svn_cv_pycfmt_apr_int64_t" = "x"; then
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
#include <apr.h>
- MaTcHtHiS APR_INT64_T_FMT EnDeNd
+ MaTcHtHiS APR_INT64_T_FMT EnDeNd
_ACEOF
if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
$EGREP "MaTcHtHiS +\"d\" +EnDeNd" >/dev/null 2>&1; then :
@@ -24473,32 +24484,32 @@ if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
fi
rm -f conftest*
- fi
+ fi
fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $svn_cv_pycfmt_apr_int64_t" >&5
$as_echo "$svn_cv_pycfmt_apr_int64_t" >&6; }
- CPPFLAGS="$SVN_PYCFMT_SAVE_CPPFLAGS"
- if test "x$svn_cv_pycfmt_apr_int64_t" = "x"; then
- as_fn_error $? "failed to recognize APR_INT64_T_FMT on this platform" "$LINENO" 5
- fi
+ CPPFLAGS="$SVN_PYCFMT_SAVE_CPPFLAGS"
+ if test "x$svn_cv_pycfmt_apr_int64_t" = "x"; then
+ as_fn_error $? "failed to recognize APR_INT64_T_FMT on this platform" "$LINENO" 5
+ fi
cat >>confdefs.h <<_ACEOF
#define SVN_APR_INT64_T_PYCFMT "$svn_cv_pycfmt_apr_int64_t"
_ACEOF
- fi
+ fi
- if test "$PERL" != "none"; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking perl version" >&5
+ if test "$PERL" != "none"; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking perl version" >&5
$as_echo_n "checking perl version... " >&6; }
- PERL_VERSION="`$PERL -e 'q([); print $] * 1000000,$/;'`"
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PERL_VERSION" >&5
+ PERL_VERSION="`$PERL -e 'q([); print $] * 1000000,$/;'`"
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PERL_VERSION" >&5
$as_echo "$PERL_VERSION" >&6; }
- if test "$PERL_VERSION" -ge "5008000"; then
- SWIG_PL_INCLUDES="\$(SWIG_INCLUDES) `$PERL -MExtUtils::Embed -e ccopts`"
- SWIG_PL_LINK="`$PERL -MExtUtils::Embed -e ldopts`"
- SWIG_PL_LINK="`
+ if test "$PERL_VERSION" -ge "5008000"; then
+ SWIG_PL_INCLUDES="\$(SWIG_INCLUDES) `$PERL -MExtUtils::Embed -e ccopts`"
+ SWIG_PL_LINK="`$PERL -MExtUtils::Embed -e ldopts`"
+ SWIG_PL_LINK="`
input_flags="$SWIG_PL_LINK"
output_flags=""
filtered_dirs="/lib /lib64 /usr/lib /usr/lib64"
@@ -24518,61 +24529,61 @@ $as_echo "$PERL_VERSION" >&6; }
printf "%s" "${output_flags# }"
fi
`"
- else
- { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: perl bindings require perl 5.8.0 or newer." >&5
+ else
+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: perl bindings require perl 5.8.0 or newer." >&5
$as_echo "$as_me: WARNING: perl bindings require perl 5.8.0 or newer." >&2;}
- fi
fi
+ fi
- SWIG_RB_COMPILE="none"
- SWIG_RB_LINK="none"
- if test "$RUBY" != "none"; then
- rbconfig="$RUBY -rrbconfig -e "
+ SWIG_RB_COMPILE="none"
+ SWIG_RB_LINK="none"
+ if test "$RUBY" != "none"; then
+ rbconfig="$RUBY -rrbconfig -e "
- for var_name in arch archdir CC LDSHARED DLEXT LIBS LIBRUBYARG \
- rubyhdrdir rubyarchhdrdir sitedir sitelibdir sitearchdir libdir
- do
- rbconfig_tmp=`$rbconfig "print RbConfig::CONFIG['$var_name']"`
- eval "rbconfig_$var_name=\"$rbconfig_tmp\""
- done
+ for var_name in arch archdir CC LDSHARED DLEXT LIBS LIBRUBYARG \
+ rubyhdrdir rubyarchhdrdir sitedir sitelibdir sitearchdir libdir
+ do
+ rbconfig_tmp=`$rbconfig "print RbConfig::CONFIG['$var_name']"`
+ eval "rbconfig_$var_name=\"$rbconfig_tmp\""
+ done
- { $as_echo "$as_me:${as_lineno-$LINENO}: Configuring Ruby SWIG binding" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: Configuring Ruby SWIG binding" >&5
$as_echo "$as_me: Configuring Ruby SWIG binding" >&6;}
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for Ruby include path" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for Ruby include path" >&5
$as_echo_n "checking for Ruby include path... " >&6; }
if ${svn_cv_ruby_includes+:} false; then :
$as_echo_n "(cached) " >&6
else
- if test -d "$rbconfig_rubyhdrdir"; then
- svn_cv_ruby_includes="-I. -I$rbconfig_rubyhdrdir -I$rbconfig_rubyhdrdir/ruby -I$rbconfig_rubyhdrdir/ruby/backward"
- if test -d "$rbconfig_rubyarchhdrdir"; then
- svn_cv_ruby_includes="$svn_cv_ruby_includes -I$rbconfig_rubyarchhdrdir"
- else
- svn_cv_ruby_includes="$svn_cv_ruby_includes -I$rbconfig_rubyhdrdir/$rbconfig_arch"
- fi
+ if test -d "$rbconfig_rubyhdrdir"; then
+ svn_cv_ruby_includes="-I. -I$rbconfig_rubyhdrdir -I$rbconfig_rubyhdrdir/ruby -I$rbconfig_rubyhdrdir/ruby/backward"
+ if test -d "$rbconfig_rubyarchhdrdir"; then
+ svn_cv_ruby_includes="$svn_cv_ruby_includes -I$rbconfig_rubyarchhdrdir"
else
- svn_cv_ruby_includes="-I. -I$rbconfig_archdir"
+ svn_cv_ruby_includes="$svn_cv_ruby_includes -I$rbconfig_rubyhdrdir/$rbconfig_arch"
fi
+ else
+ svn_cv_ruby_includes="-I. -I$rbconfig_archdir"
+ fi
fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $svn_cv_ruby_includes" >&5
$as_echo "$svn_cv_ruby_includes" >&6; }
- SWIG_RB_INCLUDES="\$(SWIG_INCLUDES) $svn_cv_ruby_includes"
+ SWIG_RB_INCLUDES="\$(SWIG_INCLUDES) $svn_cv_ruby_includes"
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking how to compile Ruby extensions" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking how to compile Ruby extensions" >&5
$as_echo_n "checking how to compile Ruby extensions... " >&6; }
if ${svn_cv_ruby_compile+:} false; then :
$as_echo_n "(cached) " >&6
else
- svn_cv_ruby_compile="$rbconfig_CC $CFLAGS"
+ svn_cv_ruby_compile="$rbconfig_CC $CFLAGS"
fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $svn_cv_ruby_compile" >&5
$as_echo "$svn_cv_ruby_compile" >&6; }
- SWIG_RB_COMPILE="$svn_cv_ruby_compile"
+ SWIG_RB_COMPILE="$svn_cv_ruby_compile"
SWIG_RB_COMPILE=`echo "$SWIG_RB_COMPILE" | $SED -e 's/-ansi//'`
@@ -24582,36 +24593,36 @@ $as_echo "$svn_cv_ruby_compile" >&6; }
SWIG_RB_COMPILE=`echo "$SWIG_RB_COMPILE" | $SED -e 's/-std=c90//'`
- SWIG_RB_COMPILE="$SWIG_RB_COMPILE -Wno-int-to-pointer-cast"
+ SWIG_RB_COMPILE="$SWIG_RB_COMPILE -Wno-int-to-pointer-cast"
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking how to link Ruby extensions" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking how to link Ruby extensions" >&5
$as_echo_n "checking how to link Ruby extensions... " >&6; }
if ${svn_cv_ruby_link+:} false; then :
$as_echo_n "(cached) " >&6
else
- svn_cv_ruby_link="`$RUBY -e 'ARGV.shift; print ARGV.join(%q( ))' \
- $rbconfig_LDSHARED`"
- svn_cv_ruby_link="$rbconfig_CC $svn_cv_ruby_link"
- svn_cv_ruby_link="$svn_cv_ruby_link -shrext .$rbconfig_DLEXT"
+ svn_cv_ruby_link="`$RUBY -e 'ARGV.shift; print ARGV.join(%q( ))' \
+ $rbconfig_LDSHARED`"
+ svn_cv_ruby_link="$rbconfig_CC $svn_cv_ruby_link"
+ svn_cv_ruby_link="$svn_cv_ruby_link -shrext .$rbconfig_DLEXT"
fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $svn_cv_ruby_link" >&5
$as_echo "$svn_cv_ruby_link" >&6; }
- SWIG_RB_LINK="$svn_cv_ruby_link"
+ SWIG_RB_LINK="$svn_cv_ruby_link"
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking how to link Ruby libraries" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking how to link Ruby libraries" >&5
$as_echo_n "checking how to link Ruby libraries... " >&6; }
if ${ac_cv_ruby_libs+:} false; then :
$as_echo_n "(cached) " >&6
else
- ac_cv_ruby_libs="$rbconfig_LIBRUBYARG $rbconfig_LIBS"
+ ac_cv_ruby_libs="$rbconfig_LIBRUBYARG $rbconfig_LIBS"
fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_ruby_libs" >&5
$as_echo "$ac_cv_ruby_libs" >&6; }
- SWIG_RB_LIBS="`
+ SWIG_RB_LIBS="`
input_flags="$ac_cv_ruby_libs"
output_flags=""
filtered_dirs="/lib /lib64 /usr/lib /usr/lib64"
@@ -24632,11 +24643,11 @@ $as_echo "$ac_cv_ruby_libs" >&6; }
fi
`"
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for rb_errinfo" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for rb_errinfo" >&5
$as_echo_n "checking for rb_errinfo... " >&6; }
- old_CFLAGS="$CFLAGS"
- old_LIBS="$LIBS"
- CFLAGS="$CFLAGS $svn_cv_ruby_includes"
+ old_CFLAGS="$CFLAGS"
+ old_LIBS="$LIBS"
+ CFLAGS="$CFLAGS $svn_cv_ruby_includes"
CFLAGS=`echo "$CFLAGS" | $SED -e 's/-ansi//'`
@@ -24646,8 +24657,8 @@ $as_echo_n "checking for rb_errinfo... " >&6; }
CFLAGS=`echo "$CFLAGS" | $SED -e 's/-std=c90//'`
- LIBS="$SWIG_RB_LIBS"
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ LIBS="$SWIG_RB_LIBS"
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
#include <ruby.h>
@@ -24661,24 +24672,24 @@ else
fi
rm -f core conftest.err conftest.$ac_objext \
conftest$ac_exeext conftest.$ac_ext
- if test "$have_rb_errinfo" = "yes"; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+ if test "$have_rb_errinfo" = "yes"; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
$as_echo "yes" >&6; }
$as_echo "#define HAVE_RB_ERRINFO 1" >>confdefs.h
- else
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+ else
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
$as_echo "no" >&6; }
- fi
- CFLAGS="$old_CFLAGS"
- LIBS="$old_LIBS"
+ fi
+ CFLAGS="$old_CFLAGS"
+ LIBS="$old_LIBS"
- if ${svn_cv_ruby_sitedir+:} false; then :
+ if ${svn_cv_ruby_sitedir+:} false; then :
$as_echo_n "(cached) " >&6
else
- svn_cv_ruby_sitedir="$rbconfig_sitedir"
+ svn_cv_ruby_sitedir="$rbconfig_sitedir"
fi
@@ -24691,43 +24702,43 @@ else
fi
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking where to install Ruby scripts" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking where to install Ruby scripts" >&5
$as_echo_n "checking where to install Ruby scripts... " >&6; }
- if ${svn_cv_ruby_sitedir_libsuffix+:} false; then :
+ if ${svn_cv_ruby_sitedir_libsuffix+:} false; then :
$as_echo_n "(cached) " >&6
else
- svn_cv_ruby_sitedir_libsuffix="`echo "$rbconfig_sitelibdir" | \
- $SED -e "s,^$rbconfig_sitedir,,"`"
+ svn_cv_ruby_sitedir_libsuffix="`echo "$rbconfig_sitelibdir" | \
+ $SED -e "s,^$rbconfig_sitedir,,"`"
fi
- SWIG_RB_SITE_LIB_DIR="${svn_ruby_installdir}${svn_cv_ruby_sitedir_libsuffix}"
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $SWIG_RB_SITE_LIB_DIR" >&5
+ SWIG_RB_SITE_LIB_DIR="${svn_ruby_installdir}${svn_cv_ruby_sitedir_libsuffix}"
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $SWIG_RB_SITE_LIB_DIR" >&5
$as_echo "$SWIG_RB_SITE_LIB_DIR" >&6; }
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking where to install Ruby extensions" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking where to install Ruby extensions" >&5
$as_echo_n "checking where to install Ruby extensions... " >&6; }
- if ${svn_cv_ruby_sitedir_archsuffix+:} false; then :
+ if ${svn_cv_ruby_sitedir_archsuffix+:} false; then :
$as_echo_n "(cached) " >&6
else
- svn_cv_ruby_sitedir_archsuffix="`echo "$rbconfig_sitearchdir" | \
- $SED -e "s,^$rbconfig_sitedir,,"`"
+ svn_cv_ruby_sitedir_archsuffix="`echo "$rbconfig_sitearchdir" | \
+ $SED -e "s,^$rbconfig_sitedir,,"`"
fi
- SWIG_RB_SITE_ARCH_DIR="${svn_ruby_installdir}${svn_cv_ruby_sitedir_archsuffix}"
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $SWIG_RB_SITE_ARCH_DIR" >&5
+ SWIG_RB_SITE_ARCH_DIR="${svn_ruby_installdir}${svn_cv_ruby_sitedir_archsuffix}"
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $SWIG_RB_SITE_ARCH_DIR" >&5
$as_echo "$SWIG_RB_SITE_ARCH_DIR" >&6; }
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking how to use output level for Ruby bindings tests" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking how to use output level for Ruby bindings tests" >&5
$as_echo_n "checking how to use output level for Ruby bindings tests... " >&6; }
- if ${svn_cv_ruby_test_verbose+:} false; then :
+ if ${svn_cv_ruby_test_verbose+:} false; then :
$as_echo_n "(cached) " >&6
else
- svn_cv_ruby_test_verbose="normal"
+ svn_cv_ruby_test_verbose="normal"
fi
@@ -24739,10 +24750,9 @@ else
svn_ruby_test_verbose="$svn_cv_ruby_test_verbose"
fi
- SWIG_RB_TEST_VERBOSE="$svn_ruby_test_verbose"
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $SWIG_RB_TEST_VERBOSE" >&5
+ SWIG_RB_TEST_VERBOSE="$svn_ruby_test_verbose"
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $SWIG_RB_TEST_VERBOSE" >&5
$as_echo "$SWIG_RB_TEST_VERBOSE" >&6; }
- fi
fi
@@ -24852,69 +24862,70 @@ $as_echo "$as_me: WARNING: Detected SWIG version $SWIG
{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Subversion requires SWIG >= 1.3.24" >&5
$as_echo "$as_me: WARNING: Subversion requires SWIG >= 1.3.24" >&2;}
fi
+ fi
- SWIG_PY_COMPILE="none"
- SWIG_PY_LINK="none"
- if test "$PYTHON" != "none"; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: Configuring python swig binding" >&5
+ SWIG_PY_COMPILE="none"
+ SWIG_PY_LINK="none"
+ if test "$PYTHON" != "none"; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: Configuring python swig binding" >&5
$as_echo "$as_me: Configuring python swig binding" >&6;}
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for Python includes" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for Python includes" >&5
$as_echo_n "checking for Python includes... " >&6; }
if ${ac_cv_python_includes+:} false; then :
$as_echo_n "(cached) " >&6
else
- ac_cv_python_includes="`$PYTHON ${abs_srcdir}/build/get-py-info.py --includes`"
+ ac_cv_python_includes="`$PYTHON ${abs_srcdir}/build/get-py-info.py --includes`"
fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_python_includes" >&5
$as_echo "$ac_cv_python_includes" >&6; }
- SWIG_PY_INCLUDES="\$(SWIG_INCLUDES) $ac_cv_python_includes"
+ SWIG_PY_INCLUDES="\$(SWIG_INCLUDES) $ac_cv_python_includes"
- if test "$ac_cv_python_includes" = "none"; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: python bindings cannot be built without distutils module" >&5
+ if test "$ac_cv_python_includes" = "none"; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: python bindings cannot be built without distutils module" >&5
$as_echo "$as_me: WARNING: python bindings cannot be built without distutils module" >&2;}
- fi
+ fi
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for compiling Python extensions" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for compiling Python extensions" >&5
$as_echo_n "checking for compiling Python extensions... " >&6; }
if ${ac_cv_python_compile+:} false; then :
$as_echo_n "(cached) " >&6
else
- ac_cv_python_compile="`$PYTHON ${abs_srcdir}/build/get-py-info.py --compile`"
+ ac_cv_python_compile="`$PYTHON ${abs_srcdir}/build/get-py-info.py --compile`"
fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_python_compile" >&5
$as_echo "$ac_cv_python_compile" >&6; }
- SWIG_PY_COMPILE="$ac_cv_python_compile $CFLAGS"
+ SWIG_PY_COMPILE="$ac_cv_python_compile $CFLAGS"
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for linking Python extensions" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for linking Python extensions" >&5
$as_echo_n "checking for linking Python extensions... " >&6; }
if ${ac_cv_python_link+:} false; then :
$as_echo_n "(cached) " >&6
else
- ac_cv_python_link="`$PYTHON ${abs_srcdir}/build/get-py-info.py --link`"
+ ac_cv_python_link="`$PYTHON ${abs_srcdir}/build/get-py-info.py --link`"
fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_python_link" >&5
$as_echo "$ac_cv_python_link" >&6; }
- SWIG_PY_LINK="$ac_cv_python_link"
+ SWIG_PY_LINK="$ac_cv_python_link"
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for linking Python libraries" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for linking Python libraries" >&5
$as_echo_n "checking for linking Python libraries... " >&6; }
if ${ac_cv_python_libs+:} false; then :
$as_echo_n "(cached) " >&6
else
- ac_cv_python_libs="`$PYTHON ${abs_srcdir}/build/get-py-info.py --libs`"
+ ac_cv_python_libs="`$PYTHON ${abs_srcdir}/build/get-py-info.py --libs`"
fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_python_libs" >&5
$as_echo "$ac_cv_python_libs" >&6; }
- SWIG_PY_LIBS="`
+ SWIG_PY_LIBS="`
input_flags="$ac_cv_python_libs"
output_flags=""
filtered_dirs="/lib /lib64 /usr/lib /usr/lib64"
@@ -24935,19 +24946,19 @@ $as_echo "$ac_cv_python_libs" >&6; }
fi
`"
- SVN_PYCFMT_SAVE_CPPFLAGS="$CPPFLAGS"
- CPPFLAGS="$CPPFLAGS $SVN_APR_INCLUDES"
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for apr_int64_t Python/C API format string" >&5
+ SVN_PYCFMT_SAVE_CPPFLAGS="$CPPFLAGS"
+ CPPFLAGS="$CPPFLAGS $SVN_APR_INCLUDES"
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for apr_int64_t Python/C API format string" >&5
$as_echo_n "checking for apr_int64_t Python/C API format string... " >&6; }
if ${svn_cv_pycfmt_apr_int64_t+:} false; then :
$as_echo_n "(cached) " >&6
else
- if test "x$svn_cv_pycfmt_apr_int64_t" = "x"; then
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ if test "x$svn_cv_pycfmt_apr_int64_t" = "x"; then
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
#include <apr.h>
- MaTcHtHiS APR_INT64_T_FMT EnDeNd
+ MaTcHtHiS APR_INT64_T_FMT EnDeNd
_ACEOF
if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
$EGREP "MaTcHtHiS +\"lld\" +EnDeNd" >/dev/null 2>&1; then :
@@ -24955,13 +24966,13 @@ if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
fi
rm -f conftest*
- fi
- if test "x$svn_cv_pycfmt_apr_int64_t" = "x"; then
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ fi
+ if test "x$svn_cv_pycfmt_apr_int64_t" = "x"; then
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
r
- #include <apr.h>
- MaTcHtHiS APR_INT64_T_FMT EnDeNd
+ #include <apr.h>
+ MaTcHtHiS APR_INT64_T_FMT EnDeNd
_ACEOF
if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
$EGREP "MaTcHtHiS +\"ld\" +EnDeNd" >/dev/null 2>&1; then :
@@ -24969,12 +24980,12 @@ if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
fi
rm -f conftest*
- fi
- if test "x$svn_cv_pycfmt_apr_int64_t" = "x"; then
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ fi
+ if test "x$svn_cv_pycfmt_apr_int64_t" = "x"; then
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
#include <apr.h>
- MaTcHtHiS APR_INT64_T_FMT EnDeNd
+ MaTcHtHiS APR_INT64_T_FMT EnDeNd
_ACEOF
if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
$EGREP "MaTcHtHiS +\"d\" +EnDeNd" >/dev/null 2>&1; then :
@@ -24982,32 +24993,32 @@ if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
fi
rm -f conftest*
- fi
+ fi
fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $svn_cv_pycfmt_apr_int64_t" >&5
$as_echo "$svn_cv_pycfmt_apr_int64_t" >&6; }
- CPPFLAGS="$SVN_PYCFMT_SAVE_CPPFLAGS"
- if test "x$svn_cv_pycfmt_apr_int64_t" = "x"; then
- as_fn_error $? "failed to recognize APR_INT64_T_FMT on this platform" "$LINENO" 5
- fi
+ CPPFLAGS="$SVN_PYCFMT_SAVE_CPPFLAGS"
+ if test "x$svn_cv_pycfmt_apr_int64_t" = "x"; then
+ as_fn_error $? "failed to recognize APR_INT64_T_FMT on this platform" "$LINENO" 5
+ fi
cat >>confdefs.h <<_ACEOF
#define SVN_APR_INT64_T_PYCFMT "$svn_cv_pycfmt_apr_int64_t"
_ACEOF
- fi
+ fi
- if test "$PERL" != "none"; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking perl version" >&5
+ if test "$PERL" != "none"; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking perl version" >&5
$as_echo_n "checking perl version... " >&6; }
- PERL_VERSION="`$PERL -e 'q([); print $] * 1000000,$/;'`"
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PERL_VERSION" >&5
+ PERL_VERSION="`$PERL -e 'q([); print $] * 1000000,$/;'`"
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PERL_VERSION" >&5
$as_echo "$PERL_VERSION" >&6; }
- if test "$PERL_VERSION" -ge "5008000"; then
- SWIG_PL_INCLUDES="\$(SWIG_INCLUDES) `$PERL -MExtUtils::Embed -e ccopts`"
- SWIG_PL_LINK="`$PERL -MExtUtils::Embed -e ldopts`"
- SWIG_PL_LINK="`
+ if test "$PERL_VERSION" -ge "5008000"; then
+ SWIG_PL_INCLUDES="\$(SWIG_INCLUDES) `$PERL -MExtUtils::Embed -e ccopts`"
+ SWIG_PL_LINK="`$PERL -MExtUtils::Embed -e ldopts`"
+ SWIG_PL_LINK="`
input_flags="$SWIG_PL_LINK"
output_flags=""
filtered_dirs="/lib /lib64 /usr/lib /usr/lib64"
@@ -25027,61 +25038,61 @@ $as_echo "$PERL_VERSION" >&6; }
printf "%s" "${output_flags# }"
fi
`"
- else
- { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: perl bindings require perl 5.8.0 or newer." >&5
+ else
+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: perl bindings require perl 5.8.0 or newer." >&5
$as_echo "$as_me: WARNING: perl bindings require perl 5.8.0 or newer." >&2;}
- fi
fi
+ fi
- SWIG_RB_COMPILE="none"
- SWIG_RB_LINK="none"
- if test "$RUBY" != "none"; then
- rbconfig="$RUBY -rrbconfig -e "
+ SWIG_RB_COMPILE="none"
+ SWIG_RB_LINK="none"
+ if test "$RUBY" != "none"; then
+ rbconfig="$RUBY -rrbconfig -e "
- for var_name in arch archdir CC LDSHARED DLEXT LIBS LIBRUBYARG \
- rubyhdrdir rubyarchhdrdir sitedir sitelibdir sitearchdir libdir
- do
- rbconfig_tmp=`$rbconfig "print RbConfig::CONFIG['$var_name']"`
- eval "rbconfig_$var_name=\"$rbconfig_tmp\""
- done
+ for var_name in arch archdir CC LDSHARED DLEXT LIBS LIBRUBYARG \
+ rubyhdrdir rubyarchhdrdir sitedir sitelibdir sitearchdir libdir
+ do
+ rbconfig_tmp=`$rbconfig "print RbConfig::CONFIG['$var_name']"`
+ eval "rbconfig_$var_name=\"$rbconfig_tmp\""
*** DIFF OUTPUT TRUNCATED AT 1000 LINES ***
More information about the svn-src-vendor
mailing list