subversion-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From s...@apache.org
Subject svn commit: r1132376 - /subversion/trunk/configure.ac
Date Sun, 05 Jun 2011 12:11:02 GMT
Author: stsp
Date: Sun Jun  5 12:11:02 2011
New Revision: 1132376

URL: http://svn.apache.org/viewvc?rev=1132376&view=rev
Log:
* configure.ac: Instead of looking for ruby18 and ruby1.8, check the $RUBY
   environment variable before looking for the 'ruby' executable.
   Do the same for rdoc. This allows packagers to override the name of
   these executables without patching the configure script, and does not
   interfere with users who provide their preferred 'ruby' executable in $PATH.

Suggested by: arfrever

Modified:
    subversion/trunk/configure.ac

Modified: subversion/trunk/configure.ac
URL: http://svn.apache.org/viewvc/subversion/trunk/configure.ac?rev=1132376&r1=1132375&r2=1132376&view=diff
==============================================================================
--- subversion/trunk/configure.ac (original)
+++ subversion/trunk/configure.ac Sun Jun  5 12:11:02 2011
@@ -1085,12 +1085,12 @@ SVN_CHECK_JDK($JAVA_OLDEST_WORKING_VER)
 
 AC_PATH_PROG(PERL, perl, none)
 
-AC_PATH_PROGS(RUBY, ruby1.8 ruby18 ruby, none)
+AC_PATH_PROGS(RUBY, $RUBY ruby, 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, rdoc1.8 rdoc18 rdoc, none)
+    AC_PATH_PROGS(RDOC, $RDOC rdoc, 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))'`"
     ])



Mime
View raw message