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

ruby-changes:51238

From: ngoto <ko1@a...>
Date: Wed, 16 May 2018 20:06:37 +0900 (JST)
Subject: [ruby-changes:51238] ngoto:r63444 (trunk): configure.ac: move the checks of _XOPEN_SOURCE on Solaris

ngoto	2018-05-16 20:06:30 +0900 (Wed, 16 May 2018)

  New Revision: 63444

  https://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=revision&revision=63444

  Log:
    configure.ac: move the checks of _XOPEN_SOURCE on Solaris
    
    * configure.ac (solaris*): Move the checks of _XOPEN_SOURCE to the
      location before r63443, to cover non-GCC compilers on Solaris.
      This partly reverts r63443.

  Modified files:
    trunk/configure.ac
Index: configure.ac
===================================================================
--- configure.ac	(revision 63443)
+++ configure.ac	(revision 63444)
@@ -592,39 +592,6 @@ AS_IF([test "$GCC" = yes], [ https://github.com/ruby/ruby/blob/trunk/configure.ac#L592
 	    ], [ansi_options=])
 	    test "x${ansi_options}" = x || break
 	done
-	AC_MSG_CHECKING(whether _XOPEN_SOURCE is already given)
-	AC_TRY_COMPILE([#include <unistd.h>
-		#ifndef _XOPEN_SOURCE
-		#error _XOPEN_SOURCE is not defined
-		#endif
-		], [],
-	        [given_xopen_source=yes], [given_xopen_source=no])
-	AC_MSG_RESULT($given_xopen_source)
-	AS_IF([test $given_xopen_source = no], [
-	  AC_MSG_CHECKING(appropriate _XOPEN_SOURCE value to define)
-	  define_xopen_source=""
-	  for tmp_xpg in 7 6 5; do
-	    AS_IF([test x"$define_xopen_source" != x], [
-	      break
-	    ])
-	    RUBY_WERROR_FLAG([AC_TRY_COMPILE([
-		#define _XOPEN_SOURCE ${tmp_xpg}00
-		#include <unistd.h>
-		#ifndef _XPG${tmp_xpg}
-		#error _XPG${tmp_xpg} should be defined by _XOPEN_SOURCE=${tmp_xpg}00
-		#endif
-		], [],
-		[define_xopen_source=${tmp_xpg}00], [])
-		])
-	  done
-	  AS_IF([test x"$define_xopen_source" = x], [
-	    define_xopen_source=no
-	  ])
-	  AC_MSG_RESULT($define_xopen_source)
-	  AS_IF([test x"$define_xopen_source" != xno], [
-	    RUBY_APPEND_OPTIONS(CPPFLAGS, -D_XOPEN_SOURCE=$define_xopen_source)
-	  ])
-	])
     ],
     [
       # ANSI (no XCFLAGS because this is C only)
@@ -865,6 +832,39 @@ main() https://github.com/ruby/ruby/blob/trunk/configure.ac#L832
 		ac_cv_c_inline=no],
 [solaris*], [	LIBS="-lm $LIBS"
 		ac_cv_func_vfork=no
+		AC_MSG_CHECKING(whether _XOPEN_SOURCE is already given)
+		AC_TRY_COMPILE([#include <unistd.h>
+			#ifndef _XOPEN_SOURCE
+			#error _XOPEN_SOURCE is not defined
+			#endif
+			], [],
+		        [given_xopen_source=yes], [given_xopen_source=no])
+		AC_MSG_RESULT($given_xopen_source)
+		AS_IF([test $given_xopen_source = no], [
+		  AC_MSG_CHECKING(appropriate _XOPEN_SOURCE value to define)
+		  define_xopen_source=""
+		  for tmp_xpg in 7 6 5; do
+		    AS_IF([test x"$define_xopen_source" != x], [
+		      break
+		    ])
+		    RUBY_WERROR_FLAG([AC_TRY_COMPILE([
+			#define _XOPEN_SOURCE ${tmp_xpg}00
+			#include <unistd.h>
+			#ifndef _XPG${tmp_xpg}
+			#error _XPG${tmp_xpg} should be defined by _XOPEN_SOURCE=${tmp_xpg}00
+			#endif
+			], [],
+			[define_xopen_source=${tmp_xpg}00], [])
+			])
+		  done
+		  AS_IF([test x"$define_xopen_source" = x], [
+		    define_xopen_source=no
+		  ])
+		  AC_MSG_RESULT($define_xopen_source)
+		  AS_IF([test x"$define_xopen_source" != xno], [
+		    RUBY_APPEND_OPTIONS(CPPFLAGS, -D_XOPEN_SOURCE=$define_xopen_source)
+		  ])
+		])
 		],
 [haiku*], [
 		LIBS="$LIBS" # m lib is include in root

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

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