Fix bug #12464 with test for giflib 5.0.0 on MS-Windows.

 nt/configure.bat: Include stddef.h before gif_lib.h, to have size_t
 defined, as needed by giflib-5.0.0.

diff --git a/nt/ChangeLog b/nt/ChangeLog
index 106f0e91695ba1c9dd501c164efa6e69c2d467fa..311a10f66c577e4b154fbe1f61ef4b8d980bdc66 100644 (file)
--- a/nt/ChangeLog
+++ b/nt/ChangeLog
@@ -1,3 +1,8 @@
+2012-09-18  Eli Zaretskii  <eliz@gnu.org>
+
+       * configure.bat: Include stddef.h before gif_lib.h, to have size_t
+       defined, as needed by giflib-5.0.0.  (Bug#12464)
+
 2012-09-17  Juanma Barranquero  <lekktu@gmail.com>
 
        * config.nt: Sync with autogen/config.in.

diff --git a/nt/configure.bat b/nt/configure.bat
index 5890b12d02e751891475b3af51ade82a8f9e8397..7fedff411bc3c6e24993cb3d4ce1667f4c41cd0b 100755 (executable)
--- a/nt/configure.bat
+++ b/nt/configure.bat
@@ -627,7 +627,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