kotovalexarian-likes-github/ruby--ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2022-11-09 12:17:21 -05:00
Code Releases Activity

* configure.in (Makefile): check with svn info, since svn 1.7 doesn't

Browse source 
have .svn under descendent directories.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@35105 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
nobu 2012-03-22 05:59:48 +00:00
parent 11c57111f9
commit cd71db0ad6
1 changed files with 8 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
configure.in
View file

@ -3051,19 +3051,22 @@ AS_CASE([" $CPP "], [*" $CC "*], [CPP=`echo " $CPP " | sed "s| $CC |"' $(CC) |;s
AC_CONFIG_FILES($FIRSTMAKEFILE) AC_CONFIG_FILES($FIRSTMAKEFILE)
AC_CONFIG_FILES(Makefile, [{ AC_CONFIG_FILES(Makefile, [{
if test -d "$srcdir/.svn"; then if ${VCS+set}; then
:
elif svn info "$srcdir" > /dev/null 2>&1; then
VCS='svn' VCS='svn'
VCSUP='$(VCS) up $(SVNUPOPTIONS)'
elif test -d "$srcdir/.git/svn"; then elif test -d "$srcdir/.git/svn"; then
VCS='git svn' VCS='git svn'
VCSUP='$(VCS) rebase $(GITSVNREBASEOPTIONS)'
elif test -d "$srcdir/.git"; then elif test -d "$srcdir/.git"; then
VCS='git' VCS='git'
VCSUP='$(VCS) pull $(GITPULLOPTIONS)'
else else
VCS='echo cannot' VCS='echo cannot'
VCSUP='$(VCS)'
fi fi
AS_CASE("$VCS",
[svn], [VCSUP='$(VCS) up $(SVNUPOPTIONS)'],
["git svn"], [VCSUP='$(VCS) rebase $(GITSVNREBASEOPTIONS)'],
[git], [VCSUP='$(VCS) pull $(GITPULLOPTIONS)'],
[VCSUP='$(VCS)'])
sed '/^MISSING/s/\$U\././g;/^VCS *=/s#@VCS@#'"$VCS"'#;/^VCSUP *=/s#@VCSUP@#'"$VCSUP"'#' Makefile sed '/^MISSING/s/\$U\././g;/^VCS *=/s#@VCS@#'"$VCS"'#;/^VCSUP *=/s#@VCSUP@#'"$VCSUP"'#' Makefile
echo; test x"$EXEEXT" = x || echo 'miniruby: miniruby$(EXEEXT)' echo; test x"$EXEEXT" = x || echo 'miniruby: miniruby$(EXEEXT)'
if test "$gnumake" != yes; then if test "$gnumake" != yes; then