diff options
| -rw-r--r-- | ChangeLog | 11 | ||||
| -rw-r--r-- | bcc32/Makefile.sub | 90 | ||||
| -rw-r--r-- | mkconfig.rb | 6 | ||||
| -rw-r--r-- | win32/Makefile.sub | 16 | ||||
| -rw-r--r-- | wince/Makefile.sub | 14 |
5 files changed, 64 insertions, 73 deletions
@@ -1,3 +1,14 @@ +Sat Feb 14 23:59:11 2004 Nobuyoshi Nakada <nobu@ruby-lang.org> + + * mkconfig.rb: use fileutils.rb instead of ftools.rb. + + * bcc32/Makefile.sub, win32/Makefile.sub (config.h): define + STACK_GROW_DIRECTION. + + * bcc32/Makefile.sub (config.h): add newer checks. + + * wince/Makefile.sub (config.h): define NEED_IO_SEEK_BETWEEN_RW. + Sat Feb 14 23:26:27 2004 WATANABE Hirofumi <eban@ruby-lang.org> * lib/un.rb: use OptionParser instead of getopts. diff --git a/bcc32/Makefile.sub b/bcc32/Makefile.sub index 17d6bc5401..98f58ed881 100644 --- a/bcc32/Makefile.sub +++ b/bcc32/Makefile.sub @@ -230,58 +230,67 @@ config: config.h config.status config.h: @echo Creating $(@:.\=) @type > $@ &&| +\#define HAVE_SYS_TYPES_H 1 +\#define HAVE_SYS_STAT_H 1 +\#define HAVE_STDLIB_H 1 +\#define HAVE_STRING_H 1 +\#define HAVE_MEMORY_H 1 +\#define HAVE_OFF_T 1 +\#define SIZEOF_INT 4 +\#define SIZEOF_SHORT 2 +\#define SIZEOF_LONG 4 +\#define SIZEOF_LONG_LONG 0 +\#define SIZEOF___INT64 8 +\#define SIZEOF_OFF_T 4 +\#define SIZEOF_VOIDP 4 +\#define SIZEOF_FLOAT 4 +\#define SIZEOF_DOUBLE 8 \#define HAVE_PROTOTYPES 1 +\#define TOKEN_PASTE(x,y) x\#\#y \#define HAVE_STDARG_PROTOTYPES 1 -/* \#define HAVE_ATTR_NORETURN 1 */ \#define NORETURN(x) x -\#define TOKEN_PASTE(x,y) x\#\#y -\#define inline __inline -/* \#define HAVE_DIRENT_H 1 */ -/* \#define HAVE_UNISTD_H 1 */ -\#define HAVE_STDLIB_H 1 +\#define HAVE_DECL_SYS_NERR 1 \#define HAVE_LIMITS_H 1 -/* \#define HAVE_SYS_FILE_H 1 */ \#define HAVE_FCNTL_H 1 -/* \#define HAVE_PWD_H 1 */ -/* \#define HAVE_SYS_TIME_H 1 */ -/* \#define HAVE_SYS_TIMES_H 1 */ -/* \#define HAVE_SYS_PARAM_H 1 */ -/* \#define HAVE_SYS_WAIT_H 1 */ -\#define HAVE_STRING_H 1 \#define HAVE_UTIME_H 1 -\#define HAVE_MEMORY_H 1 -/* \#define HAVE_ST_BLKSIZE 1 */ +\#define HAVE_FLOAT_H 1 +\#define HAVE_STRUCT_STAT_ST_RDEV 1 \#define HAVE_ST_RDEV 1 -/* \#define GETGROUPS_T gid_t */ \#define GETGROUPS_T int \#define RETSIGTYPE void \#define HAVE_ALLOCA 1 -\#define vfork fork +\#define HAVE_DUP2 1 +\#define HAVE_MEMMOVE 1 +\#define HAVE_MKDIR 1 +\#define HAVE_STRCASECMP 1 +\#define HAVE_STRNCASECMP 1 +\#define HAVE_STRERROR 1 +\#define HAVE_STRFTIME 1 +\#define HAVE_STRCHR 1 +\#define HAVE_STRSTR 1 +\#define HAVE_STRTOD 1 +\#define HAVE_STRTOL 1 +\#define HAVE_STRTOUL 1 +\#define HAVE_ISNAN 1 +\#define HAVE_FINITE 1 \#define HAVE_FMOD 1 -/* \#define HAVE_RANDOM 1 */ \#define HAVE_WAITPID 1 -\#define HAVE_GETCWD 1 \#define HAVE_FSYNC 1 -/* \#define HAVE_TRUNCATE 1 */ +\#define HAVE_GETCWD 1 \#define HAVE_CHSIZE 1 \#define HAVE_TIMES 1 -/* \#define HAVE_UTIMES 1 */ -/* \#define HAVE_FCNTL 1 */ \#define HAVE_LINK 1 -/* \#define HAVE_SETITIMER 1 */ -/* \#define HAVE_GETGROUPS 1 */ -/* \#define HAVE_SIGPROCMASK 1 */ -\#define HAVE_GETLOGIN 1 \#define HAVE_TELLDIR 1 \#define HAVE_SEEKDIR 1 \#define HAVE_COSH 1 \#define HAVE_SINH 1 \#define HAVE_TANH 1 - -\#define NEED_IO_SEEK_BETWEEN_RW 1 -\#define RSHIFT(x,y) ((x)>>y) +\#define RSHIFT(x,y) ((x)>>(int)y) \#define FILE_COUNT level \#define FILE_READPTR curp +\#define inline __inline +\#define NEED_IO_SEEK_BETWEEN_RW 1 +\#define STACK_GROW_DIRECTION -1 \#define DEFAULT_KCODE KCODE_NONE \#define DLEXT ".so" \#define RUBY_LIB "/lib/ruby/$(MAJOR).$(MINOR)" @@ -290,29 +299,6 @@ config.h: \#define RUBY_PLATFORM "$(ARCH)-$(OS)" \#define RUBY_ARCHLIB "/lib/ruby/$(MAJOR).$(MINOR)/$(ARCH)-$(OS)" \#define RUBY_SITE_ARCHLIB "/lib/ruby/site_ruby/$(MAJOR).$(MINOR)/$(ARCH)-$(OS)" - -\#define SIZEOF_INT 4 -\#define SIZEOF_SHORT 2 -\#define SIZEOF_LONG 4 -\#define SIZEOF___INT64 8 -\#define SIZEOF_VOIDP 4 -\#define SIZEOF_FLOAT 4 -\#define SIZEOF_DOUBLE 8 - -\#define HAVE_DECL_SYS_NERR 1 -\#define HAVE_ISNAN 1 -\#define HAVE_FINITE 1 -\#define HAVE_MEMMOVE 1 -\#define HAVE_MKDIR 1 -\#define HAVE_STRCASECMP 1 -\#define HAVE_STRNCASECMP 1 -\#define HAVE_STRCHR 1 -\#define HAVE_STRERROR 1 -\#define HAVE_STRFTIME 1 -\#define HAVE_STRSTR 1 -\#define HAVE_STRTOD 1 -\#define HAVE_STRTOUL 1 -\#define HAVE_GETCWD 1 | config.status: Makefile $(srcdir)bcc32/Makefile.sub diff --git a/mkconfig.rb b/mkconfig.rb index b0abee35ad..e812510165 100644 --- a/mkconfig.rb +++ b/mkconfig.rb @@ -5,12 +5,14 @@ $srcdir ||= nil $install_name ||= nil $so_name ||= nil -require File.dirname($0)+"/lib/ftools" +require File.dirname($0)+"/lib/fileutils" mkconfig = File.basename($0) rbconfig_rb = ARGV[0] || 'rbconfig.rb' srcdir = $srcdir || '.' -File.makedirs(File.dirname(rbconfig_rb), true) +unless File.directory?(dir = File.dirname(rbconfig_rb)) + FileUtils.makedirs(File.dirname(rbconfig_rb), :verbose => true) +end version = RUBY_VERSION rbconfig_rb_tmp = rbconfig_rb + '.tmp' diff --git a/win32/Makefile.sub b/win32/Makefile.sub index 8cd23e90af..ba245e7939 100644 --- a/win32/Makefile.sub +++ b/win32/Makefile.sub @@ -231,7 +231,6 @@ config.h: #define HAVE_STDLIB_H 1 #define HAVE_STRING_H 1 #define HAVE_MEMORY_H 1 -#define HAVE_FLOAT_H 1 #define HAVE_OFF_T 1 #define SIZEOF_INT 4 #define SIZEOF_SHORT 2 @@ -251,13 +250,10 @@ config.h: #define NORETURN(x) x #endif #define HAVE_DECL_SYS_NERR 1 -#define STDC_HEADERS 1 -#define HAVE_STDLIB_H 1 -#define HAVE_STRING_H 1 #define HAVE_LIMITS_H 1 #define HAVE_FCNTL_H 1 #define HAVE_SYS_UTIME_H 1 -#define HAVE_MEMORY_H 1 +#define HAVE_FLOAT_H 1 #define uid_t int #define gid_t int #define HAVE_STRUCT_STAT_ST_RDEV 1 @@ -278,17 +274,17 @@ config.h: #define HAVE_STRTOD 1 #define HAVE_STRTOL 1 #define HAVE_STRTOUL 1 -#define HAVE_GETCWD 1 #define HAVE_FLOCK 1 #define HAVE_VSNPRINTF 1 #define HAVE_ISNAN 1 #define HAVE_FINITE 1 +#define HAVE_HYPOT 1 #define HAVE_FMOD 1 #define HAVE_FREXP 1 -#define HAVE_HYPOT 1 #define HAVE_MODF 1 #define HAVE_WAITPID 1 #define HAVE_FSYNC 1 +#define HAVE_GETCWD 1 #define HAVE_CHSIZE 1 #define HAVE_TIMES 1 #define HAVE_LINK 1 @@ -299,15 +295,15 @@ config.h: #define HAVE_COSH 1 #define HAVE_SINH 1 #define HAVE_TANH 1 -#define HAVE_EXECVE 1 #define HAVE_TZNAME 1 #define HAVE_DAYLIGHT 1 #define SETPGRP_VOID 1 -#define inline __inline -#define NEED_IO_SEEK_BETWEEN_RW 1 #define RSHIFT(x,y) ((x)>>(int)y) #define FILE_COUNT _cnt #define FILE_READPTR _ptr +#define inline __inline +#define NEED_IO_SEEK_BETWEEN_RW 1 +#define STACK_GROW_DIRECTION -1 #define DEFAULT_KCODE KCODE_NONE #define DLEXT ".so" #define RUBY_LIB "/lib/ruby/$(MAJOR).$(MINOR)" diff --git a/wince/Makefile.sub b/wince/Makefile.sub index 1b14afc8a0..7eeed4bfdb 100644 --- a/wince/Makefile.sub +++ b/wince/Makefile.sub @@ -221,7 +221,6 @@ config.h: #define HAVE_STDLIB_H 1 #define HAVE_STRING_H 1 #define HAVE_MEMORY_H 1 -#define HAVE_FLOAT_H 1 #define HAVE_OFF_T 1 #define SIZEOF_INT 4 #define SIZEOF_SHORT 2 @@ -241,12 +240,9 @@ config.h: #define NORETURN(x) x #endif #define HAVE_DECL_SYS_NERR 1 -#define STDC_HEADERS 1 -#define HAVE_STDLIB_H 1 -#define HAVE_STRING_H 1 #define HAVE_FCNTL_H 1 #define HAVE_SYS_UTIME_H 1 -#define HAVE_MEMORY_H 1 +#define HAVE_FLOAT_H 1 #define uid_t int #define gid_t int #define HAVE_STRUCT_STAT_ST_RDEV 1 @@ -265,15 +261,15 @@ config.h: #define HAVE_STRTOD 1 #define HAVE_STRTOL 1 #define HAVE_STRTOUL 1 -#define HAVE_GETCWD 1 #define HAVE_FLOCK 1 #define HAVE_VSNPRINTF 1 #define HAVE_FINITE 1 +#define HAVE_HYPOT 1 #define HAVE_FMOD 1 #define HAVE_FREXP 1 -#define HAVE_HYPOT 1 #define HAVE_MODF 1 #define HAVE_WAITPID 1 +#define HAVE_GETCWD 1 #define HAVE_CHSIZE 0 #define HAVE_TIMES 1 #define HAVE_TELLDIR 1 @@ -282,12 +278,12 @@ config.h: #define HAVE_COSH 1 #define HAVE_SINH 1 #define HAVE_TANH 1 -#define HAVE_EXECVE 0 #define HAVE_TZNAME 1 #define HAVE_DAYLIGHT 1 #define SETPGRP_VOID 1 -#define inline __inline #define RSHIFT(x,y) ((x)>>(int)y) +#define inline __inline +#define NEED_IO_SEEK_BETWEEN_RW 1 #define DEFAULT_KCODE KCODE_NONE #define DLEXT ".so" #define RUBY_LIB "/lib/ruby/$(MAJOR).$(MINOR)" |