diff options
| author | jan.nijtmans <nijtmans@users.sourceforge.net> | 2021-01-05 14:27:27 (GMT) |
|---|---|---|
| committer | jan.nijtmans <nijtmans@users.sourceforge.net> | 2021-01-05 14:27:27 (GMT) |
| commit | 9f96f3816e86d6b0b51042e961d23652acdb059c (patch) | |
| tree | 270bd48f20a51fb86d3f57cf94d22d82e768d4eb /unix | |
| parent | f8e1773f67683fa5b2761e15b95daa018d23f6af (diff) | |
| parent | edb8fe7c9b57821a78ccb20165e7322cc7e0a171 (diff) | |
| download | tcl-9f96f3816e86d6b0b51042e961d23652acdb059c.zip tcl-9f96f3816e86d6b0b51042e961d23652acdb059c.tar.gz tcl-9f96f3816e86d6b0b51042e961d23652acdb059c.tar.bz2 | |
Merge 8.5
Diffstat (limited to 'unix')
| -rwxr-xr-x | unix/configure | 2 | ||||
| -rw-r--r-- | unix/configure.in | 3 | ||||
| -rw-r--r-- | unix/tclConfig.h.in | 3 |
3 files changed, 5 insertions, 3 deletions
diff --git a/unix/configure b/unix/configure index b71cdaa..f383c12 100755 --- a/unix/configure +++ b/unix/configure @@ -13961,7 +13961,7 @@ cat >>conftest.$ac_ext <<_ACEOF int main () { -struct tm tm; tm.tm_tzadj; +struct tm tm; (void)tm.tm_tzadj; ; return 0; } diff --git a/unix/configure.in b/unix/configure.in index 8e9be93..21e47376 100644 --- a/unix/configure.in +++ b/unix/configure.in @@ -17,8 +17,9 @@ m4_ifdef([SC_USE_CONFIG_HEADERS], [ /* Undef unused package specific autoheader defines so that we can * include both tclConfig.h and tkConfig.h at the same time: */ /* override */ #undef PACKAGE_NAME - /* override */ #undef PACKAGE_STRING /* override */ #undef PACKAGE_TARNAME + /* override */ #undef PACKAGE_VERSION + /* override */ #undef PACKAGE_STRING #endif /* _TCLCONFIG */]) ]) diff --git a/unix/tclConfig.h.in b/unix/tclConfig.h.in index ce9c8d0..c8d4e0c 100644 --- a/unix/tclConfig.h.in +++ b/unix/tclConfig.h.in @@ -514,6 +514,7 @@ /* Undef unused package specific autoheader defines so that we can * include both tclConfig.h and tkConfig.h at the same time: */ /* override */ #undef PACKAGE_NAME - /* override */ #undef PACKAGE_STRING /* override */ #undef PACKAGE_TARNAME + /* override */ #undef PACKAGE_VERSION + /* override */ #undef PACKAGE_STRING #endif /* _TCLCONFIG */ |