diff options
| author | jan.nijtmans <nijtmans@users.sourceforge.net> | 2021-01-05 08:23:07 (GMT) |
|---|---|---|
| committer | jan.nijtmans <nijtmans@users.sourceforge.net> | 2021-01-05 08:23:07 (GMT) |
| commit | 21e01ee4e5743f2264d5c5a6e22fec1ae44d0054 (patch) | |
| tree | 233167216e2760eaf7d000c88c7466fff4d02eac | |
| parent | fd512f5f94fb4a8c8c65c2709387202c327471f8 (diff) | |
| parent | cc3b85771e2a2752fb8b1f5fee2c7b3bd4bdd453 (diff) | |
| download | tcl-21e01ee4e5743f2264d5c5a6e22fec1ae44d0054.zip tcl-21e01ee4e5743f2264d5c5a6e22fec1ae44d0054.tar.gz tcl-21e01ee4e5743f2264d5c5a6e22fec1ae44d0054.tar.bz2 | |
Merge 8.5. Restore use of AC_HEADER_STDC in win/configure.in: Wait for 8.7 to make that change
| -rw-r--r-- | win/configure.in | 26 |
1 files changed, 13 insertions, 13 deletions
diff --git a/win/configure.in b/win/configure.in index da54512..a47c3f9 100644 --- a/win/configure.in +++ b/win/configure.in @@ -60,15 +60,7 @@ fi AC_PROG_CC AC_C_INLINE -m4_warn([obsolete], -[The preprocessor macro `STDC_HEADERS' is obsolete. - Except in unusual embedded environments, you can safely include all - ISO C90 headers unconditionally.])dnl -# Autoupdate added the next two lines to ensure that your configure -# script's behavior did not change. They are probably safe to remove. -AC_CHECK_INCLUDES_DEFAULT -AC_PROG_EGREP - +AC_HEADER_STDC AC_CHECK_TOOL(AR, ar) AC_CHECK_TOOL(RANLIB, ranlib) @@ -214,7 +206,9 @@ AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[ ]], [[ FINDEX_INFO_LEVELS i; FINDEX_SEARCH_OPS j; -]])],[tcl_cv_findex_enums=yes],[tcl_cv_findex_enums=no]) +]])], + [tcl_cv_findex_enums=yes], + [tcl_cv_findex_enums=no]) ) if test "$tcl_cv_findex_enums" = "no"; then AC_DEFINE(HAVE_NO_FINDEX_ENUMS, 1, @@ -232,7 +226,9 @@ AC_LINK_IFELSE([AC_LANG_PROGRAM([[ #include <intrin.h> ]], [[ __cpuidex(0,0,0); -]])],[tcl_cv_intrinsics=yes],[tcl_cv_intrinsics=no]) +]])], + [tcl_cv_intrinsics=yes], + [tcl_cv_intrinsics=no]) ) if test "$tcl_cv_intrinsics" = "yes"; then AC_DEFINE(HAVE_INTRIN_H, 1, @@ -245,7 +241,9 @@ AC_CACHE_CHECK(for wspiapi.h, tcl_cv_wspiapi_h, AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[ #include <wspiapi.h> -]], [[]])],[tcl_cv_wspiapi_h=yes],[tcl_cv_wspiapi_h=no]) +]], [[]])], + [tcl_cv_wspiapi_h=yes], + [tcl_cv_wspiapi_h=no]) ) if test "$tcl_cv_wspiapi_h" = "yes"; then AC_DEFINE(HAVE_WSPIAPI_H, 1, @@ -265,7 +263,9 @@ AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[ ]], [[ FINDEX_INFO_LEVELS i; FINDEX_SEARCH_OPS j; -]])],[tcl_cv_findex_enums=yes],[tcl_cv_findex_enums=no]) +]])], + [tcl_cv_findex_enums=yes], + [tcl_cv_findex_enums=no]) ) if test "$tcl_cv_findex_enums" = "no"; then AC_DEFINE(HAVE_NO_FINDEX_ENUMS, 1, |