HCoop
/
bpt
/
emacs.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix outdated timestamp documentation in Elisp manual.
[bpt/emacs.git]
/
nt
/
configure.bat
diff --git
a/nt/configure.bat
b/nt/configure.bat
index
e91165d
..
3118bb1
100755
(executable)
--- a/
nt/configure.bat
+++ b/
nt/configure.bat
@@
-23,7
+23,7
@@
rem YOU'LL NEED THE FOLLOWING UTILITIES TO MAKE EMACS:
rem
\r
rem + MS Windows 95, NT or later
\r
rem + either MSVC 2.x or later, or gcc-2.95 or later (with GNU make 3.75
\r
rem
\r
rem + MS Windows 95, NT or later
\r
rem + either MSVC 2.x or later, or gcc-2.95 or later (with GNU make 3.75
\r
-rem or later) and the Mingw32 and W
32
API headers and libraries.
\r
+rem or later) and the Mingw32 and W
indows
API headers and libraries.
\r
rem + Visual Studio 2005 is not supported at this time.
\r
rem
\r
rem For reference, here is a list of which builds of GNU make are known to
\r
rem + Visual Studio 2005 is not supported at this time.
\r
rem
\r
rem For reference, here is a list of which builds of GNU make are known to
\r
@@
-426,10
+426,10
@@
rem problem). The gcc/mingw32 2.95.2 headers are okay, as are distros
rem of w32api-xxx.zip from Anders Norlander since 1999-11-18 at least.
\r
rem Beginning with Emacs 23, we need usp10.h.
\r
rem
\r
rem of w32api-xxx.zip from Anders Norlander since 1999-11-18 at least.
\r
rem Beginning with Emacs 23, we need usp10.h.
\r
rem
\r
-echo Checking whether W
32
API headers are too old...
\r
+echo Checking whether W
indows
API headers are too old...
\r
echo #include "windows.h" >junk.c
\r
echo #include "usp10.h" >>junk.c
\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
echo {PIMAGE_SECTION_HEADER pSection = IMAGE_FIRST_SECTION(pHeader);} >>junk.c
\r
if (%nocygwin%) == (Y) goto chkapi1
\r
set cf=%usercflags%
\r
@@
-469,7
+469,7
@@
goto end
echo.
\r
echo Configure failed.
\r
echo To configure Emacs for Windows, you need to have either
\r
echo.
\r
echo Configure failed.
\r
echo To configure Emacs for Windows, you need to have either
\r
-echo gcc-2.95 or later with Mingw32 and the W
32
API headers,
\r
+echo gcc-2.95 or later with Mingw32 and the W
indows
API headers,
\r
echo or MSVC 2.x or later.
\r
del junk.c
\r
goto end
\r
echo or MSVC 2.x or later.
\r
del junk.c
\r
goto end
\r
@@
-627,7
+627,10
@@
rm -f junk.c junk.obj
if (%gifsupport%) == (N) goto gifDone
\r
\r
echo Checking for libgif...
\r
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
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
+952,6
@@
set HAVE_PNG=
set HAVE_TIFF=
\r
set HAVE_XPM=
\r
set dbginfo=
\r
set HAVE_TIFF=
\r
set HAVE_XPM=
\r
set dbginfo=
\r
+endlocal
\r
+set use_extensions=
\r
\r
\r