Use correct options when compiling a test program with Cygwin.

From David Ponce <dponce@voila.fr>.

diff --git a/nt/ChangeLog b/nt/ChangeLog
index 3da2760eeea7afa2ac016a5fa26ef4e776178c2e..445639c27dfc02ec4a0d3f91308e34a5fd672471 100644 (file)
--- a/nt/ChangeLog
+++ b/nt/ChangeLog
@@ -1,3 +1,8 @@
+2001-03-05  Eli Zaretskii <eliz@is.elta.co.il>\r
+\r
+       * configure.bat: Use correct options when compiling a test program\r
+       with Cygwin.  From David Ponce <dponce@voila.fr>.\r
+\r
 2001-02-24  Andrew Innes  <andrewi@gnu.org>\r
 \r
        * _emacs: Remove obsolete file.\r

diff --git a/nt/configure.bat b/nt/configure.bat
index 4fd8ea549bd27312b2edd88a9d7ff24a8a8a7965..5ef561364696d0f73ad82bb33b134d402f1f4bff 100755 (executable)
--- a/nt/configure.bat
+++ b/nt/configure.bat
@@ -202,7 +202,16 @@ echo Checking whether W32 API headers are too old...
 echo #include "windows.h" >junk.c\r
 echo test(PIMAGE_NT_HEADERS pHeader) >>junk.c\r
 echo {PIMAGE_SECTION_HEADER pSection = IMAGE_FIRST_SECTION(pHeader);} >>junk.c\r
-gcc -c junk.c\r
+if (%nocygwin%) == (Y) goto checkw32api1\r
+set cf=%usercflags%\r
+goto checkw32api2\r
+:checkw32api1\r
+set cf=%usercflags% -mno-cygwin\r
+:checkw32api2\r
+echo on\r
+gcc %cf% -c junk.c\r
+echo off\r
+set cf=\r
 if exist junk.o goto gccOk\r
 \r
 :nocompiler\r