A better solution for the last change:

(docflags, doldflags): New variables.
(genmakefiles): Use them to work around problems with whitespace in
arguments of the `if' command.

diff --git a/nt/ChangeLog b/nt/ChangeLog
index e36d2fa863db1f4898f5b095dd3e699f18a0d9c4..5ee99f3825d1dbe44c38118102b294619412e562 100644 (file)
--- a/nt/ChangeLog
+++ b/nt/ChangeLog
@@ -1,6 +1,8 @@
 2007-10-20  Eli Zaretskii  <eliz@gnu.org>
 
-       * configure.bat (usercflags, userldflags): Quote %1.
+       * configure.bat (docflags, doldflags): New variables.
+       (genmakefiles): Use them to work around problems with whitespace
+       in arguments of the `if' command.
 
 2007-10-18  Jason Rumney  <jasonr@gnu.org>
 

diff --git a/nt/configure.bat b/nt/configure.bat
index 3782f1f749f72e09e8cd58c5cd416e4b46d84889..ef0a746949bac5e8a1fada9c2e7cdde6eac25224 100755 (executable)
--- a/nt/configure.bat
+++ b/nt/configure.bat
@@ -84,7 +84,9 @@ set noopt=N
 set nocygwin=N\r
 set COMPILER=\r
 set usercflags=\r
+set docflags=\r
 set userldflags=\r
+set doldflags=\r
 set sep1=\r
 set sep2=\r
 \r
@@ -158,15 +160,14 @@ goto again
 rem ----------------------------------------------------------------------\r
 :usercflags\r
 shift\r
-rem We quote arg here to leave quotes in the likes of "-DFOO=bar"\r
-set usercflags=%usercflags%%sep1%"%1"\r
+set usercflags=%usercflags%%sep1%%1\r
 set sep1= %nothing%\r
 shift\r
 goto again\r
 rem ----------------------------------------------------------------------\r
 :userldflags\r
 shift\r
-set userldflags=%userldflags%%sep2%"%1"\r
+set userldflags=%userldflags%%sep2%%1\r
 set sep2= %nothing%\r
 shift\r
 goto again\r
@@ -474,16 +475,20 @@ if (%nodebug%) == (Y) echo NODEBUG=1 >>config.settings
 if (%noopt%) == (Y) echo NOOPT=1 >>config.settings\r
 if (%nocygwin%) == (Y) echo NOCYGWIN=1 >>config.settings\r
 if not "(%prefix%)" == "()" echo INSTALL_DIR=%prefix%>>config.settings\r
-if not "(%usercflags%)" == "()" echo USER_CFLAGS=%usercflags%>>config.settings\r
-if not "(%userldflags%)" == "()" echo USER_LDFLAGS=%userldflags%>>config.settings\r
+rem We go thru docflags because usercflags could be "-DFOO=bar" -something\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
+for %%v in (%userldflags%) do if not (%%v)==() set doldflags=Y\r
+if (%doldflags%)==(Y) echo USER_LDFLAGS=%userldflags%>>config.settings\r
 echo # End of settings from configure.bat>>config.settings\r
 echo. >>config.settings\r
 \r
 copy config.nt config.tmp\r
 echo. >>config.tmp\r
 echo /* Start of settings from configure.bat.  */ >>config.tmp\r
-if not "(%usercflags%)" == "()" echo #define USER_CFLAGS " %usercflags%">>config.tmp\r
-if not "(%userldflags%)" == "()" echo #define USER_LDFLAGS " %userldflags%">>config.tmp\r
+if (%docflags%) == (Y) echo #define USER_CFLAGS " %usercflags%">>config.tmp\r
+if (%doldflags%) == (Y) echo #define USER_LDFLAGS " %userldflags%">>config.tmp\r
 if not "(%HAVE_PNG%)" == "()" echo #define HAVE_PNG 1 >>config.tmp\r
 if not "(%HAVE_JPEG%)" == "()" echo #define HAVE_JPEG 1 >>config.tmp\r
 if not "(%HAVE_GIF%)" == "()" echo #define HAVE_GIF 1 >>config.tmp\r
@@ -597,7 +602,9 @@ set nocygwin=
 set COMPILER=\r
 set MAKECMD=\r
 set usercflags=\r
+set docflags=\r
 set userldflags=\r
+set doldflags=\r
 set mingwflag=\r
 set mf=\r
 \r