While you're changing this, should we also try to prefer rdoc1.8 of
'ruby1.8' is found?
This will matter once we re-add 1.9 support to those AC_PATH_PROPS lines.
arfrever_at_apache.org wrote on Thu, Jul 14, 2011 at 21:15:52 -0000:
> Author: arfrever
> Date: Thu Jul 14 21:15:51 2011
> New Revision: 1146899
>
> URL: http://svn.apache.org/viewvc?rev=1146899&view=rev
> Log:
> * configure.ac: If RUBY or RDOC environmental variables are set to non-empty
> values, then use only them and don't use other hardcoded values. This change
> also improves output of `configure` in situation when these variables are
> not set.
>
> Modified:
> subversion/trunk/configure.ac
>
> Modified: subversion/trunk/configure.ac
> URL: http://svn.apache.org/viewvc/subversion/trunk/configure.ac?rev=1146899&r1=1146898&r2=1146899&view=diff
> ==============================================================================
> --- subversion/trunk/configure.ac (original)
> +++ subversion/trunk/configure.ac Thu Jul 14 21:15:51 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))'`"
> ])
>
>
Received on 2011-07-15 08:12:52 CEST