From 79f2ee2f0411c1d10ceefc869a32925d39171b1a Mon Sep 17 00:00:00 2001 From: eban Date: Thu, 24 May 2001 07:13:56 +0000 Subject: [PATCH] * mkconfig.rb: autoconf 2.50 support. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@1445 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ChangeLog | 4 ++++ mkconfig.rb | 4 ++-- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 278d921693..814b4f937e 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +Thu May 24 16:08:21 2001 WATANABE Hirofumi + + * mkconfig.rb: autoconf 2.50 support. + Thu May 24 14:23:35 2001 Yukihiro Matsumoto * eval.c (rb_yield_0): need argument adjustment for C defined diff --git a/mkconfig.rb b/mkconfig.rb index 721cd3f67d..14e5829f53 100644 --- a/mkconfig.rb +++ b/mkconfig.rb @@ -48,7 +48,7 @@ File.foreach "config.status" do |line| v_others << v end has_version = true if name == "MAJOR" - elsif /^ac_given_srcdir=(.*)/ =~ line + elsif /^(?:ac_given_)srcdir=(.*)/ =~ line v_fast << " CONFIG[\"srcdir\"] = \"" + File.expand_path($1) + "\"\n" has_srcdir = true elsif /^ac_given_INSTALL=(.*)/ =~ line @@ -58,7 +58,7 @@ File.foreach "config.status" do |line| end if not has_srcdir - v_fast << " CONFIG[\"srcdir\"] = \"" + File.expand_path(srcdir) + "\"\n" + v_fast << " CONFIG[\"srcdir\"] = \"" + File.expand_path(srcdir || '.') + "\"\n" end if not has_version