* gmake.defs, nmake.defs (FONT_CFLAGS): New optional compiler flag.

(EMACS_EXTRA_C_FLAGS): Include it.
* configure.bat (usefontbackend): Default to Y.
(--enable-font-backend): Replace with --disable-font-backend.
(:withfont): Replace with :withoutfont.

diff --git a/nt/configure.bat b/nt/configure.bat
index 6da9e665c66d23d98ce73c80d3066527d6a341e1..87b02de0e9cc972675878809ff608cb2279a92d8 100755 (executable)
--- a/nt/configure.bat
+++ b/nt/configure.bat
@@ -89,6 +89,7 @@ set userldflags=
 set doldflags=\r
 set sep1=\r
 set sep2=\r
+set usefontbackend=Y\r
 \r
 rem ----------------------------------------------------------------------\r
 rem   Handle arguments.\r
@@ -108,7 +109,7 @@ if "%1" == "--without-jpeg" goto withoutjpeg
 if "%1" == "--without-gif" goto withoutgif\r
 if "%1" == "--without-tiff" goto withouttiff\r
 if "%1" == "--without-xpm" goto withoutxpm\r
-if "%1" == "--enable-font-backend" goto withfont\r
+if "%1" == "--disable-font-backend" goto withoutfont\r
 if "%1" == "" goto checkutils\r
 :usage\r
 echo Usage: configure [options]\r
@@ -126,7 +127,7 @@ echo.   --without-jpeg          do not use JPEG library even if it is installed
 echo.   --without-gif           do not use GIF library even if it is installed\r
 echo.   --without-tiff          do not use TIFF library even if it is installed\r
 echo.   --without-xpm           do not use XPM library even if it is installed\r
-echo.   --enable-font-backend   build with font backend support\r
+echo.   --disable-font-backend  build without font backend support\r
 goto end\r
 rem ----------------------------------------------------------------------\r
 :setprefix\r
@@ -213,10 +214,8 @@ set HAVE_XPM=
 shift\r
 goto again\r
 \r
-:withfont\r
-set usercflags=%usercflags%%sep1%-DUSE_FONT_BACKEND\r
-set sep1= %nothing%\r
-set usefontbackend=Y\r
+:withoutfont\r
+set usefontbackend=N\r
 shift\r
 goto again\r
 \r