Skip to content

Commit 8575503

Browse files
authored
[2.7] Don't run AC_STRUCT_TIMEZONE twice. (GH-9309)
(cherry picked from commit a4414ef)
1 parent 0b9fe17 commit 8575503

File tree

2 files changed

+0
-76
lines changed

2 files changed

+0
-76
lines changed

configure

Lines changed: 0 additions & 71 deletions
Original file line numberDiff line numberDiff line change
@@ -14379,77 +14379,6 @@ $as_echo "#define HAVE_BROKEN_POLL 1" >>confdefs.h
1437914379
1438014380
fi
1438114381
14382-
# Before we can test tzset, we need to check if struct tm has a tm_zone
14383-
# (which is not required by ISO C or UNIX spec) and/or if we support
14384-
# tzname[]
14385-
ac_fn_c_check_member "$LINENO" "struct tm" "tm_zone" "ac_cv_member_struct_tm_tm_zone" "#include <sys/types.h>
14386-
#include <$ac_cv_struct_tm>
14387-
14388-
"
14389-
if test "x$ac_cv_member_struct_tm_tm_zone" = xyes; then :
14390-
14391-
cat >>confdefs.h <<_ACEOF
14392-
#define HAVE_STRUCT_TM_TM_ZONE 1
14393-
_ACEOF
14394-
14395-
14396-
fi
14397-
14398-
if test "$ac_cv_member_struct_tm_tm_zone" = yes; then
14399-
14400-
$as_echo "#define HAVE_TM_ZONE 1" >>confdefs.h
14401-
14402-
else
14403-
ac_fn_c_check_decl "$LINENO" "tzname" "ac_cv_have_decl_tzname" "#include <time.h>
14404-
"
14405-
if test "x$ac_cv_have_decl_tzname" = xyes; then :
14406-
ac_have_decl=1
14407-
else
14408-
ac_have_decl=0
14409-
fi
14410-
14411-
cat >>confdefs.h <<_ACEOF
14412-
#define HAVE_DECL_TZNAME $ac_have_decl
14413-
_ACEOF
14414-
14415-
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for tzname" >&5
14416-
$as_echo_n "checking for tzname... " >&6; }
14417-
if ${ac_cv_var_tzname+:} false; then :
14418-
$as_echo_n "(cached) " >&6
14419-
else
14420-
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
14421-
/* end confdefs.h. */
14422-
#include <time.h>
14423-
#if !HAVE_DECL_TZNAME
14424-
extern char *tzname[];
14425-
#endif
14426-
14427-
int
14428-
main ()
14429-
{
14430-
return tzname[0][0];
14431-
;
14432-
return 0;
14433-
}
14434-
_ACEOF
14435-
if ac_fn_c_try_link "$LINENO"; then :
14436-
ac_cv_var_tzname=yes
14437-
else
14438-
ac_cv_var_tzname=no
14439-
fi
14440-
rm -f core conftest.err conftest.$ac_objext \
14441-
conftest$ac_exeext conftest.$ac_ext
14442-
fi
14443-
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_var_tzname" >&5
14444-
$as_echo "$ac_cv_var_tzname" >&6; }
14445-
if test $ac_cv_var_tzname = yes; then
14446-
14447-
$as_echo "#define HAVE_TZNAME 1" >>confdefs.h
14448-
14449-
fi
14450-
fi
14451-
14452-
1445314382
# check tzset(3) exists and works like we expect it to
1445414383
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for working tzset()" >&5
1445514384
$as_echo_n "checking for working tzset()... " >&6; }

configure.ac

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4413,11 +4413,6 @@ then
44134413
[Define if poll() sets errno on invalid file descriptors.])
44144414
fi
44154415

4416-
# Before we can test tzset, we need to check if struct tm has a tm_zone
4417-
# (which is not required by ISO C or UNIX spec) and/or if we support
4418-
# tzname[]
4419-
AC_STRUCT_TIMEZONE
4420-
44214416
# check tzset(3) exists and works like we expect it to
44224417
AC_MSG_CHECKING(for working tzset())
44234418
AC_CACHE_VAL(ac_cv_working_tzset, [

0 commit comments

Comments
 (0)