More progress in autoconf-2.70 compatibility. Not to be merged to 8.6 yet!

3 files changed, 27 insertions, 25 deletions

diff --git a/unix/configure.in b/unix/configure.in
index 7c50261..e66fbf0 100644
--- a/unix/configure.in
+++ b/unix/configure.in
@@ -4,7 +4,7 @@ dnl	generate the file "configure", which is run during Tcl installation
 dnl	to configure the system for the local environment.
 
 AC_INIT([tcl],[8.5])
-AC_PREREQ(2.59)
+AC_PREREQ([2.59])
 
 dnl This is only used when included from macosx/configure.ac
 m4_ifdef([SC_USE_CONFIG_HEADERS], [
diff --git a/win/configure.in b/win/configure.in
index 78cf422..44656b9 100644
--- a/win/configure.in
+++ b/win/configure.in
@@ -3,8 +3,9 @@
 # generate the file "configure", which is run during Tcl installation
 # to configure the system for the local environment.
 
-AC_INIT(../generic/tcl.h)
-AC_PREREQ(2.59)
+AC_INIT([tcl],[8.5])
+AC_CONFIG_SRCDIR([../generic/tcl.h])
+AC_PREREQ([2.59])
 
 # The following define is needed when building with Cygwin since newer
 # versions of autoconf incorrectly set SHELL to /bin/bash instead of
@@ -162,8 +163,8 @@ AC_TRY_COMPILE([
   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,
@@ -367,8 +368,9 @@ AC_SUBST(RC_DEFINE)
 AC_SUBST(RC_DEFINES)
 AC_SUBST(RES)
 
-AC_OUTPUT(Makefile tclConfig.sh tcl.hpj tclsh.exe.manifest)
+AC_CONFIG_FILES([Makefile tclConfig.sh tcl.hpj tclsh.exe.manifest])
+AC_OUTPUT
 
 dnl Local Variables:
-dnl mode: autoconf;
+dnl mode: autoconf
 dnl End:
diff --git a/win/tcl.m4 b/win/tcl.m4
index 4ef907e..683607d 100644
--- a/win/tcl.m4
+++ b/win/tcl.m4
@@ -568,8 +568,8 @@ AC_DEFUN([SC_CONFIG_CFLAGS], [
 		#error cross-compiler
 	    #endif
 	], [],
-	ac_cv_cross=no,
-	ac_cv_cross=yes)
+	[ac_cv_cross=no],
+	[ac_cv_cross=yes])
       )
 
       if test "$ac_cv_cross" = "yes"; then
@@ -635,8 +635,8 @@ AC_DEFUN([SC_CONFIG_CFLAGS], [
 		    #error win32
 		#endif
 	    ], [],
-	    ac_cv_win32=no,
-	    ac_cv_win32=yes)
+	    [ac_cv_win32=no],
+	    [ac_cv_win32=yes])
 	)
 	if test "$ac_cv_win32" != "yes"; then
 	    AC_MSG_ERROR([${CC} cannot produce win32 executables.])
@@ -741,13 +741,13 @@ AC_DEFUN([SC_CONFIG_CFLAGS], [
 			#error 32-bit
 		    #endif
 		], [],
-			tcl_win_64bit=yes,
-			tcl_win_64bit=no
+		    [tcl_win_64bit=yes],
+		    [tcl_win_64bit=no]
 		)
 		if test "$tcl_win_64bit" = "yes" ; then
-			do64bit=amd64
-			MACHINE="AMD64"
-			AC_MSG_RESULT([   Using 64-bit $MACHINE mode])
+		    do64bit=amd64
+		    MACHINE="AMD64"
+		    AC_MSG_RESULT([   Using 64-bit $MACHINE mode])
 		fi
 		;;
 	esac
@@ -977,9 +977,9 @@ AC_DEFUN([SC_CONFIG_CFLAGS], [
 		return 1;
 	    }
 	],
-	    tcl_cv_seh=yes,
-	    tcl_cv_seh=no,
-	    tcl_cv_seh=no)
+	    [tcl_cv_seh=yes],
+	    [tcl_cv_seh=no],
+	    [tcl_cv_seh=no])
 	)
 	if test "$tcl_cv_seh" = "no" ; then
 	    AC_DEFINE(HAVE_NO_SEH, 1,
@@ -1001,8 +1001,8 @@ AC_DEFUN([SC_CONFIG_CFLAGS], [
 	    ],[
 		EXCEPTION_DISPOSITION x;
 	    ],
-		tcl_cv_eh_disposition=yes,
-		tcl_cv_eh_disposition=no)
+	    [tcl_cv_eh_disposition=yes],
+	    [tcl_cv_eh_disposition=no])
 	)
 	if test "$tcl_cv_eh_disposition" = "no" ; then
 	AC_DEFINE(EXCEPTION_DISPOSITION, int,
@@ -1025,8 +1025,8 @@ AC_DEFUN([SC_CONFIG_CFLAGS], [
 		SHORT s;
 		LONG l;
 	    ],
-	    tcl_cv_winnt_ignore_void=yes,
-	    tcl_cv_winnt_ignore_void=no)
+	    [tcl_cv_winnt_ignore_void=yes],
+	    [tcl_cv_winnt_ignore_void=no])
 	)
 	if test "$tcl_cv_winnt_ignore_void" = "yes" ; then
 	    AC_DEFINE(HAVE_WINNT_IGNORE_VOID, 1,
@@ -1044,8 +1044,8 @@ AC_DEFUN([SC_CONFIG_CFLAGS], [
 		  union foo { int i; double d; };
 		  union foo f = (union foo) (int) 0;
 	    ],
-	    tcl_cv_cast_to_union=yes,
-	    tcl_cv_cast_to_union=no)
+	    [tcl_cv_cast_to_union=yes],
+	    [tcl_cv_cast_to_union=no])
 	)
 	if test "$tcl_cv_cast_to_union" = "yes"; then
 	    AC_DEFINE(HAVE_CAST_TO_UNION, 1,