Skip to content

Commit a4414ef

Browse files
authored
Don't run AC_STRUCT_TIMEZONE twice. (GH-9305)
1 parent 9b9d97d commit a4414ef

File tree

2 files changed

+0
-76
lines changed

2 files changed

+0
-76
lines changed

configure

-71
Original file line numberDiff line numberDiff line change
@@ -15344,77 +15344,6 @@ $as_echo "#define HAVE_BROKEN_POLL 1" >>confdefs.h
1534415344

1534515345
fi
1534615346

15347-
# Before we can test tzset, we need to check if struct tm has a tm_zone
15348-
# (which is not required by ISO C or UNIX spec) and/or if we support
15349-
# tzname[]
15350-
ac_fn_c_check_member "$LINENO" "struct tm" "tm_zone" "ac_cv_member_struct_tm_tm_zone" "#include <sys/types.h>
15351-
#include <$ac_cv_struct_tm>
15352-
15353-
"
15354-
if test "x$ac_cv_member_struct_tm_tm_zone" = xyes; then :
15355-
15356-
cat >>confdefs.h <<_ACEOF
15357-
#define HAVE_STRUCT_TM_TM_ZONE 1
15358-
_ACEOF
15359-
15360-
15361-
fi
15362-
15363-
if test "$ac_cv_member_struct_tm_tm_zone" = yes; then
15364-
15365-
$as_echo "#define HAVE_TM_ZONE 1" >>confdefs.h
15366-
15367-
else
15368-
ac_fn_c_check_decl "$LINENO" "tzname" "ac_cv_have_decl_tzname" "#include <time.h>
15369-
"
15370-
if test "x$ac_cv_have_decl_tzname" = xyes; then :
15371-
ac_have_decl=1
15372-
else
15373-
ac_have_decl=0
15374-
fi
15375-
15376-
cat >>confdefs.h <<_ACEOF
15377-
#define HAVE_DECL_TZNAME $ac_have_decl
15378-
_ACEOF
15379-
15380-
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for tzname" >&5
15381-
$as_echo_n "checking for tzname... " >&6; }
15382-
if ${ac_cv_var_tzname+:} false; then :
15383-
$as_echo_n "(cached) " >&6
15384-
else
15385-
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
15386-
/* end confdefs.h. */
15387-
#include <time.h>
15388-
#if !HAVE_DECL_TZNAME
15389-
extern char *tzname[];
15390-
#endif
15391-
15392-
int
15393-
main ()
15394-
{
15395-
return tzname[0][0];
15396-
;
15397-
return 0;
15398-
}
15399-
_ACEOF
15400-
if ac_fn_c_try_link "$LINENO"; then :
15401-
ac_cv_var_tzname=yes
15402-
else
15403-
ac_cv_var_tzname=no
15404-
fi
15405-
rm -f core conftest.err conftest.$ac_objext \
15406-
conftest$ac_exeext conftest.$ac_ext
15407-
fi
15408-
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_var_tzname" >&5
15409-
$as_echo "$ac_cv_var_tzname" >&6; }
15410-
if test $ac_cv_var_tzname = yes; then
15411-
15412-
$as_echo "#define HAVE_TZNAME 1" >>confdefs.h
15413-
15414-
fi
15415-
fi
15416-
15417-
1541815347
# check tzset(3) exists and works like we expect it to
1541915348
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for working tzset()" >&5
1542015349
$as_echo_n "checking for working tzset()... " >&6; }

configure.ac

-5
Original file line numberDiff line numberDiff line change
@@ -4744,11 +4744,6 @@ then
47444744
[Define if poll() sets errno on invalid file descriptors.])
47454745
fi
47464746

4747-
# Before we can test tzset, we need to check if struct tm has a tm_zone
4748-
# (which is not required by ISO C or UNIX spec) and/or if we support
4749-
# tzname[]
4750-
AC_STRUCT_TIMEZONE
4751-
47524747
# check tzset(3) exists and works like we expect it to
47534748
AC_MSG_CHECKING(for working tzset())
47544749
AC_CACHE_VAL(ac_cv_working_tzset, [

0 commit comments

Comments
 (0)