summaryrefslogtreecommitdiffstats
path: root/contrib/subversion/autogen.sh
diff options
context:
space:
mode:
authorpeter <peter@FreeBSD.org>2015-10-12 09:53:55 +0000
committerpeter <peter@FreeBSD.org>2015-10-12 09:53:55 +0000
commitb6c77895261859228cc9fa0664e09fbea060e104 (patch)
tree64ec78831396b65233663ebce29e8f389059bb8d /contrib/subversion/autogen.sh
parent67366adb20c44f7e7f9f3739419e8a0a82157433 (diff)
parentc18b5d7f26f112be58bb1c4660799dea49f219ba (diff)
downloadFreeBSD-src-b6c77895261859228cc9fa0664e09fbea060e104.zip
FreeBSD-src-b6c77895261859228cc9fa0664e09fbea060e104.tar.gz
Update from svn-1.8.14 to 1.9.2.
Formal release notes are available: https://subversion.apache.org/docs/release-notes/1.9.html Of particular note, the client checkout format has *not* changed so upgrades should *not* be required. When reading a repository (file:// or running as a local server), an improved fsfs version 7 is available with significant performance improvements. An optional upgrade is possible to use the new features. Without the upgrade, this is fully read/write compatible with the version 6 fsfs as in svn-1.8. Relnotes: yes
Diffstat (limited to 'contrib/subversion/autogen.sh')
-rwxr-xr-xcontrib/subversion/autogen.sh11
1 files changed, 6 insertions, 5 deletions
diff --git a/contrib/subversion/autogen.sh b/contrib/subversion/autogen.sh
index 83b6364..e1961d6 100755
--- a/contrib/subversion/autogen.sh
+++ b/contrib/subversion/autogen.sh
@@ -63,7 +63,8 @@ done
# ### APR's libtool. deferring to a second round of change...
#
-libtoolize="`./build/PrintPath glibtoolize libtoolize libtoolize15`"
+# Much like APR except we do not prefer libtool 1 over libtool 2.
+libtoolize="`./build/PrintPath glibtoolize libtoolize glibtoolize1 libtoolize15 libtoolize14`"
lt_major_version=`$libtoolize --version 2>/dev/null | sed -e 's/^[^0-9]*//' -e 's/\..*//' -e '/^$/d' -e 1q`
if [ "x$libtoolize" = "x" ]; then
@@ -156,11 +157,11 @@ fi
#
# Note: this dependency on Python is fine: only SVN developers use autogen.sh
# and we can state that dev people need Python on their machine. Note
-# that running gen-make.py requires Python 2.5 or newer.
+# that running gen-make.py requires Python 2.7 or newer.
PYTHON="`./build/find_python.sh`"
if test -z "$PYTHON"; then
- echo "Python 2.5 or later is required to run autogen.sh"
+ echo "Python 2.7 or later is required to run autogen.sh"
echo "If you have a suitable Python installed, but not on the"
echo "PATH, set the environment variable PYTHON to the full path"
echo "to the Python executable, and re-run autogen.sh"
@@ -204,7 +205,7 @@ fi
echo "Creating svn_private_config.h.in..."
${AUTOHEADER:-autoheader}
-# If there's a config.cache file, we may need to delete it.
+# If there's a config.cache file, we may need to delete it.
# If we have an existing configure script, save a copy for comparison.
if [ -f config.cache ] && [ -f configure ]; then
cp configure configure.$$.tmp
@@ -239,7 +240,7 @@ echo "./configure --enable-maintainer-mode"
echo "./configure --disable-shared"
echo "./configure --enable-maintainer-mode --disable-shared"
echo "./configure --disable-optimize --enable-debug"
-echo "./configure CUSERFLAGS='--flags-for-C' CXXUSERFLAGS='--flags-for-C++'"
+echo "./configure CFLAGS='--flags-for-C' CXXFLAGS='--flags-for-C++'"
echo ""
echo "Note: If you wish to run a Subversion HTTP server, you will need"
echo "Apache 2.x. See the INSTALL file for details."
OpenPOWER on IntegriCloud