1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2022-11-09 12:17:21 -05:00

configure.in: find Setup file automatically

* configure.in (setup): find Setup file from target_os 1. by
  suffix (e.g. Setup.nacl, Setup.atheos), 2. by "platform"
  option (e.g. Setup.nt, Setup.emx), and 3. default Setup.  And
  Setup.dj had been removed.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@39486 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
nobu 2013-02-25 04:12:45 +00:00
parent eed06bb043
commit 5919370363
4 changed files with 26 additions and 15 deletions

View file

@ -1,3 +1,10 @@
Mon Feb 25 13:12:39 2013 Nobuyoshi Nakada <nobu@ruby-lang.org>
* configure.in (setup): find Setup file from target_os 1. by
suffix (e.g. Setup.nacl, Setup.atheos), 2. by "platform"
option (e.g. Setup.nt, Setup.emx), and 3. default Setup. And
Setup.dj had been removed.
Mon Feb 25 12:48:00 2013 Zachary Scott <zachary@zacharyscott.net>
* thread.c: Document Thread::new, clean up ::fork and mention calling

View file

@ -2580,21 +2580,22 @@ fi
AC_SUBST(ENCOBJS)
AC_SUBST(EXTOBJS)
AS_CASE(["$target_os"],
dnl OS/2 environment w/ Autoconf 2.1x for EMX
[os2-emx], [
setup=Setup.emx
],
[*djgpp*], [
setup=Setup.dj
],
[nacl], [
setup=Setup.nacl
],
[
setup=Setup
])
if test -f "$srcdir/ext/Setup.$target_os"; then
setup="Setup.$target_os"
else
setup=
for file in "$srcdir"/ext/Setup.*; do
AS_CASE(["$file"], [*~|*.bak|*.orig|*.rej|*.tmp], [continue])
setup=`basename "$file"`
AS_CASE(["$target_os"], [`expr "$setup" : 'Setup.\(.*\)'`*], [break])
platform=`sed '/^option *platform */!d;s///;s/|/*|/g;q' "$file"`
if test "x$platform" != x; then
eval "AS_CASE([\"\$target_os\"], [$platform*], [break])"
fi
setup=
done
: ${setup:=Setup}
fi
AC_SUBST(setup)
test x"$prefix" = xNONE && prefix=$ac_default_prefix

View file

@ -1,3 +1,5 @@
# OS/2 environment w/ Autoconf 2.1x for EMX
option platform os2-emx
option nodynamic
#Win32API

View file

@ -1,3 +1,4 @@
option platform cygwin|mingw|mswin
#option nodynamic
Win32API