X-Git-Url: https://git.hcoop.net/bpt/emacs.git/blobdiff_plain/565c0ca57e89ab1a1b4c378c615a998eb8fc0f99..4a1a6b5b7d2208cf504cf38e548d3c562f6cfbb3:/nt/configure.bat

diff --git a/nt/configure.bat b/nt/configure.bat
index 4866c9fcad..699a33bc2e 100755
--- a/nt/configure.bat
+++ b/nt/configure.bat
@@ -1,8 +1,7 @@
 @echo off
 rem   ----------------------------------------------------------------------
 rem   Configuration script for MS Windows operating systems
-rem   Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005,
-rem      2006, 2007, 2008, 2009, 2010 Free Software Foundation, Inc.
+rem   Copyright (C) 1999-2011  Free Software Foundation, Inc.
 
 rem   This file is part of GNU Emacs.
 
@@ -75,6 +74,19 @@ echo You must run configure from the nt subdirectory.
 goto end
 
 :start
+rem ----------------------------------------------------------------------
+rem   Attempt to enable command extensions.  Set use_extensions to 1 if
+rem   they are available and 0 if they are not available.
+set use_extensions=1
+setlocal ENABLEEXTENSIONS
+if "%CMDEXTVERSION%" == "" set use_extensions=0
+if "%use_extensions%" == "1" goto afterext
+
+echo. Command extensions are not available.  Using parameters that include the =
+echo. character by enclosing them in quotes will not be supported.
+
+:afterext
+
 rem ----------------------------------------------------------------------
 rem   Default settings.
 set prefix=
@@ -137,6 +149,20 @@ echo.   --without-tiff          do not use TIFF library even if it is installed
 echo.   --without-xpm           do not use XPM library even if it is installed
 echo.   --with-svg              use the RSVG library (experimental)
 echo.   --distfiles             path to files for make dist, e.g. libXpm.dll
+if "%use_extensions%" == "0" goto end
+echo.
+echo. The cflags and ldflags arguments support parameters that include the =
+echo. character.  However, since the = character is normally treated as a
+echo. separator character you will need to enclose any parameter that includes
+echo. the = character in quotes.  For example, to include
+echo. -DSITELOAD_PURESIZE_EXTRA=100000 as one of the cflags you would run
+echo. configure.bat as follows:
+echo. configure.bat --cflags "-DSITELOAD_PURESIZE_EXTRA=100000"
+echo.
+echo. Note that this capability of processing parameters that include the =
+echo. character depends on command extensions.  This batch file attempts to
+echo. enable command extensions.  If command extensions cannot be enabled, a
+echo. warning message will be displayed.
 goto end
 
 rem ----------------------------------------------------------------------
@@ -199,6 +225,17 @@ goto again
 rem ----------------------------------------------------------------------
 
 :usercflags
+if "%use_extensions%" == "1" goto ucflagex
+goto ucflagne
+
+:ucflagex
+shift
+set usercflags=%usercflags%%sep1%%~1
+set sep1= %nothing%
+shift
+goto again
+
+:ucflagne
 shift
 set usercflags=%usercflags%%sep1%%1
 set sep1= %nothing%
@@ -208,6 +245,17 @@ goto again
 rem ----------------------------------------------------------------------
 
 :userldflags
+if "%use_extensions%" == "1" goto ulflagex
+goto ulflagne
+
+:ulflagex
+shift
+set userldflags=%userldflags%%sep2%%~1
+set sep2= %nothing%
+shift
+goto again
+
+:ulflagne
 shift
 set userldflags=%userldflags%%sep2%%1
 set sep2= %nothing%
@@ -669,7 +717,7 @@ 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
+if not errorlevel 1 goto dontCopy
 
 :doCopy
 copy config.tmp ..\src\config.h
@@ -680,6 +728,7 @@ 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+..\lib\makefile.w32-in ..\lib\makefile
 copy /b config.settings+%MAKECMD%.defs+..\src\makefile.w32-in ..\src\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
@@ -788,7 +837,17 @@ set mf=
 set distfiles=
 set HAVE_DISTFILES=
 set distFilesOk=
+set pngsupport=
+set jpegsupport=
+set gifsupport=
+set tiffsupport=
+set xpmsupport=
+set svgsupport=
+set libsOK=
+set HAVE_GIF=
+set HAVE_JPEG=
+set HAVE_PNG=
+set HAVE_TIFF=
+set HAVE_XPM=
+set dbginfo=
 
-goto skipArchTag
-   arch-tag: 300d20a4-1675-4e75-b615-7ce1a8c5376c
-:skipArchTag