ruby-changes:23055
From: nobu <ko1@a...>
Date: Thu, 22 Mar 2012 14:59:59 +0900 (JST)
Subject: [ruby-changes:23055] nobu:r35105 (trunk): * configure.in (Makefile): check with svn info, since svn 1.7 doesn't
nobu 2012-03-22 14:59:48 +0900 (Thu, 22 Mar 2012) New Revision: 35105 http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=rev&revision=35105 Log: * configure.in (Makefile): check with svn info, since svn 1.7 doesn't have .svn under descendent directories. Modified files: trunk/configure.in Index: configure.in =================================================================== --- configure.in (revision 35104) +++ configure.in (revision 35105) @@ -3051,19 +3051,22 @@ AC_CONFIG_FILES($FIRSTMAKEFILE) 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' - 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 + 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 echo; test x"$EXEEXT" = x || echo 'miniruby: miniruby$(EXEEXT)' if test "$gnumake" != yes; then -- ML: ruby-changes@q... Info: http://www.atdot.net/~ko1/quickml/