diff options
| author | usa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2012-07-10 01:45:22 +0000 |
|---|---|---|
| committer | usa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2012-07-10 01:45:22 +0000 |
| commit | 8a02eed72334dfc4e4065d97cc39d543d25de2e9 (patch) | |
| tree | 251f2e03abb47447df4875d20c52d5b60dff1243 | |
| parent | 3e419e6c4aa3675d8b4aa4ae74610ec5289a9500 (diff) | |
| download | ruby-8a02eed72334dfc4e4065d97cc39d543d25de2e9.tar.gz | |
* configure.in: removed --enable/disable-win95 options. (see r36432)
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@36350 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
| -rw-r--r-- | ChangeLog | 10 | ||||
| -rw-r--r-- | configure.in | 12 |
2 files changed, 7 insertions, 15 deletions
@@ -1,3 +1,7 @@ +Tue Jul 10 10:43:37 2012 NAKAMURA Usaku <usa@ruby-lang.org> + + * configure.in: removed --enable/disable-win95 options. (see r36432) + Tue Jul 10 08:56:17 2012 Eric Hodel <drbrain@segment7.net> * ext/zlib/zlib.c: Added streaming support to inflate processing. @@ -38,12 +42,12 @@ Mon Jul 9 23:59:36 2012 KOSAKI Motohiro <kosaki.motohiro@gmail.com> Mon Jul 9 17:37:35 2012 NAKAMURA Usaku <usa@ruby-lang.org> - * win32/win32.c (win95_stat): remove unnecessary macro. + * win32/win32.c (win95_stat): removed unnecessary macro. Mon Jul 9 17:22:16 2012 NAKAMURA Usaku <usa@ruby-lang.org> - * win32/configure.bat, win32/setup.mak, win32/Makefile.sub: omit Win9x - support. remove --enable/disable-win95 option. + * win32/configure.bat, win32/setup.mak, win32/Makefile.sub: omitted + Win9x support. removed --enable/disable-win95 options. * include/ruby/win32.h, file.c, win32/win32.c: ditto. diff --git a/configure.in b/configure.in index 2131ac02e8..51ca44c0f6 100644 --- a/configure.in +++ b/configure.in @@ -1072,10 +1072,6 @@ dnl Check whether we need to define sys_nerr locally AC_CHECK_DECLS([sys_nerr], [], [], [$ac_includes_default #include <errno.h>]) -AC_ARG_ENABLE(win95, - AS_HELP_STRING([--enable-win95], [enable Windows 95 series support]), - [AS_CASE(["$enableval"],[yes|no],[enable_win95=$enableval],[unset enable_win95])]) - AC_ARG_WITH(winnt-ver, AS_HELP_STRING([--with-winnt-ver=0xXXXX], [target Windows NT version (default to 0x0501)]), [with_winnt_ver="$withval"], [with_winnt_ver="0x0501"]) @@ -1221,7 +1217,6 @@ main() ac_cv_func_gmtime_r=yes rb_cv_large_fd_select=yes AC_LIBOBJ([langinfo]) - : ${enable_win95=maybe} ], [os2-emx*], [ LIBS="-lm $LIBS" ac_cv_lib_dir_opendir=no], @@ -1255,13 +1250,6 @@ AC_CHECK_LIB(dl, dlopen) # Dynamic linking for SunOS/Solaris and SYSV AC_CHECK_LIB(dld, shl_load) # Dynamic linking for HP-UX AC_CHECK_LIB(socket, socketpair) # SunOS/Solaris AC_CHECK_LIB(rt, clock_gettime) # GNU/Linux -if test "${enable_win95}" = maybe; then - AC_HAVE_LIBRARY(unicows, [enable_win95=yes], [enable_win95=no]) -fi -if test "${enable_win95}" = yes; then - AC_DEFINE(WIN95) - LIBS="-lunicows $LIBS" -fi AS_CASE(["$target_cpu"], [alpha*|sh4|sh4el|sh4eb], [AS_CASE(["$target_os"::"$GCC"], |