Mercurial > emacs
diff nt/configure.bat @ 88155:d7ddb3e565de
sync with trunk
author | Henrik Enberg <henrik.enberg@telia.com> |
---|---|
date | Mon, 16 Jan 2006 00:03:54 +0000 |
parents | dad6f3184ccd |
children |
line wrap: on
line diff
--- a/nt/configure.bat Sun Jan 15 23:02:10 2006 +0000 +++ b/nt/configure.bat Mon Jan 16 00:03:54 2006 +0000 @@ -1,7 +1,8 @@ @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 Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005 +rem Free Software Foundation, Inc. rem This file is part of GNU Emacs. @@ -17,8 +18,8 @@ rem You should have received a copy of the GNU General Public License rem along with GNU Emacs; see the file COPYING. If not, write to the -rem Free Software Foundation, Inc., 59 Temple Place - Suite 330, -rem Boston, MA 02111-1307, USA. +rem Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, +rem Boston, MA 02110-1301, USA. rem ---------------------------------------------------------------------- rem YOU'LL NEED THE FOLLOWING UTILITIES TO MAKE EMACS: rem @@ -47,6 +48,8 @@ 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,13 +239,17 @@ echo Checking whether gcc requires '-mno-cygwin'... echo #include "cygwin/version.h" >junk.c echo main(){} >>junk.c -gcc -c junk.c +echo gcc -c junk.c >>config.log +gcc -c junk.c >>config.log 2>&1 if not exist junk.o goto chkapi -gcc -mno-cygwin -c junk.c +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,9 +270,13 @@ :chkapi2 echo on gcc %cf% -c junk.c -echo off +@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,8 +289,23 @@ :gccOk set COMPILER=gcc +echo Using 'gcc' rm -f junk.c junk.o -echo Using 'gcc' +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 @@ -294,16 +320,26 @@ 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% -c junk.c -o junk.obj >junk.out 2>junk.err +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 @@ -320,10 +356,13 @@ 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 +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 @@ -340,10 +379,13 @@ 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 +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 @@ -360,10 +402,13 @@ 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 +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 @@ -381,10 +426,13 @@ 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 +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 @@ -407,6 +455,7 @@ 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 @@ -416,24 +465,40 @@ echo # End of settings from configure.bat>>config.settings echo. >>config.settings -copy config.nt ..\src\config.h -echo. >>..\src\config.h -echo /* Start of settings from configure.bat. */ >>..\src\config.h -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 -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 config.nt config.tmp +echo. >>config.tmp +echo /* Start of settings from configure.bat. */ >>config.tmp +if not "(%usercflags%)" == "()" echo #define USER_CFLAGS " %usercflags%">>config.tmp +if not "(%userldflags%)" == "()" echo #define USER_LDFLAGS " %userldflags%">>config.tmp +if not "(%HAVE_PNG%)" == "()" echo #define HAVE_PNG 1 >>config.tmp +if not "(%HAVE_JPEG%)" == "()" echo #define HAVE_JPEG 1 >>config.tmp +if not "(%HAVE_GIF%)" == "()" echo #define HAVE_GIF 1 >>config.tmp +if not "(%HAVE_TIFF%)" == "()" echo #define HAVE_TIFF 1 >>config.tmp +if not "(%HAVE_XPM%)" == "()" echo #define HAVE_XPM 1 >>config.tmp +echo /* End of settings from configure.bat. */ >>config.tmp +Rem See if fc.exe returns a meaningful exit status. If it does, we +Rem might as well avoid unnecessary overwriting of config.h and epaths.h, +Rem since this forces recompilation of every source file. +if exist foo.bar del foo.bar +fc /b foo.bar foo.bar >nul 2>&1 +if not errorlevel 2 goto doCopy +fc /b config.tmp ..\src\config.h >nul 2>&1 +if errorlevel 1 goto doCopy +fc /b paths.h ..\src\epaths.h >nul 2>&1 +if errorlevel 0 goto dontCopy +:doCopy +copy config.tmp ..\src\config.h copy paths.h ..\src\epaths.h +:dontCopy +if exist config.tmp del config.tmp copy /b config.settings+%MAKECMD%.defs+..\nt\makefile.w32-in ..\nt\makefile copy /b config.settings+%MAKECMD%.defs+..\lib-src\makefile.w32-in ..\lib-src\makefile copy /b config.settings+%MAKECMD%.defs+..\src\makefile.w32-in ..\src\makefile -if not exist ..\lisp\Makefile.unix rename ..\lisp\Makefile.in Makefile.unix +copy /b config.settings+%MAKECMD%.defs+..\man\makefile.w32-in ..\man\makefile +copy /b config.settings+%MAKECMD%.defs+..\lispref\makefile.w32-in ..\lispref\makefile +copy /b config.settings+%MAKECMD%.defs+..\lispintro\makefile.w32-in ..\lispintro\makefile if exist ..\lisp\makefile rm -f ../lisp/[Mm]akefile copy /b config.settings+%MAKECMD%.defs+..\lisp\makefile.w32-in ..\lisp\makefile rem Use the default (no-op) Makefile.in if the nt version is not present. @@ -447,6 +512,7 @@ echo. echo Emacs successfully configured. +echo Emacs successfully configured. >>config.log echo Run `%MAKECMD%' to build, then run `%MAKECMD% install' to install. goto end @@ -463,3 +529,9 @@ set MAKECMD= set usercflags= set userldflags= +set mingwflag= +set mf= + +goto skipArchTag + arch-tag: 300d20a4-1675-4e75-b615-7ce1a8c5376c +:skipArchTag