subversion-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From hwri...@apache.org
Subject svn commit: r1147406 - in /subversion/branches/1.7.x: ./ STATUS configure.ac
Date Sat, 16 Jul 2011 11:49:04 GMT
Author: hwright
Date: Sat Jul 16 11:49:03 2011
New Revision: 1147406

URL: http://svn.apache.org/viewvc?rev=1147406&view=rev
Log:
Merge r1146899 from trunk:

 * r1146899
   Improve configure detection of Ruby.
   Justification:
     Saner configure output, and don't override user's choice of a ruby when
     multiple are available.
   Votes:
     +1: arfrever, danielsh, julianfoad

Modified:
    subversion/branches/1.7.x/   (props changed)
    subversion/branches/1.7.x/STATUS
    subversion/branches/1.7.x/configure.ac

Propchange: subversion/branches/1.7.x/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sat Jul 16 11:49:03 2011
@@ -53,4 +53,4 @@
 /subversion/branches/tree-conflicts:868291-873154
 /subversion/branches/tree-conflicts-notify:873926-874008
 /subversion/branches/uris-as-urls:1060426-1064427
-/subversion/trunk:1146013,1146219,1146222,1146274,1146492,1146555,1146620,1146684,1146832,1146834
+/subversion/trunk:1146013,1146219,1146222,1146274,1146492,1146555,1146620,1146684,1146832,1146834,1146899

Modified: subversion/branches/1.7.x/STATUS
URL: http://svn.apache.org/viewvc/subversion/branches/1.7.x/STATUS?rev=1147406&r1=1147405&r2=1147406&view=diff
==============================================================================
--- subversion/branches/1.7.x/STATUS (original)
+++ subversion/branches/1.7.x/STATUS Sat Jul 16 11:49:03 2011
@@ -45,14 +45,6 @@ Candidate changes:
 Approved changes:
 =================
 
- * r1146899
-   Improve configure detection of Ruby.
-   Justification:
-     Saner configure output, and don't override user's choice of a ruby when
-     multiple are available.
-   Votes:
-     +1: arfrever, danielsh, julianfoad
-
  * r1146904
    Fix the 'extraclean' target of the Makefile to remove config.{guess,sub}
    Justification:

Modified: subversion/branches/1.7.x/configure.ac
URL: http://svn.apache.org/viewvc/subversion/branches/1.7.x/configure.ac?rev=1147406&r1=1147405&r2=1147406&view=diff
==============================================================================
--- subversion/branches/1.7.x/configure.ac (original)
+++ subversion/branches/1.7.x/configure.ac Sat Jul 16 11:49:03 2011
@@ -1106,12 +1106,20 @@ SVN_CHECK_JDK($JAVA_OLDEST_WORKING_VER)
 
 AC_PATH_PROG(PERL, perl, none)
 
-AC_PATH_PROGS(RUBY, "$RUBY" ruby ruby1.8 ruby18, none)
+if test -n "$RUBY"; then
+  AC_PATH_PROG(RUBY, "$RUBY", none)
+else
+  AC_PATH_PROGS(RUBY, ruby ruby1.8 ruby18, none)
+fi
 if test "$RUBY" != "none"; then
   AC_MSG_CHECKING([rb_hash_foreach])
   if "$RUBY" -r mkmf -e 'exit(have_func("rb_hash_foreach") ? 0 : 1)' >/dev/null; then
     AC_MSG_RESULT([yes])
-    AC_PATH_PROGS(RDOC, "$RDOC" rdoc rdoc1.8 rdoc18, none)
+    if test -n "$RDOC"; then
+      AC_PATH_PROG(RDOC, "$RDOC", none)
+    else
+      AC_PATH_PROGS(RDOC, rdoc rdoc1.8 rdoc18, none)
+    fi
     AC_CACHE_CHECK([for Ruby major version], [svn_cv_ruby_major],[
     svn_cv_ruby_major="`$RUBY -rrbconfig -e 'print Config::CONFIG.fetch(%q(MAJOR))'`"
     ])



Mime
View raw message