@echo off\r
rem ----------------------------------------------------------------------\r
rem Configuration script for MS Windows operating systems\r
-rem Copyright (C) 1999-2011 Free Software Foundation, Inc.\r
+rem Copyright (C) 1999-2012 Free Software Foundation, Inc.\r
\r
rem This file is part of GNU Emacs.\r
\r
set nocygwin=N\r
set COMPILER=\r
set usercflags=\r
+set escusercflags=\r
set docflags=\r
set userldflags=\r
+set escuserldflags=\r
set extrauserlibs=\r
set doldflags=\r
set doextralibs=\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. --without-gnutls do not use GNUTLS library even if it is installed\r
+echo. --without-gnutls do not use GnuTLS library even if it is installed\r
echo. --with-svg use the RSVG library (experimental)\r
echo. --distfiles path to files for make dist, e.g. libXpm.dll\r
if "%use_extensions%" == "0" goto end\r
:ucflagex\r
shift\r
set usercflags=%usercflags%%sep1%%~1\r
+set escusercflags=%usercflags:"=\"%\r
set sep1= %nothing%\r
shift\r
goto again\r
:ucflagne\r
shift\r
set usercflags=%usercflags%%sep1%%1\r
+set escusercflags=%usercflags%\r
set sep1= %nothing%\r
shift\r
goto again\r
:ulflagex\r
shift\r
set userldflags=%userldflags%%sep2%%~1\r
+set escuserldflags=%userldflags:"=\"%\r
set sep2= %nothing%\r
shift\r
goto again\r
:ulflagne\r
shift\r
set userldflags=%userldflags%%sep2%%1\r
+set escuserldflags=%userldflags%\r
set sep2= %nothing%\r
shift\r
goto again\r
:chkuser\r
rm -f junk.o\r
echo int main (int argc, char *argv[]) {>junk.c\r
-echo char *usercflags = "%usercflags%";>>junk.c\r
+echo char *usercflags = "%escusercflags%";>>junk.c\r
echo }>>junk.c\r
echo gcc -Werror -c junk.c >>config.log\r
gcc -Werror -c junk.c >>config.log 2>&1\r
goto :tlsDone\r
\r
:haveTls\r
-echo ...GNUTLS header available, building with GNUTLS support.\r
+echo ...GnuTLS header available, building with GnuTLS support.\r
set HAVE_GNUTLS=1\r
\r
:tlsDone\r
rem and the if command cannot cope with this\r
for %%v in (%usercflags%) do if not (%%v)==() set docflags=Y\r
if (%docflags%)==(Y) echo USER_CFLAGS=%usercflags%>>config.settings\r
+if (%docflags%)==(Y) echo ESC_USER_CFLAGS=%escusercflags%>>config.settings\r
for %%v in (%userldflags%) do if not (%%v)==() set doldflags=Y\r
if (%doldflags%)==(Y) echo USER_LDFLAGS=%userldflags%>>config.settings\r
for %%v in (%extrauserlibs%) do if not (%%v)==() set doextralibs=Y\r
echo /* Start of settings from configure.bat. */ >>config.tmp\r
rem We write USER_CFLAGS and USER_LDFLAGS starting with a space to simplify\r
rem processing of compiler options in w32.c:get_emacs_configuration_options\r
-if (%docflags%) == (Y) echo #define USER_CFLAGS " %usercflags%">>config.tmp\r
-if (%doldflags%) == (Y) echo #define USER_LDFLAGS " %userldflags%">>config.tmp\r
+if (%docflags%) == (Y) echo #define USER_CFLAGS " %escusercflags%">>config.tmp\r
+if (%doldflags%) == (Y) echo #define USER_LDFLAGS " %escuserldflags%">>config.tmp\r
if (%profile%) == (Y) echo #define PROFILING 1 >>config.tmp\r
if not "(%HAVE_PNG%)" == "()" echo #define HAVE_PNG 1 >>config.tmp\r
if not "(%HAVE_GNUTLS%)" == "()" echo #define HAVE_GNUTLS 1 >>config.tmp\r