Merge from mainline.

3 files changed, 49 insertions, 9 deletions

diff --git a/nt/ChangeLog b/nt/ChangeLog
index e24ff6cf3aa..f1f34bb88b5 100644
--- a/nt/ChangeLog
+++ b/nt/ChangeLog
@@ -1,9 +1,24 @@
-2011-04-30  Paul Eggert  <eggert@cs.ucla.edu>
+2011-05-05  Paul Eggert  <eggert@cs.ucla.edu>
 
 	* config.nt: Configure 64-bit integers for older compilers.
 	(EMACS_INT, BITS_PER_EMACS_INT, pI): Define these if __int64 and
 	"%I64d" work but long long and "%lld" do not.
 
+2011-05-05  Ben Key  <bkey76@gmail.com>
+
+	* configure.bat: Added support for --cflags and --ldflags
+	options that include quotes as long as command extensions are
+	enabled.  Specifically when -I, -L, and similar flags are used
+	to specify supplementary include and library directories a
+	directory name that includes spaces may now be used if it is
+	enclosed in quotes.
+
+	* INSTALL: Documented the change to configure.bat.
+
+2011-05-04  Juanma Barranquero  <lekktu@gmail.com>
+
+	* INSTALL: Clarify GnuTLS support.
+
 2011-04-30  Eli Zaretskii  <eliz@gnu.org>
 
 	* config.nt (HAVE_LONG_LONG_INT, HAVE_UNSIGNED_LONG_LONG_INT):
diff --git a/nt/INSTALL b/nt/INSTALL
index dc57cd20b8c..b4a97011922 100644
--- a/nt/INSTALL
+++ b/nt/INSTALL
@@ -245,6 +245,20 @@
   be displayed informing you that "using parameters that include the =
   character by enclosing them in quotes will not be supported."
 
+  You may also use the --cflags and --ldflags options to pass
+  additional parameters to the compiler and linker, respectively; they
+  are frequently used to pass -I and -L flags to specify supplementary
+  include and library directories.  If a directory name includes
+  spaces, you will need to enclose it in quotes, as follows
+  -I"C:/Program Files/GnuTLS-2.10.1/include".  Note that only the
+  directory name is enclosed in quotes, not the entire argument.  Also
+  note that this functionality is only supported if command extensions
+  are available.  If command extensions are disabled and you attempt to
+  use this functionality you may see the following warning message
+  "Error in --cflags argument: ... Backslashes and quotes cannot be
+  used with --cflags.  Please use forward slashes for filenames and
+  paths (e.g. when passing directories to -I)."
+  
   N.B.  It is normal to see a few error messages output while configure
   is running, when gcc support is being tested.  These cannot be
   suppressed because of limitations in the Windows 9X command.com shell.
@@ -325,12 +339,17 @@
 
 * Optional GnuTLS support
 
-  You can build Emacs with GnuTLS support.  Put the gnutls/gnutls.h header in
-  the include path and link to the appropriate libraries (gnutls.dll and
-  gcrypt.dll) with the --lib option.
+  If configure.bat finds the gnutls/gnutls.h file in the include path,
+  Emacs is built with GnuTLS support by default; to avoid that you can
+  pass the argument --without-gnutls.
 
-  You can get pre-built binaries and an installer at
-  http://josefsson.org/gnutls4win/.
+  In order to support GnuTLS at runtime, a GnuTLS-enabled Emacs must
+  be able to find the relevant DLLs during startup; failure to do so
+  is not an error, but GnuTLS won't be available to the running
+  session.
+
+  You can get pre-built binaries (including any required DLL and the
+  gnutls.h file) and an installer at http://josefsson.org/gnutls4win/.
 
 * Experimental SVG support
 
diff --git a/nt/configure.bat b/nt/configure.bat
index 7642d8244f8..63d94972d81 100755
--- a/nt/configure.bat
+++ b/nt/configure.bat
@@ -97,8 +97,10 @@ set profile=N
 set nocygwin=N

 set COMPILER=

 set usercflags=

+set fusercflags=

 set docflags=

 set userldflags=

+set fuserldflags=

 set extrauserlibs=

 set doldflags=

 set doextralibs=

@@ -238,6 +240,7 @@ goto ucflagne
 :ucflagex

 shift

 set usercflags=%usercflags%%sep1%%~1

+set fusercflags=%usercflags:"=\"%

 set sep1= %nothing%

 shift

 goto again

@@ -245,6 +248,7 @@ goto again
 :ucflagne

 shift

 set usercflags=%usercflags%%sep1%%1

+set fusercflags=%usercflags%

 set sep1= %nothing%

 shift

 goto again

@@ -266,6 +270,7 @@ goto ulflagne
 :ulflagex

 shift

 set userldflags=%userldflags%%sep2%%~1

+set fuserldflags=%userldflags:"=\"%

 set sep2= %nothing%

 shift

 goto again

@@ -273,6 +278,7 @@ goto again
 :ulflagne

 shift

 set userldflags=%userldflags%%sep2%%1

+set fuserldflags=%userldflags%

 set sep2= %nothing%

 shift

 goto again

@@ -437,7 +443,7 @@ goto nocompiler
 :chkuser

 rm -f junk.o

 echo int main (int argc, char *argv[]) {>junk.c

-echo char *usercflags = "%usercflags%";>>junk.c

+echo char *usercflags = "%fusercflags%";>>junk.c

 echo }>>junk.c

 echo gcc -Werror -c junk.c >>config.log

 gcc -Werror -c junk.c >>config.log 2>&1

@@ -745,8 +751,8 @@ echo. >>config.tmp
 echo /* Start of settings from configure.bat.  */ >>config.tmp

 rem   We write USER_CFLAGS and USER_LDFLAGS starting with a space to simplify

 rem   processing of compiler options in w32.c:get_emacs_configuration_options

-if (%docflags%) == (Y) echo #define USER_CFLAGS " %usercflags%">>config.tmp

-if (%doldflags%) == (Y) echo #define USER_LDFLAGS " %userldflags%">>config.tmp

+if (%docflags%) == (Y) echo #define USER_CFLAGS " %fusercflags%">>config.tmp

+if (%doldflags%) == (Y) echo #define USER_LDFLAGS " %fuserldflags%">>config.tmp

 if (%profile%) == (Y) echo #define PROFILING 1 >>config.tmp

 if not "(%HAVE_PNG%)" == "()" echo #define HAVE_PNG 1 >>config.tmp

 if not "(%HAVE_GNUTLS%)" == "()" echo #define HAVE_GNUTLS 1 >>config.tmp