Merge unicode branch

Revision: emacs@sv.gnu.org/emacs--devo--0--patch-1037

2 files changed, 32 insertions, 0 deletions

diff --git a/nt/ChangeLog.unicode b/nt/ChangeLog.unicode
new file mode 100644
index 00000000000..f4f50085462
--- /dev/null
+++ b/nt/ChangeLog.unicode
@@ -0,0 +1,22 @@
+2007-10-21  Jason Rumney  <jasonr@gnu.org>
+
+        * configure.bat (withfont): Set sep1 after modifying usercflags.
+
+2007-06-04  Jason Rumney  <jasonr@gnu.org>
+
+        * configure.bat: Rename --with-font-backend to --enable-font-backend
+        for consistency with other platforms.
+
+2007-05-31  Jason Rumney  <jasonr@gnu.org>
+
+        * configure.bat: Add --with-font-backend option.
+
+;; Local Variables:
+;; coding: iso-2022-7bit
+;; End:
+
+    Copyright (C) 2007 Free Software Foundation, Inc.
+  Copying and distribution of this file, with or without modification,
+  are permitted provided the copyright notice and this notice are preserved.
+
+;; arch-tag: d84beebb-6c36-40b7-af5d-4121fb59ea1e
diff --git a/nt/configure.bat b/nt/configure.bat
index a88cd5df413..9f51e1dc57e 100755
--- a/nt/configure.bat
+++ b/nt/configure.bat
@@ -108,6 +108,7 @@ if "%1" == "--without-jpeg" goto withoutjpeg
 if "%1" == "--without-gif" goto withoutgif

 if "%1" == "--without-tiff" goto withouttiff

 if "%1" == "--without-xpm" goto withoutxpm

+if "%1" == "--enable-font-backend" goto withfont

 if "%1" == "" goto checkutils

 :usage

 echo Usage: configure [options]

@@ -125,6 +126,7 @@ echo.   --without-jpeg          do not use jpeg-6b
 echo.   --without-gif           do not use giflib or libungif

 echo.   --without-tiff          do not use libtiff

 echo.   --without-xpm           do not use libXpm

+echo.   --enable-font-backend   build with font backend support

 goto end

 rem ----------------------------------------------------------------------

 :setprefix

@@ -211,6 +213,13 @@ set HAVE_XPM=
 shift

 goto again

 

+:withfont

+set usercflags=%usercflags%%sep1%-DUSE_FONT_BACKEND

+set sep1= %nothing%

+set usefontbackend=Y

+shift

+goto again

+

 rem ----------------------------------------------------------------------

 rem    Check that necessary utilities (cp and rm) are present.

 :checkutils

@@ -481,6 +490,7 @@ for %%v in (%usercflags%) do if not (%%v)==() set docflags=Y
 if (%docflags%)==(Y) echo USER_CFLAGS=%usercflags%>>config.settings

 for %%v in (%userldflags%) do if not (%%v)==() set doldflags=Y

 if (%doldflags%)==(Y) echo USER_LDFLAGS=%userldflags%>>config.settings

+if (%usefontbackend%) == (Y) echo USE_FONTBACKEND=1 >>config.settings

 echo # End of settings from configure.bat>>config.settings

 echo. >>config.settings