Skip to content

Commit c974051

Browse files
Don't run AC_STRUCT_TIMEZONE twice. (GH-9305)
(cherry picked from commit a4414ef) Co-authored-by: Benjamin Peterson <[email protected]>
1 parent a8f189f commit c974051

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
@@ -15510,77 +15510,6 @@ $as_echo "#define HAVE_BROKEN_POLL 1" >>confdefs.h
1551015510

1551115511
fi
1551215512

15513-
# Before we can test tzset, we need to check if struct tm has a tm_zone
15514-
# (which is not required by ISO C or UNIX spec) and/or if we support
15515-
# tzname[]
15516-
ac_fn_c_check_member "$LINENO" "struct tm" "tm_zone" "ac_cv_member_struct_tm_tm_zone" "#include <sys/types.h>
15517-
#include <$ac_cv_struct_tm>
15518-
15519-
"
15520-
if test "x$ac_cv_member_struct_tm_tm_zone" = xyes; then :
15521-
15522-
cat >>confdefs.h <<_ACEOF
15523-
#define HAVE_STRUCT_TM_TM_ZONE 1
15524-
_ACEOF
15525-
15526-
15527-
fi
15528-
15529-
if test "$ac_cv_member_struct_tm_tm_zone" = yes; then
15530-
15531-
$as_echo "#define HAVE_TM_ZONE 1" >>confdefs.h
15532-
15533-
else
15534-
ac_fn_c_check_decl "$LINENO" "tzname" "ac_cv_have_decl_tzname" "#include <time.h>
15535-
"
15536-
if test "x$ac_cv_have_decl_tzname" = xyes; then :
15537-
ac_have_decl=1
15538-
else
15539-
ac_have_decl=0
15540-
fi
15541-
15542-
cat >>confdefs.h <<_ACEOF
15543-
#define HAVE_DECL_TZNAME $ac_have_decl
15544-
_ACEOF
15545-
15546-
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for tzname" >&5
15547-
$as_echo_n "checking for tzname... " >&6; }
15548-
if ${ac_cv_var_tzname+:} false; then :
15549-
$as_echo_n "(cached) " >&6
15550-
else
15551-
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
15552-
/* end confdefs.h. */
15553-
#include <time.h>
15554-
#if !HAVE_DECL_TZNAME
15555-
extern char *tzname[];
15556-
#endif
15557-
15558-
int
15559-
main ()
15560-
{
15561-
return tzname[0][0];
15562-
;
15563-
return 0;
15564-
}
15565-
_ACEOF
15566-
if ac_fn_c_try_link "$LINENO"; then :
15567-
ac_cv_var_tzname=yes
15568-
else
15569-
ac_cv_var_tzname=no
15570-
fi
15571-
rm -f core conftest.err conftest.$ac_objext \
15572-
conftest$ac_exeext conftest.$ac_ext
15573-
fi
15574-
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_var_tzname" >&5
15575-
$as_echo "$ac_cv_var_tzname" >&6; }
15576-
if test $ac_cv_var_tzname = yes; then
15577-
15578-
$as_echo "#define HAVE_TZNAME 1" >>confdefs.h
15579-
15580-
fi
15581-
fi
15582-
15583-
1558415513
# check tzset(3) exists and works like we expect it to
1558515514
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for working tzset()" >&5
1558615515
$as_echo_n "checking for working tzset()... " >&6; }

configure.ac

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

4869-
# Before we can test tzset, we need to check if struct tm has a tm_zone
4870-
# (which is not required by ISO C or UNIX spec) and/or if we support
4871-
# tzname[]
4872-
AC_STRUCT_TIMEZONE
4873-
48744869
# check tzset(3) exists and works like we expect it to
48754870
AC_MSG_CHECKING(for working tzset())
48764871
AC_CACHE_VAL(ac_cv_working_tzset, [

0 commit comments

Comments
 (0)