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:
parent
eed06bb043
commit
5919370363
@ -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>
|
Mon Feb 25 12:48:00 2013 Zachary Scott <zachary@zacharyscott.net>
|
||||||
|
|
||||||
* thread.c: Document Thread::new, clean up ::fork and mention calling
|
* thread.c: Document Thread::new, clean up ::fork and mention calling
|
||||||
|
31
configure.in
31
configure.in
@ -2580,21 +2580,22 @@ fi
|
|||||||
AC_SUBST(ENCOBJS)
|
AC_SUBST(ENCOBJS)
|
||||||
AC_SUBST(EXTOBJS)
|
AC_SUBST(EXTOBJS)
|
||||||
|
|
||||||
AS_CASE(["$target_os"],
|
if test -f "$srcdir/ext/Setup.$target_os"; then
|
||||||
dnl OS/2 environment w/ Autoconf 2.1x for EMX
|
setup="Setup.$target_os"
|
||||||
[os2-emx], [
|
else
|
||||||
setup=Setup.emx
|
setup=
|
||||||
],
|
for file in "$srcdir"/ext/Setup.*; do
|
||||||
[*djgpp*], [
|
AS_CASE(["$file"], [*~|*.bak|*.orig|*.rej|*.tmp], [continue])
|
||||||
setup=Setup.dj
|
setup=`basename "$file"`
|
||||||
],
|
AS_CASE(["$target_os"], [`expr "$setup" : 'Setup.\(.*\)'`*], [break])
|
||||||
[nacl], [
|
platform=`sed '/^option *platform */!d;s///;s/|/*|/g;q' "$file"`
|
||||||
setup=Setup.nacl
|
if test "x$platform" != x; then
|
||||||
],
|
eval "AS_CASE([\"\$target_os\"], [$platform*], [break])"
|
||||||
[
|
fi
|
||||||
setup=Setup
|
setup=
|
||||||
])
|
done
|
||||||
|
: ${setup:=Setup}
|
||||||
|
fi
|
||||||
AC_SUBST(setup)
|
AC_SUBST(setup)
|
||||||
|
|
||||||
test x"$prefix" = xNONE && prefix=$ac_default_prefix
|
test x"$prefix" = xNONE && prefix=$ac_default_prefix
|
||||||
|
@ -1,3 +1,5 @@
|
|||||||
|
# OS/2 environment w/ Autoconf 2.1x for EMX
|
||||||
|
option platform os2-emx
|
||||||
option nodynamic
|
option nodynamic
|
||||||
|
|
||||||
#Win32API
|
#Win32API
|
||||||
|
@ -1,3 +1,4 @@
|
|||||||
|
option platform cygwin|mingw|mswin
|
||||||
#option nodynamic
|
#option nodynamic
|
||||||
|
|
||||||
Win32API
|
Win32API
|
||||||
|
Loading…
x
Reference in New Issue
Block a user