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

[Jason Rumney]

Index: emacs/nt/configure.bat
diff -c emacs/nt/configure.bat:1.16 emacs/nt/configure.bat:1.17
*** emacs/nt/configure.bat:1.16 Sat Jan 25 15:50:48 2003
--- emacs/nt/configure.bat      Sat Jan 25 20:25:49 2003
***************
*** 86,91 ****
--- 86,92 ----
  if "%1" == "--cflags" goto usercflags
  if "%1" == "--ldflags" goto userldflags
  if "%1" == "--without-png" goto withoutpng
+ if "%1" == "--without-jpeg" goto withoutjpeg
  if "%1" == "" goto checkutils
  :usage
  echo Usage: configure [options]
***************
*** 99,104 ****
--- 100,106 ----
  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 
  goto end
  rem ----------------------------------------------------------------------
  :setprefix
***************
*** 153,158 ****
--- 155,167 ----
  goto again
  
  rem ----------------------------------------------------------------------
+ 
+ :withoutjpeg
+ set jpegsupport=N
+ set HAVE_JPEG=
+ goto again
+ 
+ rem ----------------------------------------------------------------------
  rem    Check that necessary utilities (cp and rm) are present.
  :checkutils
  echo Checking for 'cp'...
***************
*** 273,278 ****
--- 282,307 ----
  :pngDone
  rm -f junk.c junk.obj
  
+ 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
+ 
+ :haveJpeg
+ echo ...JPEG header available, building with JPEG support.
+ set HAVE_JPEG=1
+ 
+ :jpegDone
+ rm -f junk.c junk.obj
+ 
  rem ----------------------------------------------------------------------
  :genmakefiles
  echo Generating makefiles
***************
*** 300,305 ****
--- 329,335 ----
  if not "(%usercflags%)" == "()" echo #define USER_CFLAGS " 
%usercflags%">>..\src\config.h
  if not "(%userldflags%)" == "()" echo #define USER_LDFLAGS " 
%userldflags%">>..\src\config.h
  if not "(%HAVE_PNG%)" == "()" echo #define HAVE_PNG 1 >>..\src\config.h
+ if not "(%HAVE_JPEG%)" == "()" echo #define HAVE_JPEG 1 >>..\src\config.h
  echo /* End of settings from configure.bat.  */ >>..\src\config.h
  
  copy paths.h ..\src\epaths.h