1berry/ruby
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

* confiure.in: new --with-ext and --with-out-ext options for extmk.

Browse Source 
* tool/mkconfig.rb: normalizing --with-out-ext to --without-ext.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@26706 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
muraken 2010-02-18 13:33:25 +00:00
parent e8665a6bc2
commit a8fcae0858
3 changed files with 15 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ChangeLog
View File

@ -1,3 +1,8 @@
Thu Feb 18 22:28:00 2010 Kenta Murata <mrkn@mrkn.jp>
* confiure.in: new --with-ext and --with-out-ext options for extmk.
* tool/mkconfig.rb: normalizing --with-out-ext to --without-ext.
Thu Feb 18 21:50:00 2010 Tanaka Akira <akr@fsij.org> Thu Feb 18 21:50:00 2010 Tanaka Akira <akr@fsij.org>
* pack.c (pack_unpack): call PACK_ITEM_ADJUST for 'Q'. * pack.c (pack_unpack): call PACK_ITEM_ADJUST for 'Q'.

6
configure.in
View File

@ -1918,6 +1918,12 @@ AS_CASE(["$target_os"],
[nextstep* | openstep* | rhapsody* | darwin*], [ [nextstep* | openstep* | rhapsody* | darwin*], [
STRIP='strip -A -n']) STRIP='strip -A -n'])
AC_ARG_WITH(ext,
AC_HELP_STRING([--with-ext=EXTS],
[pass to --with-ext option of extmk.rb]))
AC_ARG_WITH(out-ext,
AC_HELP_STRING([--with-out-ext=EXTS],
[pass to --without-ext option of extmk.rb]))
EXTSTATIC= EXTSTATIC=
AC_SUBST(EXTSTATIC)dnl AC_SUBST(EXTSTATIC)dnl
AC_ARG_WITH(static-linked-ext, AC_ARG_WITH(static-linked-ext,

5
tool/mkconfig.rb
View File

@ -111,7 +111,10 @@ File.foreach "config.status" do |line|
end end
end end
end end
val.gsub!(/ +(?!-)/, "=") if name == "configure_args" && /mswin32/ =~ RUBY_PLATFORM if name == "configure_args"
val.gsub!(/ +(?!-)/, "=") if /mswin32/ =~ RUBY_PLATFORM
val.gsub!(/--with-out-ext/, "--without-ext")
end
val = val.gsub(/\$(?:\$|\{?(\w+)\}?)/) {$1 ? "$(#{$1})" : $&}.dump val = val.gsub(/\$(?:\$|\{?(\w+)\}?)/) {$1 ? "$(#{$1})" : $&}.dump
if /^prefix$/ =~ name if /^prefix$/ =~ name
val = "(TOPDIR || DESTDIR + #{val})" val = "(TOPDIR || DESTDIR + #{val})"