# HG changeset patch # User Eli Zaretskii # Date 985613721 0 # Node ID baaa260e9a27d9593594c76324b4d080a15d4a5e # Parent 5e3ac767a943b5e60cabeac3e42c969db4b1a9f5 Make the checkw32api* labels be distinct in the first 8 characters. diff -r 5e3ac767a943 -r baaa260e9a27 nt/configure.bat --- a/nt/configure.bat Mon Mar 26 13:34:10 2001 +0000 +++ b/nt/configure.bat Mon Mar 26 13:35:21 2001 +0000 @@ -179,17 +179,21 @@ del junk.o :checkgcc -if (%nocygwin%) == (Y) goto checkw32api +Rem WARNING -- COMMAND.COM on some systems only looks at the first +Rem 8 characters of a lable. So do NOT be tempted to change +Rem chkapi* into something fancier like checkw32api +Rem You HAVE been warned! +if (%nocygwin%) == (Y) goto chkapi echo Checking whether gcc requires '-mno-cygwin'... echo #include "cygwin/version.h" >junk.c echo main(){} >>junk.c gcc -c junk.c -if not exist junk.o goto checkw32api +if not exist junk.o goto chkapi gcc -mno-cygwin -c junk.c if exist junk.o set nocygwin=Y rm -f junk.c junk.o -:checkw32api +:chk32api rem ---------------------------------------------------------------------- rem Older versions of the Windows API headers either don't have any of rem the IMAGE_xxx definitions (the headers that come with Cygwin b20.1 @@ -202,12 +206,12 @@ echo #include "windows.h" >junk.c echo test(PIMAGE_NT_HEADERS pHeader) >>junk.c echo {PIMAGE_SECTION_HEADER pSection = IMAGE_FIRST_SECTION(pHeader);} >>junk.c -if (%nocygwin%) == (Y) goto checkw32api1 +if (%nocygwin%) == (Y) goto chkapi1 set cf=%usercflags% -goto checkw32api2 -:checkw32api1 +goto chkapi2 +:chkapi1 set cf=%usercflags% -mno-cygwin -:checkw32api2 +:chkapi2 echo on gcc %cf% -c junk.c echo off