[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] Changes to emacs/nt/configure.bat
From: |
Eli Zaretskii |
Subject: |
[Emacs-diffs] Changes to emacs/nt/configure.bat |
Date: |
Sat, 11 Jun 2005 06:56:50 -0400 |
Index: emacs/nt/configure.bat
diff -c emacs/nt/configure.bat:1.27 emacs/nt/configure.bat:1.28
*** emacs/nt/configure.bat:1.27 Thu May 6 19:17:54 2004
--- emacs/nt/configure.bat Sat Jun 11 10:56:49 2005
***************
*** 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.
--- 1,8 ----
@echo off
rem ----------------------------------------------------------------------
rem Configuration script for MS Windows 95/98/Me and NT/2000/XP
! rem Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005
! rem Free Software Foundation, Inc.
rem This file is part of GNU Emacs.
***************
*** 47,52 ****
--- 48,55 ----
rem cygwin provides this?
rem
+ if exist config.log del config.log
+
rem ----------------------------------------------------------------------
rem See if the environment is large enough. We need 43 (?) bytes.
set $foo$=123456789_123456789_123456789_123456789_123
***************
*** 236,248 ****
echo Checking whether gcc requires '-mno-cygwin'...
echo #include "cygwin/version.h" >junk.c
echo main(){} >>junk.c
! gcc -c junk.c
if not exist junk.o goto chkapi
! gcc -mno-cygwin -c junk.c
if exist junk.o set nocygwin=Y
rm -f junk.c junk.o
:chkapi
rem ----------------------------------------------------------------------
rem Older versions of the Windows API headers either don't have any of
rem the IMAGE_xxx definitions (the headers that come with Cygwin b20.1
--- 239,255 ----
echo Checking whether gcc requires '-mno-cygwin'...
echo #include "cygwin/version.h" >junk.c
echo main(){} >>junk.c
! echo gcc -c junk.c >>config.log
! gcc -c junk.c >>config.log 2>&1
if not exist junk.o goto chkapi
! echo gcc -mno-cygwin -c junk.c >>config.log
! gcc -mno-cygwin -c junk.c >>config.log 2>&1
if exist junk.o set nocygwin=Y
rm -f junk.c junk.o
:chkapi
+ echo The failed program was: >>config.log
+ type junk.c >>config.log
rem ----------------------------------------------------------------------
rem Older versions of the Windows API headers either don't have any of
rem the IMAGE_xxx definitions (the headers that come with Cygwin b20.1
***************
*** 263,271 ****
:chkapi2
echo on
gcc %cf% -c junk.c
! echo off
set cf=
if exist junk.o goto gccOk
:nocompiler
echo.
--- 270,282 ----
:chkapi2
echo on
gcc %cf% -c junk.c
! @echo off
! @echo gcc %cf% -c junk.c >>config.log
! gcc %cf% -c junk.c >>config.log 2>&1
set cf=
if exist junk.o goto gccOk
+ echo The failed program was: >>config.log
+ type junk.c >>config.log
:nocompiler
echo.
***************
*** 278,285 ****
:gccOk
set COMPILER=gcc
- rm -f junk.c junk.o
echo Using 'gcc'
goto compilercheckdone
:clOk
--- 289,311 ----
:gccOk
set COMPILER=gcc
echo Using 'gcc'
+ rm -f junk.c junk.o
+ Rem It is not clear what GCC version began supporting -mtune
+ Rem and pentium4 on x86, so check this explicitly.
+ echo main(){} >junk.c
+ echo gcc -c -O2 -mtune=pentium4 junk.c >>config.log
+ gcc -c -O2 -mtune=pentium4 junk.c >>config.log 2>&1
+ if not errorlevel 1 goto gccMtuneOk
+ echo The failed program was: >>config.log
+ type junk.c >>config.log
+ set mf=-mcpu=i686
+ rm -f junk.c junk.o
+ goto compilercheckdone
+ :gccMtuneOk
+ echo GCC supports -mtune=pentium4 >>config.log
+ set mf=-mtune=pentium4
+ rm -f junk.c junk.o
goto compilercheckdone
:clOk
***************
*** 307,316 ****
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.
set HAVE_PNG=
goto :pngDone
--- 333,345 ----
echo #include "png.h" >junk.c
echo main (){} >>junk.c
rem -o option is ignored with cl, but allows result to be consistent.
! echo %COMPILER% %usercflags% %mingwflag% -c junk.c -o junk.obj >>config.log
! %COMPILER% %usercflags% %mingwflag% -c junk.c -o junk.obj >junk.out
2>>config.log
if exist junk.obj goto havePng
echo ...png.h not found, building without PNG support.
+ echo The failed program was: >>config.log
+ type junk.c >>config.log
set HAVE_PNG=
goto :pngDone
***************
*** 327,336 ****
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.
set HAVE_JPEG=
goto :jpegDone
--- 356,368 ----
echo #include "jconfig.h" >junk.c
echo main (){} >>junk.c
rem -o option is ignored with cl, but allows result to be consistent.
! echo %COMPILER% %usercflags% %mingwflag% -c junk.c -o junk.obj >>config.log
! %COMPILER% %usercflags% %mingwflag% -c junk.c -o junk.obj >junk.out
2>>config.log
if exist junk.obj goto haveJpeg
echo ...jconfig.h not found, building without JPEG support.
+ echo The failed program was: >>config.log
+ type junk.c >>config.log
set HAVE_JPEG=
goto :jpegDone
***************
*** 347,356 ****
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.
set HAVE_GIF=
goto :gifDone
--- 379,391 ----
echo #include "gif_lib.h" >junk.c
echo main (){} >>junk.c
rem -o option is ignored with cl, but allows result to be consistent.
! echo %COMPILER% %usercflags% %mingwflag% -c junk.c -o junk.obj >>config.log
! %COMPILER% %usercflags% %mingwflag% -c junk.c -o junk.obj >junk.out
2>>config.log
if exist junk.obj goto haveGif
echo ...gif_lib.h not found, building without GIF support.
+ echo The failed program was: >>config.log
+ type junk.c >>config.log
set HAVE_GIF=
goto :gifDone
***************
*** 367,376 ****
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.
set HAVE_TIFF=
goto :tiffDone
--- 402,414 ----
echo #include "tiffio.h" >junk.c
echo main (){} >>junk.c
rem -o option is ignored with cl, but allows result to be consistent.
! echo %COMPILER% %usercflags% %mingwflag% -c junk.c -o junk.obj >>config.log
! %COMPILER% %usercflags% %mingwflag% -c junk.c -o junk.obj >junk.out
2>>config.log
if exist junk.obj goto haveTiff
echo ...tiffio.h not found, building without TIFF support.
+ echo The failed program was: >>config.log
+ type junk.c >>config.log
set HAVE_TIFF=
goto :tiffDone
***************
*** 388,397 ****
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.
set HAVE_XPM=
goto :xpmDone
--- 426,438 ----
echo #include "X11/xpm.h" >>junk.c
echo main (){} >>junk.c
rem -o option is ignored with cl, but allows result to be consistent.
! echo %COMPILER% %usercflags% %mingwflag% -c junk.c -o junk.obj >>config.log
! %COMPILER% %usercflags% %mingwflag% -c junk.c -o junk.obj >junk.out
2>>config.log
if exist junk.obj goto haveXpm
echo ...X11/xpm.h not found, building without XPM support.
+ echo The failed program was: >>config.log
+ type junk.c >>config.log
set HAVE_XPM=
goto :xpmDone
***************
*** 414,419 ****
--- 455,461 ----
rem
echo # Start of settings from configure.bat >config.settings
echo COMPILER=%COMPILER%>>config.settings
+ if not "(%mf%)" == "()" echo MCPU_FLAG=%mf%>>config.settings
if (%nodebug%) == (Y) echo NODEBUG=1 >>config.settings
if (%noopt%) == (Y) echo NOOPT=1 >>config.settings
if (%nocygwin%) == (Y) echo NOCYGWIN=1 >>config.settings
***************
*** 474,479 ****
--- 516,522 ----
set usercflags=
set userldflags=
set mingwflag=
+ set mf=
goto skipArchTag
arch-tag: 300d20a4-1675-4e75-b615-7ce1a8c5376c
- [Emacs-diffs] Changes to emacs/nt/configure.bat,
Eli Zaretskii <=