Merge from trunk.

[bpt/emacs.git] / nt / configure.bat

diff --git a/nt/configure.bat b/nt/configure.bat
index 63d9497..45d966f 100755 (executable)
--- a/nt/configure.bat
+++ b/nt/configure.bat
@@ -97,10 +97,10 @@ set profile=N
 set nocygwin=N\r
 set COMPILER=\r
 set usercflags=\r
-set fusercflags=\r
+set escusercflags=\r
 set docflags=\r
 set userldflags=\r
-set fuserldflags=\r
+set escuserldflags=\r
 set extrauserlibs=\r
 set doldflags=\r
 set doextralibs=\r
@@ -240,7 +240,7 @@ goto ucflagne
 :ucflagex\r
 shift\r
 set usercflags=%usercflags%%sep1%%~1\r
-set fusercflags=%usercflags:"=\"%\r
+set escusercflags=%usercflags:"=\"%\r
 set sep1= %nothing%\r
 shift\r
 goto again\r
@@ -248,7 +248,7 @@ goto again
 :ucflagne\r
 shift\r
 set usercflags=%usercflags%%sep1%%1\r
-set fusercflags=%usercflags%\r
+set escusercflags=%usercflags%\r
 set sep1= %nothing%\r
 shift\r
 goto again\r
@@ -270,7 +270,7 @@ goto ulflagne
 :ulflagex\r
 shift\r
 set userldflags=%userldflags%%sep2%%~1\r
-set fuserldflags=%userldflags:"=\"%\r
+set escuserldflags=%userldflags:"=\"%\r
 set sep2= %nothing%\r
 shift\r
 goto again\r
@@ -278,7 +278,7 @@ goto again
 :ulflagne\r
 shift\r
 set userldflags=%userldflags%%sep2%%1\r
-set fuserldflags=%userldflags%\r
+set escuserldflags=%userldflags%\r
 set sep2= %nothing%\r
 shift\r
 goto again\r
@@ -443,7 +443,7 @@ goto nocompiler
 :chkuser\r
 rm -f junk.o\r
 echo int main (int argc, char *argv[]) {>junk.c\r
-echo char *usercflags = "%fusercflags%";>>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
@@ -739,6 +739,7 @@ rem We go thru docflags because usercflags could be "-DFOO=bar" -something
 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
@@ -751,8 +752,8 @@ echo. >>config.tmp
 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 " %fusercflags%">>config.tmp\r
-if (%doldflags%) == (Y) echo #define USER_LDFLAGS " %fuserldflags%">>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