From: Eli Zaretskii <eliz@gnu.org>
Date: Sat, 20 Oct 2007 11:33:03 +0000 (+0000)
Subject: (usercflags, userldflags): Quote %1.
X-Git-Tag: emacs-pretest-23.0.90~10192
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=6d005ee796965a65921bc426129203bcecb7eb87;p=emacs.git

(usercflags, userldflags): Quote %1.
---

diff --git a/nt/ChangeLog b/nt/ChangeLog
index c0d8d7a5050..e36d2fa863d 100644
--- a/nt/ChangeLog
+++ b/nt/ChangeLog
@@ -1,3 +1,7 @@
+2007-10-20  Eli Zaretskii  <eliz@gnu.org>
+
+	* configure.bat (usercflags, userldflags): Quote %1.
+
 2007-10-18  Jason Rumney  <jasonr@gnu.org>
 
 	* makefile.w32-in (install): Install COPYING in top-level and bin dirs.
diff --git a/nt/configure.bat b/nt/configure.bat
index 27ba7bedce1..3782f1f749f 100755
--- a/nt/configure.bat
+++ b/nt/configure.bat
@@ -158,14 +158,15 @@ goto again
 rem ----------------------------------------------------------------------
 :usercflags
 shift
-set usercflags=%usercflags%%sep1%%1
+rem We quote arg here to leave quotes in the likes of "-DFOO=bar"
+set usercflags=%usercflags%%sep1%"%1"
 set sep1= %nothing%
 shift
 goto again
 rem ----------------------------------------------------------------------
 :userldflags
 shift
-set userldflags=%userldflags%%sep2%%1
+set userldflags=%userldflags%%sep2%"%1"
 set sep2= %nothing%
 shift
 goto again