[前][次][番号順一覧][スレッド一覧]

ruby-changes:57185

From: Nobuyoshi <ko1@a...>
Date: Tue, 20 Aug 2019 02:18:42 +0900 (JST)
Subject: [ruby-changes:57185] Nobuyoshi Nakada: af2c8d2836 (master): Fixed the check for OSX version

https://git.ruby-lang.org/ruby.git/commit/?id=af2c8d2836

From af2c8d283665f741f82b4e16b06c520e702c012b Mon Sep 17 00:00:00 2001
From: Nobuyoshi Nakada <nobu@r...>
Date: Tue, 20 Aug 2019 00:18:07 +0900
Subject: Fixed the check for OSX version

Should compare minimum required version, and with the particular
macro defined for each version.  Also made the error messages
consistent.

diff --git a/configure.ac b/configure.ac
index c201a35..e437dbd 100644
--- a/configure.ac
+++ b/configure.ac
@@ -780,11 +780,11 @@ AS_CASE(["$target_os"], https://github.com/ruby/ruby/blob/trunk/configure.ac#L780
 		RUBY_PREPEND_OPTION(LIBS, -lobjc)
 		RUBY_APPEND_OPTIONS(CPPFLAGS, -D_XOPEN_SOURCE -D_DARWIN_C_SOURCE -D_DARWIN_UNLIMITED_SELECT -D_REENTRANT)
 		AC_MSG_CHECKING(whether Mac OS X 10.5 or later)
-		AC_TRY_CPP([#include <AvailabilityMacros.h>
-		    #if MAC_OS_X_VERSION_MAX_ALLOWED <= 1040
-		    #error pre OS X 10.4
-		    [!<===== pre OS X 10.4 =====>]
-		    #endif
+		AC_TRY_CPP([@%:@include <AvailabilityMacros.h>
+		    @%:@if MAC_OS_X_VERSION_MIN_REQUIRED < __MAC_10_5
+		    @%:@error pre OS X 10.5
+		    [!<===== pre OS X 10.5 =====>]
+		    @%:@endif
 		    ],
 		    [macosx_10_5=yes], [macosx_10_5=no])
 		AC_MSG_RESULT($macosx_10_5)
-- 
cgit v0.10.2


--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/

[前][次][番号順一覧][スレッド一覧]