diff options
| author | yugui <yugui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2009-01-17 12:19:36 +0000 |
|---|---|---|
| committer | yugui <yugui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2009-01-17 12:19:36 +0000 |
| commit | 0962222856126aa7b1f5763ed48751cd700e9359 (patch) | |
| tree | 8948621a9bcff4342c35441d57a6e592e0c9c247 /configure.in | |
| parent | f1211dd405e78dfd3afba008598e91284cacbf69 (diff) | |
merges r21602, r21603, r21607 and r21630 from trunk into ruby_1_9_1.
* configure.in (Makefile): set VCS and VCSUP to support `git svn' and git.
* Makefile.in, win32/Makefile.sub (up): split from common.mk.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_1@21631 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'configure.in')
| -rw-r--r-- | configure.in | 15 |
1 files changed, 14 insertions, 1 deletions
diff --git a/configure.in b/configure.in index 5601e9a408..de740bab99 100644 --- a/configure.in +++ b/configure.in @@ -2137,7 +2137,20 @@ AC_SUBST(BUILTIN_TRANSOBJS) AC_CONFIG_FILES($FIRSTMAKEFILE) AC_CONFIG_FILES(Makefile, [{ - sed '/^MISSING/s/\$U\././g' Makefile + if test -d "$srcdir/.svn"; then + VCS='svn' + VCSUP='$(VCS) up $(SVNUPOPTIONS)' + elif test -d "$srcdir/.git/svn"; then + VCS='git svn' + VCSUP='$(VCS) rebase $(GITSVNREBASEOPTIONS)' + elif test -d "$srcdir/.git"; then + VCS='git' + VCSUP='$(VCS) pull $(GITPULLOPTIONS)' + else + VCS='echo cannot' + VCSUP='$(VCS)' + fi + sed '/^MISSING/s/\$U\././g;/^VCS *=/s#@VCS@#'"$VCS"'#;/^VCSUP *=/s#@VCSUP@#'"$VCSUP"'#' Makefile echo; test x"$EXEEXT" = x || echo 'miniruby: miniruby$(EXEEXT)' test "$RUBY_INSTALL_NAME$EXEEXT" = ruby || echo 'ruby: $(PROGRAM);' if test "$gnumake" != yes; then |