Author: svn-role
Date: Tue Mar 29 04:01:16 2022
New Revision: 1899338
URL: http://svn.apache.org/viewvc?rev=1899338&view=rev
Log:
Merge r1875602 from trunk:
* r1875602
Remove incorrect include paths from svn_cv_ruby_includes.
Justification:
Fixes building with latest Ruby
Votes:
+1: jamessan, stsp, markphip
Modified:
subversion/branches/1.10.x/ (props changed)
subversion/branches/1.10.x/STATUS
subversion/branches/1.10.x/build/ac-macros/swig.m4
Propchange: subversion/branches/1.10.x/
------------------------------------------------------------------------------
Merged /subversion/trunk:r1875602
Modified: subversion/branches/1.10.x/STATUS
URL:
http://svn.apache.org/viewvc/subversion/branches/1.10.x/STATUS?rev=1899338&r1=1899337&r2=1899338&view=diff
==============================================================================
--- subversion/branches/1.10.x/STATUS (original)
+++ subversion/branches/1.10.x/STATUS Tue Mar 29 04:01:16 2022
@@ -30,10 +30,3 @@ Veto-blocked changes:
Approved changes:
=================
-
- * r1875602
- Remove incorrect include paths from svn_cv_ruby_includes.
- Justification:
- Fixes building with latest Ruby
- Votes:
- +1: jamessan, stsp, markphip
Modified: subversion/branches/1.10.x/build/ac-macros/swig.m4
URL:
http://svn.apache.org/viewvc/subversion/branches/1.10.x/build/ac-macros/swig.m4?rev=1899338&r1=1899337&r2=1899338&view=diff
==============================================================================
--- subversion/branches/1.10.x/build/ac-macros/swig.m4 (original)
+++ subversion/branches/1.10.x/build/ac-macros/swig.m4 Tue Mar 29 04:01:16 2022
@@ -162,7 +162,7 @@ AC_DEFUN(SVN_FIND_SWIG,
AC_CACHE_CHECK([for Ruby include path], [svn_cv_ruby_includes],[
if test -d "$rbconfig_rubyhdrdir"; then
dnl Ruby >=1.9
- svn_cv_ruby_includes="-I. -I$rbconfig_rubyhdrdir
-I$rbconfig_rubyhdrdir/ruby -I$rbconfig_rubyhdrdir/ruby/backward"
+ svn_cv_ruby_includes="-I. -I$rbconfig_rubyhdrdir"
if test -d "$rbconfig_rubyarchhdrdir"; then
dnl Ruby >=2.0
svn_cv_ruby_includes="$svn_cv_ruby_includes -I$rbconfig_rubyarchhdrdir"
