X-Git-Url: https://git.hcoop.net/bpt/emacs.git/blobdiff_plain/6eabc4c2f76441f11cc344891d3849ad3631ab15..1046da1cf4056438b0e5ce2aa96725fb6999b454:/nt/configure.bat diff --git a/nt/configure.bat b/nt/configure.bat index 9c97f179a9..98ff056714 100755 --- a/nt/configure.bat +++ b/nt/configure.bat @@ -2,13 +2,13 @@ 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 2006, 2007 Free Software Foundation, Inc. +rem 2006, 2007, 2008 Free Software Foundation, Inc. rem This file is part of GNU Emacs. rem GNU Emacs is free software; you can redistribute it and/or modify rem it under the terms of the GNU General Public License as published by -rem the Free Software Foundation; either version 2, or (at your option) +rem the Free Software Foundation; either version 3, or (at your option) rem any later version. rem GNU Emacs is distributed in the hope that it will be useful, @@ -84,7 +84,9 @@ set noopt=N set nocygwin=N set COMPILER= set usercflags= +set docflags= set userldflags= +set doldflags= set sep1= set sep2= @@ -106,6 +108,7 @@ 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" == "--enable-font-backend" goto withfont if "%1" == "" goto checkutils :usage echo Usage: configure [options] @@ -123,6 +126,7 @@ echo. --without-jpeg do not use jpeg-6b echo. --without-gif do not use giflib or libungif echo. --without-tiff do not use libtiff echo. --without-xpm do not use libXpm +echo. --enable-font-backend build with font backend support goto end rem ---------------------------------------------------------------------- :setprefix @@ -209,6 +213,13 @@ set HAVE_XPM= shift goto again +:withfont +set usercflags=%usercflags%%sep1%-DUSE_FONT_BACKEND +set sep1= %nothing% +set usefontbackend=Y +shift +goto again + rem ---------------------------------------------------------------------- rem Check that necessary utilities (cp and rm) are present. :checkutils @@ -233,22 +244,23 @@ rem Auto-detect compiler if not specified, and validate GCC if chosen. if (%COMPILER%)==(cl) goto compilercheckdone if (%COMPILER%)==(gcc) goto checkgcc -echo Checking whether 'cl' is available... +echo Checking whether 'gcc' is available... echo main(){} >junk.c +gcc -c junk.c +if exist junk.o goto checkgcc + +echo Checking whether 'cl' is available... cl -nologo -c junk.c if exist junk.obj goto clOK - -echo Checking whether 'gcc' is available... -gcc -c junk.c -if not exist junk.o goto nocompiler -del junk.o +goto nocompiler :checkgcc +if exist junk.o del junk.o Rem WARNING -- COMMAND.COM on some systems only looks at the first Rem 8 characters of a label. So do NOT be tempted to change Rem chkapi* into something fancier like checkw32api Rem You HAVE been warned! -if (%nocygwin%) == (Y) goto chkapi +if (%nocygwin%) == (Y) goto chkapiN echo Checking whether gcc requires '-mno-cygwin'... echo #include "cygwin/version.h" >junk.c echo main(){} >>junk.c @@ -258,11 +270,12 @@ 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 +:chkapiN +rm -f junk.c junk.o 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 @@ -473,16 +486,21 @@ if (%nodebug%) == (Y) echo NODEBUG=1 >>config.settings if (%noopt%) == (Y) echo NOOPT=1 >>config.settings if (%nocygwin%) == (Y) echo NOCYGWIN=1 >>config.settings if not "(%prefix%)" == "()" echo INSTALL_DIR=%prefix%>>config.settings -if not "(%usercflags%)" == "()" echo USER_CFLAGS=%usercflags%>>config.settings -if not "(%userldflags%)" == "()" echo USER_LDFLAGS=%userldflags%>>config.settings +rem We go thru docflags because usercflags could be "-DFOO=bar" -something +rem and the if command cannot cope with this +for %%v in (%usercflags%) do if not (%%v)==() set docflags=Y +if (%docflags%)==(Y) echo USER_CFLAGS=%usercflags%>>config.settings +for %%v in (%userldflags%) do if not (%%v)==() set doldflags=Y +if (%doldflags%)==(Y) echo USER_LDFLAGS=%userldflags%>>config.settings +if (%usefontbackend%) == (Y) echo USE_FONTBACKEND=1 >>config.settings echo # End of settings from configure.bat>>config.settings echo. >>config.settings 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 (%docflags%) == (Y) echo #define USER_CFLAGS " %usercflags%">>config.tmp +if (%doldflags%) == (Y) 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 @@ -507,11 +525,13 @@ 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 +if exist ..\admin\unidata copy /b config.settings+%MAKECMD%.defs+..\admin\unidata\makefile.w32-in ..\admin\unidata\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 -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 +copy /b config.settings+%MAKECMD%.defs+..\doc\emacs\makefile.w32-in ..\doc\emacs\makefile +copy /b config.settings+%MAKECMD%.defs+..\doc\misc\makefile.w32-in ..\doc\misc\makefile +copy /b config.settings+%MAKECMD%.defs+..\doc\lispref\makefile.w32-in ..\doc\lispref\makefile +copy /b config.settings+%MAKECMD%.defs+..\doc\lispintro\makefile.w32-in ..\doc\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. @@ -595,7 +615,9 @@ set nocygwin= set COMPILER= set MAKECMD= set usercflags= +set docflags= set userldflags= +set doldflags= set mingwflag= set mf=