(checkgcc): Move "del junk.o" to here, and make it conditional on existence

of junk.o.  If %nocygwin% is already set to Y, skip to chkapiN instead of
chkapi.
(chkapi): Move "rm -f junk.c junk.o" to here.
(chkapiN): New label.

diff --git a/nt/ChangeLog b/nt/ChangeLog
index 5aca8fbeddc617e04db10fb8d1c48576a67c7254..847bb2af50060d3e4a57f1eefe6d5f769eb0f3b4 100644 (file)
--- a/nt/ChangeLog
+++ b/nt/ChangeLog
@@ -1,3 +1,11 @@
+2008-02-11  Eli Zaretskii  <eliz@gnu.org>
+
+       * configure.bat (checkgcc): Move "del junk.o" to here, and make it
+       conditional on existence of junk.o.  If %nocygwin% is already set
+       to Y, skip to chkapiN instead of chkapi.
+       (chkapi): Move "rm -f junk.c junk.o" to here.
+       (chkapiN): New label.
+
 2008-02-11  Jason Rumney  <jasonr@gnu.org>
 
        * makefile.w32-in: Remove unidata-gen related rules.

diff --git a/nt/configure.bat b/nt/configure.bat
index ace5996f07e72bbb8ee902e3b1b025c7575f99e3..98ff0567142ecceb94d1986000d5f878da775f4d 100755 (executable)
--- a/nt/configure.bat
+++ b/nt/configure.bat
@@ -248,7 +248,6 @@ echo Checking whether 'gcc' is available...
 echo main(){} >junk.c\r
 gcc -c junk.c\r
 if exist junk.o goto checkgcc\r
-del junk.o\r
 \r
 echo Checking whether 'cl' is available...\r
 cl -nologo -c junk.c\r
@@ -256,11 +255,12 @@ if exist junk.obj goto clOK
 goto nocompiler\r
 \r
 :checkgcc\r
+if exist junk.o del junk.o\r
 Rem WARNING -- COMMAND.COM on some systems only looks at the first\r
 Rem            8 characters of a label.  So do NOT be tempted to change\r
 Rem            chkapi* into something fancier like checkw32api\r
 Rem You HAVE been warned!\r
-if (%nocygwin%) == (Y) goto chkapi\r
+if (%nocygwin%) == (Y) goto chkapiN\r
 echo Checking whether gcc requires '-mno-cygwin'...\r
 echo #include "cygwin/version.h" >junk.c\r
 echo main(){} >>junk.c\r
@@ -270,11 +270,12 @@ if not exist junk.o goto chkapi
 echo gcc -mno-cygwin -c junk.c >>config.log\r
 gcc -mno-cygwin -c junk.c >>config.log 2>&1\r
 if exist junk.o set nocygwin=Y\r
-rm -f junk.c junk.o\r
 \r
 :chkapi\r
 echo The failed program was: >>config.log\r
 type junk.c >>config.log\r
+:chkapiN\r
+rm -f junk.c junk.o\r
 rem ----------------------------------------------------------------------\r
 rem   Older versions of the Windows API headers either don't have any of\r
 rem   the IMAGE_xxx definitions (the headers that come with Cygwin b20.1\r