Use -mno-cygwin to check for image libraries when needed.

diff --git a/nt/ChangeLog b/nt/ChangeLog
index 73d4f6ee5d13658d65b25ca7e22f8dc585d19a5d..fa411283e761ce2cff1b2cfa60da71d771d8dabe 100644 (file)
--- a/nt/ChangeLog
+++ b/nt/ChangeLog
@@ -1,3 +1,8 @@
+2004-05-06  Jason Rumney  <jasonr@gnu.org>
+
+       * configure.bat: Use -mno-cygwin to check for image libraries
+       when needed.
+
 2004-05-03  Jason Rumney  <jasonr@gnu.org>
 
        * makefile.nt, ebuild.bat, install.bat, fast-install.bat:

diff --git a/nt/configure.bat b/nt/configure.bat
index a27bbcd8cddefd617fb97443417ac914270a3fed..216420873c73700662ced311a597a0786d75b4f0 100755 (executable)
--- a/nt/configure.bat
+++ b/nt/configure.bat
@@ -294,13 +294,20 @@ rem   Check for external image libraries. Since they are loaded
 rem   dynamically, the libraries themselves do not need to be present\r
 rem   at compile time, but the header files are required.\r
 \r
+set mingwflag=\r
+\r
+if (%nocygwin%) == (N) goto flagsOK\r
+set mingwflag=-mno-cygwin\r
+\r
+:flagsOK\r
+\r
 if (%pngsupport%) == (N) goto pngDone\r
 \r
 echo Checking for libpng...\r
 echo #include "png.h" >junk.c\r
 echo main (){} >>junk.c\r
 rem   -o option is ignored with cl, but allows result to be consistent.\r
-%COMPILER% %usercflags% -c junk.c -o junk.obj >junk.out 2>junk.err\r
+%COMPILER% %usercflags% %mingwflag% -c junk.c -o junk.obj >junk.out 2>junk.err\r
 if exist junk.obj goto havePng\r
 \r
 echo ...png.h not found, building without PNG support.\r
@@ -320,7 +327,7 @@ echo Checking for jpeg-6b...
 echo #include "jconfig.h" >junk.c\r
 echo main (){} >>junk.c\r
 rem   -o option is ignored with cl, but allows result to be consistent.\r
-%COMPILER% %usercflags% -c junk.c -o junk.obj >junk.out 2>junk.err\r
+%COMPILER% %usercflags% %mingwflag% -c junk.c -o junk.obj >junk.out 2>junk.err\r
 if exist junk.obj goto haveJpeg\r
 \r
 echo ...jconfig.h not found, building without JPEG support.\r
@@ -340,7 +347,7 @@ echo Checking for libgif...
 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
-%COMPILER% %usercflags% -c junk.c -o junk.obj >junk.out 2>junk.err\r
+%COMPILER% %usercflags% %mingwflag% -c junk.c -o junk.obj >junk.out 2>junk.err\r
 if exist junk.obj goto haveGif\r
 \r
 echo ...gif_lib.h not found, building without GIF support.\r
@@ -360,7 +367,7 @@ echo Checking for tiff...
 echo #include "tiffio.h" >junk.c\r
 echo main (){} >>junk.c\r
 rem   -o option is ignored with cl, but allows result to be consistent.\r
-%COMPILER% %usercflags% -c junk.c -o junk.obj >junk.out 2>junk.err\r
+%COMPILER% %usercflags% %mingwflag% -c junk.c -o junk.obj >junk.out 2>junk.err\r
 if exist junk.obj goto haveTiff\r
 \r
 echo ...tiffio.h not found, building without TIFF support.\r
@@ -381,7 +388,7 @@ echo #define FOR_MSW 1 >junk.c
 echo #include "X11/xpm.h" >>junk.c\r
 echo main (){} >>junk.c\r
 rem   -o option is ignored with cl, but allows result to be consistent.\r
-%COMPILER% %usercflags% -c junk.c -o junk.obj >junk.out 2>junk.err\r
+%COMPILER% %usercflags% %mingwflag% -c junk.c -o junk.obj >junk.out 2>junk.err\r
 if exist junk.obj goto haveXpm\r
 \r
 echo ...X11/xpm.h not found, building without XPM support.\r
@@ -466,6 +473,7 @@ set COMPILER=
 set MAKECMD=\r
 set usercflags=\r
 set userldflags=\r
+set mingwflag=\r
 \r
 goto skipArchTag\r
    arch-tag: 300d20a4-1675-4e75-b615-7ce1a8c5376c\r