\r
rem This file is part of GNU Emacs.\r
\r
-rem GNU Emacs is free software; you can redistribute it and/or modify\r
+rem GNU Emacs is free software: you can redistribute it and/or modify\r
rem it under the terms of the GNU General Public License as published by\r
-rem the Free Software Foundation; either version 3, or (at your option)\r
-rem any later version.\r
+rem the Free Software Foundation, either version 3 of the License, or\r
+rem (at your option) any later version.\r
\r
rem GNU Emacs is distributed in the hope that it will be useful,\r
rem but WITHOUT ANY WARRANTY; without even the implied warranty of\r
rem GNU General Public License for more details.\r
\r
rem You should have received a copy of the GNU General Public License\r
-rem along with GNU Emacs; see the file COPYING. If not, write to the\r
-rem Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,\r
-rem Boston, MA 02110-1301, USA.\r
+rem along with GNU Emacs. If not, see http://www.gnu.org/licenses/.\r
+\r
rem ----------------------------------------------------------------------\r
rem YOU'LL NEED THE FOLLOWING UTILITIES TO MAKE EMACS:\r
rem\r
rem + MS Windows 95/98/Me or NT/2000/XP\r
-rem + either MSVC 2.x or later, or gcc-2.95 or later (with gmake 3.75\r
+rem + either MSVC 2.x or later, or gcc-2.95 or later (with GNU make 3.75\r
rem or later) and the Mingw32 and W32 API headers and libraries.\r
rem + Visual Studio 2005 is not supported at this time.\r
rem\r
-rem For reference, here is a list of which builds of gmake are known to\r
+rem For reference, here is a list of which builds of GNU make are known to\r
rem work or not, and whether they work in the presence and/or absence of\r
rem sh.exe.\r
rem\r
set doldflags=\r
set sep1=\r
set sep2=\r
+set usefontbackend=Y\r
\r
rem ----------------------------------------------------------------------\r
rem Handle arguments.\r
if "%1" == "--without-gif" goto withoutgif\r
if "%1" == "--without-tiff" goto withouttiff\r
if "%1" == "--without-xpm" goto withoutxpm\r
-if "%1" == "--enable-font-backend" goto withfont\r
+if "%1" == "--disable-font-backend" goto withoutfont\r
if "%1" == "" goto checkutils\r
:usage\r
echo Usage: configure [options]\r
echo. --without-gif do not use GIF library even if it is installed\r
echo. --without-tiff do not use TIFF library even if it is installed\r
echo. --without-xpm do not use XPM library even if it is installed\r
-echo. --enable-font-backend build with font backend support\r
+echo. --disable-font-backend build without font backend support\r
goto end\r
rem ----------------------------------------------------------------------\r
:setprefix\r
shift\r
goto again\r
\r
-:withfont\r
-set usercflags=%usercflags%%sep1%-DUSE_FONT_BACKEND\r
-set sep1= %nothing%\r
-set usefontbackend=Y\r
+:withoutfont\r
+set usefontbackend=N\r
shift\r
goto again\r
\r
rem IMAGE_FIRST_SECTION (the headers with gcc/mingw32 2.95 have this\r
rem problem). The gcc/mingw32 2.95.2 headers are okay, as are distros\r
rem of w32api-xxx.zip from Anders Norlander since 1999-11-18 at least.\r
+rem Beginning with Emacs 23, we need usp10.h.\r
rem\r
echo Checking whether W32 API headers are too old...\r
echo #include "windows.h" >junk.c\r
+echo #include "usp10.h" >>junk.c\r
echo test(PIMAGE_NT_HEADERS pHeader) >>junk.c\r
echo {PIMAGE_SECTION_HEADER pSection = IMAGE_FIRST_SECTION(pHeader);} >>junk.c\r
if (%nocygwin%) == (Y) goto chkapi1\r
:success\r
echo Emacs successfully configured.\r
echo Emacs successfully configured. >>config.log\r
+if (%MAKECMD%) == (gmake) set MAKECMD=make\r
echo Run `%MAKECMD%' to build, then run `%MAKECMD% install' to install.\r
goto end\r
\r