diff options
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | configure.in | 6 | ||||
| -rwxr-xr-x | tool/mkconfig.rb | 5 |
3 files changed, 15 insertions, 1 deletions
@@ -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> * pack.c (pack_unpack): call PACK_ITEM_ADJUST for 'Q'. diff --git a/configure.in b/configure.in index 513898d3c7..4542bda2e4 100644 --- a/configure.in +++ b/configure.in @@ -1918,6 +1918,12 @@ AS_CASE(["$target_os"], [nextstep* | openstep* | rhapsody* | darwin*], [ 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= AC_SUBST(EXTSTATIC)dnl AC_ARG_WITH(static-linked-ext, diff --git a/tool/mkconfig.rb b/tool/mkconfig.rb index df3c35fb80..ac24821829 100755 --- a/tool/mkconfig.rb +++ b/tool/mkconfig.rb @@ -111,7 +111,10 @@ File.foreach "config.status" do |line| 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 if /^prefix$/ =~ name val = "(TOPDIR || DESTDIR + #{val})" |