diff options
| -rw-r--r-- | ChangeLog | 7 | ||||
| -rw-r--r-- | configure.in | 31 | ||||
| -rw-r--r-- | ext/Setup.emx | 2 | ||||
| -rw-r--r-- | ext/Setup.nt | 1 |
4 files changed, 26 insertions, 15 deletions
@@ -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 diff --git a/configure.in b/configure.in index 5fdac50fdc..c3477a3108 100644 --- a/configure.in +++ b/configure.in @@ -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 diff --git a/ext/Setup.emx b/ext/Setup.emx index bf9e2e32f9..bd46a55ecb 100644 --- a/ext/Setup.emx +++ b/ext/Setup.emx @@ -1,3 +1,5 @@ +# OS/2 environment w/ Autoconf 2.1x for EMX +option platform os2-emx option nodynamic #Win32API diff --git a/ext/Setup.nt b/ext/Setup.nt index 8aec238152..7c778f88fb 100644 --- a/ext/Setup.nt +++ b/ext/Setup.nt @@ -1,3 +1,4 @@ +option platform cygwin|mingw|mswin #option nodynamic Win32API |