Author: danielsh
Date: Sun Jun  5 17:52:55 2011
New Revision: 1132464

URL: http://svn.apache.org/viewvc?rev=1132464&view=rev
Log:
* configure.ac (RUBY):
   Look for version-named ruby,rdoc binaries.
   While here, fix a quoting issue with the $RUBY variable.

Modified:
    subversion/trunk/configure.ac

Modified: subversion/trunk/configure.ac
URL: 
http://svn.apache.org/viewvc/subversion/trunk/configure.ac?rev=1132464&r1=1132463&r2=1132464&view=diff
==============================================================================
--- subversion/trunk/configure.ac (original)
+++ subversion/trunk/configure.ac Sun Jun  5 17:52:55 2011
@@ -1085,12 +1085,12 @@ SVN_CHECK_JDK($JAVA_OLDEST_WORKING_VER)
 
 AC_PATH_PROG(PERL, perl, none)
 
-AC_PATH_PROGS(RUBY, $RUBY ruby, none)
+AC_PATH_PROGS(RUBY, "$RUBY" ruby ruby1.9 ruby19 ruby1.8 ruby18, none)
 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, none)
+    AC_PATH_PROGS(RDOC, "$RDOC" rdoc rdoc1.9 rdoc19 rdoc1.8 rdoc18, none)
     AC_CACHE_CHECK([for Ruby major version], [svn_cv_ruby_major],[
     svn_cv_ruby_major="`$RUBY -rrbconfig -e 'print 
Config::CONFIG.fetch(%q(MAJOR))'`"
     ])


Reply via email to