ruby-changes:16717
From: nobu <ko1@a...>
Date: Thu, 22 Jul 2010 12:58:36 +0900 (JST)
Subject: [ruby-changes:16717] Ruby:r28713 (trunk): * configure.in (RUBY_EXTERN): ignore invalid attribute.
nobu 2010-07-22 12:58:18 +0900 (Thu, 22 Jul 2010) New Revision: 28713 http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=rev&revision=28713 Log: * configure.in (RUBY_EXTERN): ignore invalid attribute. Modified files: trunk/ChangeLog trunk/configure.in Index: configure.in =================================================================== --- configure.in (revision 28712) +++ configure.in (revision 28713) @@ -676,6 +676,21 @@ ])dnl ])dnl +AC_DEFUN([RUBY_WERROR_FLAG], [dnl +if test "${ac_c_werror_flag+set}"; then + rb_c_werror_flag="$ac_c_werror_flag" +else + unset rb_c_werror_flag +fi +ac_c_werror_flag=yes +$1 +if test "${rb_c_werror_flag+set}"; then + ac_c_werror_flag="$rb_c_werror_flag" +else + unset ac_c_werror_flag +fi]) + +dnl RUBY_FUNC_ATTRIBUTE(attrib, macroname, cachevar, condition) AC_DEFUN([RUBY_FUNC_ATTRIBUTE], [dnl m4_ifval([$2], dnl [AS_VAR_PUSHDEF([attrib],[$2])], dnl @@ -688,12 +703,7 @@ m4_ifval([$4], [rbcv_cond=[$4]; test "$rbcv_cond" || unset rbcv_cond]) AC_CACHE_CHECK(for [$1] function attribute, rbcv, [rbcv=x -if test "${ac_c_werror_flag+set}"; then - rb_c_werror_flag="$ac_c_werror_flag" -else - unset rb_c_werror_flag -fi -ac_c_werror_flag=yes +RUBY_WERROR_FLAG([ for mac in "__attribute__ (($1)) x" "x __attribute__ (($1))" "__declspec($1) x" x; do m4_ifval([$4],mac="$mac"${rbcv_cond+" /* only if $rbcv_cond */"}) AC_TRY_COMPILE( @@ -705,12 +715,7 @@ attrib[(void conftest_attribute_check(void));], [], [rbcv="$mac"; break]) done -if test "${rb_c_werror_flag+set}"; then - ac_c_werror_flag="$rb_c_werror_flag" -else - unset ac_c_werror_flag -fi -]) +])]) if test "$rbcv" != x; then RUBY_DEFINE_IF([${rbcv_cond}], attrib[(x)], $rbcv) fi @@ -745,12 +750,14 @@ AC_CACHE_CHECK([for RUBY_EXTERN], rb_cv_ruby_extern, [rb_cv_ruby_extern=no +RUBY_WERROR_FLAG([ for mac in "__attribute__((dllimport))" "__declspec(dllimport)"; do AC_TRY_COMPILE( [extern $mac void conftest(void);], [conftest();], [rb_cv_ruby_extern="extern $mac"; break]) done]) +]) test "x$rb_cv_ruby_extern" = xno || AC_DEFINE_UNQUOTED(RUBY_EXTERN, $rb_cv_ruby_extern) RUBY_APPEND_OPTION(XCFLAGS, -DRUBY_EXPORT) Index: ChangeLog =================================================================== --- ChangeLog (revision 28712) +++ ChangeLog (revision 28713) @@ -1,5 +1,7 @@ -Thu Jul 22 12:30:52 2010 Nobuyoshi Nakada <nobu@r...> +Thu Jul 22 12:58:12 2010 Nobuyoshi Nakada <nobu@r...> + * configure.in (RUBY_EXTERN): ignore invalid attribute. + * configure.in: fix for older autoconf. Thu Jul 22 12:02:31 2010 Nobuyoshi Nakada <nobu@r...> -- ML: ruby-changes@q... Info: http://www.atdot.net/~ko1/quickml/