configure.in: RUBY_RM_RECURSIVE
* configure.in (RUBY_RM_RECURSIVE): this hack is needed by only autoconf 2.69 or earlier on darwin. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@40454 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
parent
096d52733b
commit
2667cb2d98
@ -1,3 +1,8 @@
|
|||||||
|
Thu Apr 25 02:23:28 2013 Nobuyoshi Nakada <nobu@ruby-lang.org>
|
||||||
|
|
||||||
|
* configure.in (RUBY_RM_RECURSIVE): this hack is needed by only
|
||||||
|
autoconf 2.69 or earlier on darwin.
|
||||||
|
|
||||||
Thu Apr 25 01:22:41 2013 Nobuyoshi Nakada <nobu@ruby-lang.org>
|
Thu Apr 25 01:22:41 2013 Nobuyoshi Nakada <nobu@ruby-lang.org>
|
||||||
|
|
||||||
* lib/tracer.rb (get_line): simply read by File.readlines.
|
* lib/tracer.rb (get_line): simply read by File.readlines.
|
||||||
|
@ -11,10 +11,13 @@ AC_DEFUN([RUBY_PREREQ_AC],
|
|||||||
|
|
||||||
AC_DISABLE_OPTION_CHECKING
|
AC_DISABLE_OPTION_CHECKING
|
||||||
|
|
||||||
|
AC_DEFUN([RUBY_RM_RECURSIVE], [
|
||||||
|
m4_if(m4_version_compare(m4_defn([m4_PACKAGE_VERSION]), [2.70]), [-1], [
|
||||||
# suppress error messages, rm: cannot remove 'conftest.dSYM', from
|
# suppress error messages, rm: cannot remove 'conftest.dSYM', from
|
||||||
# AC_EGREP_CPP with CFLAGS=-g on Darwin.
|
# AC_EGREP_CPP with CFLAGS=-g on Darwin.
|
||||||
#
|
#
|
||||||
# TODO: remove this hack when AC_PREREQ() becomes 2.70 or later.
|
# TODO: remove this hack when AC_PREREQ() becomes 2.70 or later.
|
||||||
|
AS_CASE([$build_os], [darwin*], [
|
||||||
rm() {
|
rm() {
|
||||||
rm_recursive=''
|
rm_recursive=''
|
||||||
for arg do
|
for arg do
|
||||||
@ -24,8 +27,9 @@ rm() {
|
|||||||
[conftest.*], [if test -d "$arg"; then rm_recursive=-r; break; fi],
|
[conftest.*], [if test -d "$arg"; then rm_recursive=-r; break; fi],
|
||||||
[])
|
[])
|
||||||
done
|
done
|
||||||
command rm $rm_recursive "$@"
|
command rm $rm_recursive "[$]@"
|
||||||
}
|
}
|
||||||
|
])])])
|
||||||
|
|
||||||
{ # environment section
|
{ # environment section
|
||||||
|
|
||||||
@ -194,6 +198,7 @@ RUBY_PATCHLEVEL=`sed -n 's/^#define RUBY_PATCHLEVEL //p' $srcdir/version.h`
|
|||||||
AC_DEFINE(CANONICALIZATION_FOR_MATHN)
|
AC_DEFINE(CANONICALIZATION_FOR_MATHN)
|
||||||
dnl checks for alternative programs
|
dnl checks for alternative programs
|
||||||
AC_CANONICAL_BUILD
|
AC_CANONICAL_BUILD
|
||||||
|
RUBY_RM_RECURSIVE
|
||||||
AC_ARG_WITH(gcc,
|
AC_ARG_WITH(gcc,
|
||||||
AS_HELP_STRING([--without-gcc], [never use gcc]),
|
AS_HELP_STRING([--without-gcc], [never use gcc]),
|
||||||
[
|
[
|
||||||
|
Loading…
x
Reference in New Issue
Block a user