X-Git-Url: https://code.delx.au/gnu-emacs/blobdiff_plain/9f6f48455f7d25e5cc2d50485d98ff3af43946a2..954b166e9037de5fdd43b4fbe7b8c73a36ac402e:/nt/configure.bat

diff --git a/nt/configure.bat b/nt/configure.bat
index 56793a0d1c..484fb83d90 100755
--- a/nt/configure.bat
+++ b/nt/configure.bat
@@ -1,7 +1,7 @@
 @echo off
 rem   ----------------------------------------------------------------------
 rem   Configuration script for MS Windows operating systems
-rem   Copyright (C) 1999-2012  Free Software Foundation, Inc.
+rem   Copyright (C) 1999-2013 Free Software Foundation, Inc.
 
 rem   This file is part of GNU Emacs.
 
@@ -174,6 +174,11 @@ echo. Note that this capability of processing parameters that include the =
 echo. character depends on command extensions.  This batch file attempts to
 echo. enable command extensions.  If command extensions cannot be enabled, a
 echo. warning message will be displayed.
+echo.
+echo. IMPORTANT: This method of building Emacs for MS-Windows is deprecated,
+echo. and could be removed in a future version of Emacs.  The preferred way
+echo  to build Emacs for MS-Windows from now on is using the MSYS environment
+echo. and MinGW development tools.  Please see nt/INSTALL.MSYS for details.
 goto end
 
 rem ----------------------------------------------------------------------
@@ -429,7 +434,7 @@ rem
 echo Checking whether Windows API headers are too old...
 echo #include "windows.h" >junk.c
 echo #include "usp10.h" >>junk.c
-echo test(PIMAGE_NT_HEADERS pHeader) >>junk.c
+echo void test(PIMAGE_NT_HEADERS pHeader) >>junk.c
 echo {PIMAGE_SECTION_HEADER pSection = IMAGE_FIRST_SECTION(pHeader);} >>junk.c
 if (%nocygwin%) == (Y) goto chkapi1
 set cf=%usercflags%
@@ -627,7 +632,10 @@ rm -f junk.c junk.obj
 if (%gifsupport%) == (N) goto gifDone
 
 echo Checking for libgif...
-echo #include "gif_lib.h" >junk.c
+rem giflib-5.0.0 needs size_t defined before gif_lib.h is included
+rem redirection characters need to be protected from the shell
+echo #include ^<stddef.h^> >junk.c
+echo #include "gif_lib.h" >>junk.c
 echo main (){} >>junk.c
 rem   -o option is ignored with cl, but allows result to be consistent.
 echo %COMPILER% %usercflags% %mingwflag% -c junk.c -o junk.obj >>config.log
@@ -949,4 +957,6 @@ set HAVE_PNG=
 set HAVE_TIFF=
 set HAVE_XPM=
 set dbginfo=
+endlocal
+set use_extensions=