3 files changed, 29 insertions, 3 deletions

diff --git a/nt/ChangeLog b/nt/ChangeLog
index 8ed5caa4aab..ebc823071a3 100644
--- a/nt/ChangeLog
+++ b/nt/ChangeLog
@@ -1,7 +1,17 @@
+2013-08-25  Vincent Belaïche  <vincentb1@users.sourceforge.net>
+
+        * configure.bat: Rather than disabling, make configure.bat produce
+        some warning that building with configure.bat is deprecated and
+        ask for confirmation to continue.
+
+2013-08-25  Glenn Morris  <rgm@gnu.org>
+
+        * INSTALL: Refer to INSTALL.MSYS.
+        * configure.bat: Disable it.
+
 2013-08-04  Eli Zaretskii  <eliz@gnu.org>
 
-        * mingw-cfg.site (ac_cv_func_mkostemp): New var with value of
-        "yes".
+        * mingw-cfg.site (ac_cv_func_mkostemp): New var with value of "yes".
 
         * inc/ms-w32.h (mkostemp): Declare prototype.
         (mktemp): Don't redirect to sys_mktemp.
diff --git a/nt/INSTALL b/nt/INSTALL
index 8abd8aff920..594ff9ff752 100644
--- a/nt/INSTALL
+++ b/nt/INSTALL
@@ -4,6 +4,9 @@
   Copyright (C) 2001-2013 Free Software Foundation, Inc.
   See the end of the file for license conditions.
 
+*** This method of building Emacs is no longer supported. ***
+    Instead, see INSTALL.MSYS.
+
 * For the impatient
 
   Here are the concise instructions for configuring and building the
diff --git a/nt/configure.bat b/nt/configure.bat
index 484fb83d901..8f717fd4168 100755
--- a/nt/configure.bat
+++ b/nt/configure.bat
@@ -58,7 +58,20 @@ rem    	look for "cygpath" near line 85 of gmake.defs.
 rem [7] not recommended; please report if you try this combination.

 rem [8] tested only on Windows XP.

 rem

-

+echo ****************************************************************

+echo *** THIS METHOD OF BUILDING EMACS IS NO LONGER SUPPORTED.     **

+echo *** INSTEAD, FOLLOW THE INSTRUCTIONS FROM INSTALL.MSYS.       **

+echo ****************************************************************

+:confirm_continue

+set /p answer=Continue running this script at your own risks ? (Y/N)

+if x%answer% == xy (goto confirm_continue_y)

+if x%answer% == xY (goto confirm_continue_y)

+if x%answer% == xn (goto end)

+if x%answer% == xN (goto end)

+echo Please answer by Y or N

+goto confirm_continue

+

+:confirm_continue_y

 if exist config.log del config.log

 

 rem ----------------------------------------------------------------------