Clean up unnecessary references to Bazaar. Documentation changes only.

[bpt/emacs.git] / nt / configure.bat

diff --git a/nt/configure.bat b/nt/configure.bat
index 56793a0..5460f4c 100755 (executable)
--- a/nt/configure.bat
+++ b/nt/configure.bat
@@ -1,7 +1,7 @@
 @echo off\r
 rem   ----------------------------------------------------------------------\r
 rem   Configuration script for MS Windows operating systems\r
-rem   Copyright (C) 1999-2012  Free Software Foundation, Inc.\r
+rem   Copyright (C) 1999-2014 Free Software Foundation, Inc.\r
 \r
 rem   This file is part of GNU Emacs.\r
 \r
@@ -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.\r
 rem [8] tested only on Windows XP.\r
 rem\r
-\r
+echo ****************************************************************\r
+echo *** THIS METHOD OF BUILDING EMACS IS NO LONGER SUPPORTED.     **\r
+echo *** INSTEAD, FOLLOW THE INSTRUCTIONS FROM INSTALL.            **\r
+echo ****************************************************************\r
+:confirm_continue\r
+set /p answer=Continue running this script at your own risks ? (Y/N)\r
+if x%answer% == xy (goto confirm_continue_y)\r
+if x%answer% == xY (goto confirm_continue_y)\r
+if x%answer% == xn (goto end)\r
+if x%answer% == xN (goto end)\r
+echo Please answer by Y or N\r
+goto confirm_continue\r
+\r
+:confirm_continue_y\r
 if exist config.log del config.log\r
 \r
 rem ----------------------------------------------------------------------\r
@@ -174,6 +187,11 @@ echo. Note that this capability of processing parameters that include the =
 echo. character depends on command extensions.  This batch file attempts to\r
 echo. enable command extensions.  If command extensions cannot be enabled, a\r
 echo. warning message will be displayed.\r
+echo.\r
+echo. IMPORTANT: This method of building Emacs for MS-Windows is deprecated,\r
+echo. and could be removed in a future version of Emacs.  The preferred way\r
+echo  to build Emacs for MS-Windows from now on is using the MSYS environment\r
+echo. and MinGW development tools.  Please see nt/INSTALL for details.\r
 goto end\r
 \r
 rem ----------------------------------------------------------------------\r
@@ -429,7 +447,7 @@ rem
 echo Checking whether Windows API headers are too old...\r
 echo #include "windows.h" >junk.c\r
 echo #include "usp10.h" >>junk.c\r
-echo test(PIMAGE_NT_HEADERS pHeader) >>junk.c\r
+echo void test(PIMAGE_NT_HEADERS pHeader) >>junk.c\r
 echo {PIMAGE_SECTION_HEADER pSection = IMAGE_FIRST_SECTION(pHeader);} >>junk.c\r
 if (%nocygwin%) == (Y) goto chkapi1\r
 set cf=%usercflags%\r
@@ -627,7 +645,10 @@ rm -f junk.c junk.obj
 if (%gifsupport%) == (N) goto gifDone\r
 \r
 echo Checking for libgif...\r
-echo #include "gif_lib.h" >junk.c\r
+rem giflib-5.0.0 needs size_t defined before gif_lib.h is included\r
+rem redirection characters need to be protected from the shell\r
+echo #include ^<stddef.h^> >junk.c\r
+echo #include "gif_lib.h" >>junk.c\r
 echo main (){} >>junk.c\r
 rem   -o option is ignored with cl, but allows result to be consistent.\r
 echo %COMPILER% %usercflags% %mingwflag% -c junk.c -o junk.obj >>config.log\r
@@ -949,4 +970,5 @@ set HAVE_PNG=
 set HAVE_TIFF=\r
 set HAVE_XPM=\r
 set dbginfo=\r
-\r
+endlocal\r
+set use_extensions=\r