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

[Jason Rumney]

Index: emacs/nt/configure.bat
diff -c emacs/nt/configure.bat:1.21 emacs/nt/configure.bat:1.22
*** emacs/nt/configure.bat:1.21 Fri Jan 31 06:03:11 2003
--- emacs/nt/configure.bat      Sat Feb  1 19:01:25 2003
***************
*** 89,94 ****
--- 89,95 ----
  if "%1" == "--without-jpeg" goto withoutjpeg
  if "%1" == "--without-gif" goto withoutgif
  if "%1" == "--without-tiff" goto withouttiff
+ if "%1" == "--without-xpm" goto withoutxpm
  if "%1" == "" goto checkutils
  :usage
  echo Usage: configure [options]
***************
*** 102,110 ****
  echo.   --cflags FLAG           pass FLAG to compiler
  echo.   --ldflags FLAG          pass FLAG to compiler when linking
  echo.   --without-png           do not use libpng even if it is installed
! echo.   --without-jpeg          do not use jpeglib even if it is installed
! echo.   --without-gif           do not use giflib even if it is installed
! echo.   --without-tiff          do not use tifflib even if it is installed
  goto end
  rem ----------------------------------------------------------------------
  :setprefix
--- 103,112 ----
  echo.   --cflags FLAG           pass FLAG to compiler
  echo.   --ldflags FLAG          pass FLAG to compiler when linking
  echo.   --without-png           do not use libpng even if it is installed
! echo.   --without-jpeg          do not use jpeg-6b even if it is installed
! echo.   --without-gif           do not use libungif even if it is installed
! echo.   --without-tiff          do not use tiff even if it is installed
! echo.   --without-xpm         do not use libXpm even if it is installed
  goto end
  rem ----------------------------------------------------------------------
  :setprefix
***************
*** 184,189 ****
--- 186,199 ----
  goto again
  
  rem ----------------------------------------------------------------------
+ 
+ :withoutxpm
+ set xpmsupport=N
+ set HAVE_XPM=
+ shift
+ goto again
+ 
+ rem ----------------------------------------------------------------------
  rem    Check that necessary utilities (cp and rm) are present.
  :checkutils
  echo Checking for 'cp'...
***************
*** 290,299 ****
  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
  if exist junk.obj goto havePng
  
! echo ...building without PNG support.
  set HAVE_PNG=
  goto :pngDone
  
--- 300,309 ----
  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.
  set HAVE_PNG=
  goto :pngDone
  
***************
*** 306,319 ****
  
  if (%jpegsupport%) == (N) goto jpegDone
  
! echo Checking for jpeg...
  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
  if exist junk.obj goto haveJpeg
  
! echo ...building without JPEG support.
  set HAVE_JPEG=
  goto :jpegDone
  
--- 316,329 ----
  
  if (%jpegsupport%) == (N) goto jpegDone
  
! echo Checking for jpeg-6b...
  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.
  set HAVE_JPEG=
  goto :jpegDone
  
***************
*** 326,339 ****
  
  if (%gifsupport%) == (N) goto gifDone
  
! echo Checking for gif...
  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
  if exist junk.obj goto haveGif
  
! echo ...building without GIF support.
  set HAVE_GIF=
  goto :gifDone
  
--- 336,349 ----
  
  if (%gifsupport%) == (N) goto gifDone
  
! echo Checking for libgif...
  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.
  set HAVE_GIF=
  goto :gifDone
  
***************
*** 350,359 ****
  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
  if exist junk.obj goto haveTiff
  
! echo ...building without TIFF support.
  set HAVE_TIFF=
  goto :tiffDone
  
--- 360,369 ----
  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.
  set HAVE_TIFF=
  goto :tiffDone
  
***************
*** 364,369 ****
--- 374,400 ----
  :tiffDone
  rm -f junk.c junk.obj
  
+ if (%xpmsupport%) == (N) goto xpmDone
+ 
+ echo Checking for libXpm...
+ echo #define FOR_MSW 1 >junk.c
+ 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.
+ set HAVE_XPM=
+ goto :xpmDone
+ 
+ :haveXpm
+ echo ...XPM header available, building with XPM support.
+ set HAVE_XPM=1
+ 
+ :xpmDone
+ rm -f junk.c junk.obj junk.err junk.out
+ 
  rem ----------------------------------------------------------------------
  :genmakefiles
  echo Generating makefiles
***************
*** 394,399 ****
--- 425,431 ----
  if not "(%HAVE_JPEG%)" == "()" echo #define HAVE_JPEG 1 >>..\src\config.h
  if not "(%HAVE_GIF%)" == "()" echo #define HAVE_GIF 1 >>..\src\config.h
  if not "(%HAVE_TIFF%)" == "()" echo #define HAVE_TIFF 1 >>..\src\config.h
+ if not "(%HAVE_XPM%)" == "()" echo #define HAVE_XPM 1 >>..\src\config.h
  echo /* End of settings from configure.bat.  */ >>..\src\config.h
  
  copy paths.h ..\src\epaths.h