[Emacs-diffs] Changes to emacs/nt/configure.bat [emacs-unicode-2]

[Miles Bader]

Index: emacs/nt/configure.bat
diff -c emacs/nt/configure.bat:1.23.4.1 emacs/nt/configure.bat:1.23.4.2
*** emacs/nt/configure.bat:1.23.4.1     Fri Apr 16 12:50:42 2004
--- emacs/nt/configure.bat      Mon Jun 28 07:29:03 2004
***************
*** 294,306 ****
  rem   dynamically, the libraries themselves do not need to be present
  rem   at compile time, but the header files are required.
  
  if (%pngsupport%) == (N) goto pngDone
  
  echo Checking for libpng...
  echo #include "png.h" >junk.c
  echo main (){} >>junk.c
  rem   -o option is ignored with cl, but allows result to be consistent.
! %COMPILER% %usercflags% -c junk.c -o junk.obj >junk.out 2>junk.err
  if exist junk.obj goto havePng
  
  echo ...png.h not found, building without PNG support.
--- 294,313 ----
  rem   dynamically, the libraries themselves do not need to be present
  rem   at compile time, but the header files are required.
  
+ set mingwflag=
+ 
+ if (%nocygwin%) == (N) goto flagsOK
+ set mingwflag=-mno-cygwin
+ 
+ :flagsOK
+ 
  if (%pngsupport%) == (N) goto pngDone
  
  echo Checking for libpng...
  echo #include "png.h" >junk.c
  echo main (){} >>junk.c
  rem   -o option is ignored with cl, but allows result to be consistent.
! %COMPILER% %usercflags% %mingwflag% -c junk.c -o junk.obj >junk.out 2>junk.err
  if exist junk.obj goto havePng
  
  echo ...png.h not found, building without PNG support.
***************
*** 320,326 ****
  echo #include "jconfig.h" >junk.c
  echo main (){} >>junk.c
  rem   -o option is ignored with cl, but allows result to be consistent.
! %COMPILER% %usercflags% -c junk.c -o junk.obj >junk.out 2>junk.err
  if exist junk.obj goto haveJpeg
  
  echo ...jconfig.h not found, building without JPEG support.
--- 327,333 ----
  echo #include "jconfig.h" >junk.c
  echo main (){} >>junk.c
  rem   -o option is ignored with cl, but allows result to be consistent.
! %COMPILER% %usercflags% %mingwflag% -c junk.c -o junk.obj >junk.out 2>junk.err
  if exist junk.obj goto haveJpeg
  
  echo ...jconfig.h not found, building without JPEG support.
***************
*** 340,346 ****
  echo #include "gif_lib.h" >junk.c
  echo main (){} >>junk.c
  rem   -o option is ignored with cl, but allows result to be consistent.
! %COMPILER% %usercflags% -c junk.c -o junk.obj >junk.out 2>junk.err
  if exist junk.obj goto haveGif
  
  echo ...gif_lib.h not found, building without GIF support.
--- 347,353 ----
  echo #include "gif_lib.h" >junk.c
  echo main (){} >>junk.c
  rem   -o option is ignored with cl, but allows result to be consistent.
! %COMPILER% %usercflags% %mingwflag% -c junk.c -o junk.obj >junk.out 2>junk.err
  if exist junk.obj goto haveGif
  
  echo ...gif_lib.h not found, building without GIF support.
***************
*** 360,366 ****
  echo #include "tiffio.h" >junk.c
  echo main (){} >>junk.c
  rem   -o option is ignored with cl, but allows result to be consistent.
! %COMPILER% %usercflags% -c junk.c -o junk.obj >junk.out 2>junk.err
  if exist junk.obj goto haveTiff
  
  echo ...tiffio.h not found, building without TIFF support.
--- 367,373 ----
  echo #include "tiffio.h" >junk.c
  echo main (){} >>junk.c
  rem   -o option is ignored with cl, but allows result to be consistent.
! %COMPILER% %usercflags% %mingwflag% -c junk.c -o junk.obj >junk.out 2>junk.err
  if exist junk.obj goto haveTiff
  
  echo ...tiffio.h not found, building without TIFF support.
***************
*** 381,387 ****
  echo #include "X11/xpm.h" >>junk.c
  echo main (){} >>junk.c
  rem   -o option is ignored with cl, but allows result to be consistent.
! %COMPILER% %usercflags% -c junk.c -o junk.obj >junk.out 2>junk.err
  if exist junk.obj goto haveXpm
  
  echo ...X11/xpm.h not found, building without XPM support.
--- 388,394 ----
  echo #include "X11/xpm.h" >>junk.c
  echo main (){} >>junk.c
  rem   -o option is ignored with cl, but allows result to be consistent.
! %COMPILER% %usercflags% %mingwflag% -c junk.c -o junk.obj >junk.out 2>junk.err
  if exist junk.obj goto haveXpm
  
  echo ...X11/xpm.h not found, building without XPM support.
***************
*** 466,471 ****
--- 473,479 ----
  set MAKECMD=
  set usercflags=
  set userldflags=
+ set mingwflag=
  
  goto skipArchTag
     arch-tag: 300d20a4-1675-4e75-b615-7ce1a8c5376c