diff options
Diffstat (limited to 'contrib/file/acinclude.m4')
| -rw-r--r-- | contrib/file/acinclude.m4 | 39 |
1 files changed, 21 insertions, 18 deletions
diff --git a/contrib/file/acinclude.m4 b/contrib/file/acinclude.m4 index dcbf92f50308..30242712bad3 100644 --- a/contrib/file/acinclude.m4 +++ b/contrib/file/acinclude.m4 @@ -3,8 +3,9 @@ dnl from autoconf 2.13 acspecific.m4, with changes to check for daylight AC_DEFUN([AC_STRUCT_TIMEZONE_DAYLIGHT], [AC_REQUIRE([AC_STRUCT_TM])dnl AC_CACHE_CHECK([for tm_zone in struct tm], ac_cv_struct_tm_zone, -[AC_TRY_COMPILE([#include <sys/types.h> -#include <$ac_cv_struct_tm>], [struct tm tm; tm.tm_zone;], +[AC_COMPILE_IFELSE( +[AC_LANG_PROGRAM([#include <sys/types.h> +#include <$ac_cv_struct_tm>], [struct tm tm; tm.tm_zone;])], ac_cv_struct_tm_zone=yes, ac_cv_struct_tm_zone=no)]) if test "$ac_cv_struct_tm_zone" = yes; then AC_DEFINE(HAVE_TM_ZONE,1,[HAVE_TM_ZONE]) @@ -14,35 +15,36 @@ fi # 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( -[#include <time.h> -#if !HAVE_DECL_TZNAME +[AC_LINK_IFELSE( +[AC_LANG_PROGRAM([#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])]) +#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 AC_CACHE_CHECK([for tm_isdst in struct tm], ac_cv_struct_tm_isdst, -[AC_TRY_COMPILE([#include <sys/types.h> -#include <$ac_cv_struct_tm>], [struct tm tm; tm.tm_isdst;], +[AC_COMPILE_IFELSE( +[AC_LANG_PROGRAM([#include <sys/types.h> +#include <$ac_cv_struct_tm>], [struct tm tm; tm.tm_isdst;])], ac_cv_struct_tm_isdst=yes, ac_cv_struct_tm_isdst=no)]) 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_CHECK_DECLS([daylight], , , [#include <time.h> +#include <stdlib.h>]) AC_CACHE_CHECK(for daylight, ac_cv_var_daylight, -[AC_TRY_LINK( -changequote(<<, >>)dnl -<<#include <time.h> -#if !HAVE_DECL_DAYLIGHT +[AC_LINK_IFELSE( +[AC_LANG_PROGRAM([#include <time.h> +#include <stdlib.h>], +[#if !HAVE_DECL_DAYLIGHT extern int daylight; -#endif>>, -changequote([, ])dnl -[atoi(daylight);], ac_cv_var_daylight=yes, ac_cv_var_daylight=no)]) +#endif +daylight = atoi("1");])], ac_cv_var_daylight=yes, ac_cv_var_daylight=no)]) if test $ac_cv_var_daylight = yes; then AC_DEFINE(HAVE_DAYLIGHT,1,[HAVE_DAYLIGHT]) fi @@ -50,7 +52,8 @@ changequote([, ])dnl AC_DEFUN([AC_STRUCT_OPTION_GETOPT_H], [AC_CACHE_CHECK([for struct option in getopt], ac_cv_struct_option_getopt_h, -[AC_TRY_COMPILE([#include <getopt.h>], [struct option op; op.name;], +[AC_COMPILE_IFELSE( +[AC_LANG_PROGRAM([#include <getopt.h>], [struct option op; op.name;])], ac_cv_struct_option_getopt_h=yes, ac_cv_struct_option_getopt_h=no)]) if test "$ac_cv_struct_option_getopt_h" = yes; then AC_DEFINE(HAVE_STRUCT_OPTION,1,[HAVE_STRUCT_OPTION]) |