From 509ba5db33a8866b1978376f8be94cc7d175d190 Mon Sep 17 00:00:00 2001 From: yugui Date: Thu, 25 Dec 2008 09:55:01 +0000 Subject: merges r20958 from trunk into ruby_1_9_1. * configure.in (OBJDUMP, OBJCOPY): autoconf list is not comma separated. * configure.in (AC_HEADER_STDC, AC_CHECK_HEADERS AC_CHECK_FUNCS): removed duplicated checks. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_1@21020 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- configure.in | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) (limited to 'configure.in') diff --git a/configure.in b/configure.in index 5b75f7364c..8fd3c33a9f 100644 --- a/configure.in +++ b/configure.in @@ -218,8 +218,8 @@ ASFLAGS=$ASFLAGS AC_SUBST(ASFLAGS) # BSD's ports and MacPorts prefix GNU binutils with 'g' -AC_CHECK_TOOLS(OBJDUMP, [objdump, gobjdump]) -AC_CHECK_TOOLS(OBJCOPY, [objcopy, gobjcopy]) +AC_CHECK_TOOLS(OBJDUMP, [objdump gobjdump]) +AC_CHECK_TOOLS(OBJCOPY, [objcopy gobjcopy]) case "$target_os" in cygwin*|mingw*) @@ -281,8 +281,6 @@ mingw*) ;; esac -AC_CHECK_TYPES([long long, off_t]) - AC_CHECK_SIZEOF(int, 4) AC_CHECK_SIZEOF(short, 2) AC_CHECK_SIZEOF(long, 4) @@ -294,6 +292,9 @@ AC_CHECK_SIZEOF(float, 4) AC_CHECK_SIZEOF(double, 8) AC_CHECK_SIZEOF(time_t, 0) +[test "${ac_cv_type_long_long}" = yes] && AC_DEFINE(HAVE_LONG_LONG) +[test "${ac_cv_type_off_t}" = yes] && AC_DEFINE(HAVE_OFF_T) + dnl RUBY_REPLACE_TYPE [typename] [default type] [macro type] [included] AC_DEFUN([RUBY_REPLACE_TYPE], [dnl AC_CHECK_TYPE([$1], @@ -644,11 +645,11 @@ fi dnl Checks for header files. AC_HEADER_DIRENT -AC_HEADER_STDC +dnl AC_HEADER_STDC has been checked in AC_USE_SYSTEM_EXTENSIONS AC_HEADER_SYS_WAIT -AC_CHECK_HEADERS(stdlib.h string.h unistd.h limits.h sys/file.h sys/ioctl.h sys/syscall.h\ +AC_CHECK_HEADERS(limits.h sys/file.h sys/ioctl.h sys/syscall.h\ fcntl.h sys/fcntl.h sys/select.h sys/time.h sys/times.h sys/param.h\ - syscall.h pwd.h grp.h a.out.h utime.h memory.h direct.h sys/resource.h \ + syscall.h pwd.h grp.h a.out.h utime.h direct.h sys/resource.h \ sys/mkdev.h sys/utime.h xti.h netinet/in_systm.h float.h ieeefp.h pthread.h \ ucontext.h intrinsics.h langinfo.h locale.h sys/sendfile.h time.h \ net/socket.h sys/socket.h) @@ -787,7 +788,7 @@ AC_CHECK_FUNCS(fmod killpg wait4 waitpid fork spawnv syscall chroot fsync getcwd setrgid setegid setregid setresgid issetugid pause lchown lchmod\ getpgrp setpgrp getpgid setpgid initgroups getgroups setgroups\ getpriority getrlimit setrlimit sysconf group_member\ - dlopen sigprocmask sigaction sigsetjmp _setjmp _longjmp vsnprintf snprintf\ + dlopen sigprocmask sigaction sigsetjmp _setjmp _longjmp snprintf\ setsid telldir seekdir fchmod cosh sinh tanh log2 round signbit\ setuid setgid daemon select_large_fdset setenv unsetenv\ mktime timegm gmtime_r clock_gettime gettimeofday\ -- cgit v1.2.3