diff options
| author | Christos Zoulas <christos@zoulas.com> | 2010-07-21 16:47:17 +0000 |
|---|---|---|
| committer | Christos Zoulas <christos@zoulas.com> | 2010-07-21 16:47:17 +0000 |
| commit | 1485bf14e6b32da5eb3b925b4c24d9616ff93647 (patch) | |
| tree | b6bf942a2f9171fc4ab2ef82a11f77221c0a5f24 /acinclude.m4 | |
| parent | 02fe06e2768ad5c04aef5f41c0dd4ca618c3b3bc (diff) | |
| download | file-git-1485bf14e6b32da5eb3b925b4c24d9616ff93647.tar.gz | |
mingw32 and escaping fixes
Diffstat (limited to 'acinclude.m4')
| -rw-r--r-- | acinclude.m4 | 19 |
1 files changed, 11 insertions, 8 deletions
diff --git a/acinclude.m4 b/acinclude.m4 index ff6a657d..dcbf92f5 100644 --- a/acinclude.m4 +++ b/acinclude.m4 @@ -10,15 +10,16 @@ if test "$ac_cv_struct_tm_zone" = yes; then AC_DEFINE(HAVE_TM_ZONE,1,[HAVE_TM_ZONE]) fi +# On SGI, apparently tzname is a #define, but that's ok, AC_CHECK_DECL will +# consider it declared and we won't give our own extern. +AC_CHECK_DECLS([tzname], , , [#include <time.h>]) AC_CACHE_CHECK(for tzname, ac_cv_var_tzname, [AC_TRY_LINK( -changequote(<<, >>)dnl -<<#include <time.h> -#ifndef tzname /* For SGI. */ -extern char *tzname[]; /* RS6000 and others reject char **tzname. */ -#endif>>, -changequote([, ])dnl -[atoi(*tzname);], ac_cv_var_tzname=yes, ac_cv_var_tzname=no)]) +[#include <time.h> +#if !HAVE_DECL_TZNAME +extern char *tzname[]; +#endif], +[return tzname[0][0];], [ac_cv_var_tzname=yes], [ac_cv_var_tzname=no])]) if test $ac_cv_var_tzname = yes; then AC_DEFINE(HAVE_TZNAME,1,[HAVE_TZNAME]) fi @@ -31,11 +32,13 @@ if test "$ac_cv_struct_tm_isdst" = yes; then AC_DEFINE(HAVE_TM_ISDST,1,[HAVE_TM_ISDST]) fi + +AC_CHECK_DECLS([daylight], , , [#include <time.h>]) AC_CACHE_CHECK(for daylight, ac_cv_var_daylight, [AC_TRY_LINK( changequote(<<, >>)dnl <<#include <time.h> -#ifndef daylight /* In case IRIX #defines this, too */ +#if !HAVE_DECL_DAYLIGHT extern int daylight; #endif>>, changequote([, ])dnl |