* configure.in (RUBY_CHECK_VARTYPE): should not indent preprocessor

  directives.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8@15771 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

3 files changed, 19 insertions, 12 deletions

diff --git a/ChangeLog b/ChangeLog
index 7377b94004..75d7b36fe5 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Fri Mar 14 10:12:29 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* configure.in (RUBY_CHECK_VARTYPE): should not indent preprocessor
+	  directives.
+
 Thu Mar 13 00:37:20 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
 	* eval.c (rb_call0): yields the last executed node line number at
diff --git a/configure.in b/configure.in
index 63ccb61ab5..3533a41dd8 100644
--- a/configure.in
+++ b/configure.in
@@ -594,17 +594,19 @@ AC_CACHE_CHECK([for external $1], rb_cv_var_$1,
 #ifndef _XOPEN_SOURCE
 #define _XOPEN_SOURCE 1
 #endif
-    $2
-    const volatile void *volatile t;],
+$2
+;
+const volatile void *volatile t;],
     [t = &(&$1)[0];],
     [for t in $3; do
       AC_TRY_COMPILE([
 #ifndef _XOPEN_SOURCE
 #define _XOPEN_SOURCE 1
 #endif
-        $2
-        extern $t $1;
-        const volatile void *volatile t;],
+$2
+;
+extern $t $1;
+const volatile void *volatile t;],
         [t = &(&$1)[0];],
         [rb_cv_var_$1=$t; break])
     done])])
@@ -612,13 +614,13 @@ if test "[$rb_cv_var_]$1" != no; then
   AC_DEFINE([HAVE_VAR_]m4_toupper($1))
   AC_DEFINE_UNQUOTED([TYPEOF_VAR_]m4_toupper($1), $rb_cv_var_$1)
 fi])
-RUBY_CHECK_VARTYPE(timezone, [#include <time.h>], [long int])
-RUBY_CHECK_VARTYPE(altzone, [#include <time.h>], [long int])
+RUBY_CHECK_VARTYPE(timezone, [@%:@include <time.h>], [long int])
+RUBY_CHECK_VARTYPE(altzone, [@%:@include <time.h>], [long int])
 if test "$rb_cv_var_timezone" = no; then
   AC_CHECK_FUNCS(timezone)
-  if test "$ ac_cv_func_timezone" = yes; then
+  if test "$ac_cv_func_timezone" = yes; then
     AC_CACHE_CHECK([whether timezone requires zero arguments], rb_cv_func_timezone_void,
-      [AC_TRY_COMPILE([#include <time.h>],
+      [AC_TRY_COMPILE([@%:@include <time.h>],
 	[(void)timezone(0, 0);],
 	[rb_cv_func_timezone_void=no],
 	[rb_cv_func_timezone_void=yes])]
diff --git a/version.h b/version.h
index e088d8d5f3..925c299c06 100644
--- a/version.h
+++ b/version.h
@@ -1,7 +1,7 @@
 #define RUBY_VERSION "1.8.6"
-#define RUBY_RELEASE_DATE "2008-03-13"
+#define RUBY_RELEASE_DATE "2008-03-14"
 #define RUBY_VERSION_CODE 186
-#define RUBY_RELEASE_CODE 20080313
+#define RUBY_RELEASE_CODE 20080314
 #define RUBY_PATCHLEVEL 5000
 
 #define RUBY_VERSION_MAJOR 1
@@ -9,7 +9,7 @@
 #define RUBY_VERSION_TEENY 6
 #define RUBY_RELEASE_YEAR 2008
 #define RUBY_RELEASE_MONTH 3
-#define RUBY_RELEASE_DAY 13
+#define RUBY_RELEASE_DAY 14
 
 #ifdef RUBY_EXTERN
 RUBY_EXTERN const char ruby_version[];