[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] Changes to emacs/nt/configure.bat
From: |
Juanma Barranquero |
Subject: |
[Emacs-diffs] Changes to emacs/nt/configure.bat |
Date: |
Fri, 31 Jan 2003 02:23:20 -0500 |
Index: emacs/nt/configure.bat
diff -c emacs/nt/configure.bat:1.19 emacs/nt/configure.bat:1.20
*** emacs/nt/configure.bat:1.19 Wed Jan 29 02:37:34 2003
--- emacs/nt/configure.bat Fri Jan 31 02:23:20 2003
***************
*** 1,7 ****
@echo off
rem ----------------------------------------------------------------------
! rem Configuration script for MS Windows 95/98 and NT/2000
! rem Copyright (C) 1999-2001 Free Software Foundation, Inc.
rem This file is part of GNU Emacs.
--- 1,7 ----
@echo off
rem ----------------------------------------------------------------------
! rem Configuration script for MS Windows 95/98/Me and NT/2000/XP
! rem Copyright (C) 1999-2003 Free Software Foundation, Inc.
rem This file is part of GNU Emacs.
***************
*** 22,28 ****
rem ----------------------------------------------------------------------
rem YOU'LL NEED THE FOLLOWING UTILITIES TO MAKE EMACS:
rem
! rem + MS Windows 95/98 or NT/2000
rem + either MSVC 2.x or later, or gcc-2.95 or later (with gmake 3.75
rem or later) and the Mingw32 and W32 API headers and libraries
rem
--- 22,28 ----
rem ----------------------------------------------------------------------
rem YOU'LL NEED THE FOLLOWING UTILITIES TO MAKE EMACS:
rem
! rem + MS Windows 95/98/Me or NT/2000/XP
rem + either MSVC 2.x or later, or gcc-2.95 or later (with gmake 3.75
rem or later) and the Mingw32 and W32 API headers and libraries
rem
***************
*** 87,92 ****
--- 87,93 ----
if "%1" == "--ldflags" goto userldflags
if "%1" == "--without-png" goto withoutpng
if "%1" == "--without-jpeg" goto withoutjpeg
+ if "%1" == "--without-gif" goto withoutgif
if "%1" == "" goto checkutils
:usage
echo Usage: configure [options]
***************
*** 101,106 ****
--- 102,108 ----
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
goto end
rem ----------------------------------------------------------------------
:setprefix
***************
*** 164,169 ****
--- 166,179 ----
goto again
rem ----------------------------------------------------------------------
+
+ :withoutgif
+ set gifsupport=N
+ set HAVE_GIF=
+ shift
+ goto again
+
+ rem ----------------------------------------------------------------------
rem Check that necessary utilities (cp and rm) are present.
:checkutils
echo Checking for 'cp'...
***************
*** 286,292 ****
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.
--- 296,302 ----
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.
***************
*** 304,309 ****
--- 314,339 ----
:jpegDone
rm -f junk.c junk.obj
+ 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
+
+ :haveGif
+ echo ...GIF header available, building with GIF support.
+ set HAVE_GIF=1
+
+ :gifDone
+ rm -f junk.c junk.obj
+
rem ----------------------------------------------------------------------
:genmakefiles
echo Generating makefiles
***************
*** 332,337 ****
--- 362,368 ----
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
+ if not "(%HAVE_GIF%)" == "()" echo #define HAVE_GIF 1 >>..\src\config.h
echo /* End of settings from configure.bat. */ >>..\src\config.h
copy paths.h ..\src\epaths.h