You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@subversion.apache.org by sv...@apache.org on 2018/11/03 04:00:25 UTC
svn commit: r1845643 - in /subversion/branches/1.11.x: ./ STATUS configure.ac
Author: svn-role
Date: Sat Nov 3 04:00:24 2018
New Revision: 1845643
URL: http://svn.apache.org/viewvc?rev=1845643&view=rev
Log:
Merge r1845555 from trunk:
* r1845555
Use $PYTHON in configure.ac to run build/getversion.py
Justification:
Fixes build on systems without python in $PATH
Votes:
+1: jorton, brane, rhuijben
Modified:
subversion/branches/1.11.x/ (props changed)
subversion/branches/1.11.x/STATUS
subversion/branches/1.11.x/configure.ac
Propchange: subversion/branches/1.11.x/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sat Nov 3 04:00:24 2018
@@ -100,4 +100,4 @@
/subversion/branches/verify-at-commit:1462039-1462408
/subversion/branches/verify-keep-going:1439280-1546110
/subversion/branches/wc-collate-path:1402685-1480384
-/subversion/trunk:1840990-1840991,1840995,1840997,1841059,1841079,1841091,1841098,1841136,1841180,1841272,1841481,1841524-1841525,1841567,1841600-1841602,1841606,1841719,1841725,1841731,1841736,1841742-1841743,1841753-1841754,1841822,1841850,1841867,1842090,1842222-1842223,1842334,1842814,1842827,1842829,1842877,1843888,1844882,1845204,1845261
+/subversion/trunk:1840990-1840991,1840995,1840997,1841059,1841079,1841091,1841098,1841136,1841180,1841272,1841481,1841524-1841525,1841567,1841600-1841602,1841606,1841719,1841725,1841731,1841736,1841742-1841743,1841753-1841754,1841822,1841850,1841867,1842090,1842222-1842223,1842334,1842814,1842827,1842829,1842877,1843888,1844882,1845204,1845261,1845555
Modified: subversion/branches/1.11.x/STATUS
URL: http://svn.apache.org/viewvc/subversion/branches/1.11.x/STATUS?rev=1845643&r1=1845642&r2=1845643&view=diff
==============================================================================
--- subversion/branches/1.11.x/STATUS (original)
+++ subversion/branches/1.11.x/STATUS Sat Nov 3 04:00:24 2018
@@ -57,10 +57,3 @@ Approved changes:
Cleaner build logs.
Votes:
+1: jorton, brane, rhuijben
-
- * r1845555
- Use $PYTHON in configure.ac to run build/getversion.py
- Justification:
- Fixes build on systems without python in $PATH
- Votes:
- +1: jorton, brane, rhuijben
Modified: subversion/branches/1.11.x/configure.ac
URL: http://svn.apache.org/viewvc/subversion/branches/1.11.x/configure.ac?rev=1845643&r1=1845642&r2=1845643&view=diff
==============================================================================
--- subversion/branches/1.11.x/configure.ac (original)
+++ subversion/branches/1.11.x/configure.ac Sat Nov 3 04:00:24 2018
@@ -23,7 +23,7 @@ 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)],
+ [esyscmd($PYTHON build/getversion.py SVN subversion/include/svn_version.h)],
[http://subversion.apache.org/])
AC_CONFIG_SRCDIR(subversion/include/svn_types.h)