Commit 2aec15a4 authored by Jason Rumney's avatar Jason Rumney
Browse files

* 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.
parent cefd56f6
...@@ -89,6 +89,7 @@ set userldflags= ...@@ -89,6 +89,7 @@ set userldflags=
set doldflags= set doldflags=
set sep1= set sep1=
set sep2= set sep2=
set usefontbackend=Y
rem ---------------------------------------------------------------------- rem ----------------------------------------------------------------------
rem Handle arguments. rem Handle arguments.
...@@ -108,7 +109,7 @@ if "%1" == "--without-jpeg" goto withoutjpeg ...@@ -108,7 +109,7 @@ if "%1" == "--without-jpeg" goto withoutjpeg
if "%1" == "--without-gif" goto withoutgif if "%1" == "--without-gif" goto withoutgif
if "%1" == "--without-tiff" goto withouttiff if "%1" == "--without-tiff" goto withouttiff
if "%1" == "--without-xpm" goto withoutxpm if "%1" == "--without-xpm" goto withoutxpm
if "%1" == "--enable-font-backend" goto withfont if "%1" == "--disable-font-backend" goto withoutfont
if "%1" == "" goto checkutils if "%1" == "" goto checkutils
:usage :usage
echo Usage: configure [options] echo Usage: configure [options]
...@@ -126,7 +127,7 @@ echo. --without-jpeg do not use JPEG library even if it is installed ...@@ -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 echo. --without-gif do not use GIF library even if it is installed
echo. --without-tiff do not use TIFF library even if it is installed echo. --without-tiff do not use TIFF library even if it is installed
echo. --without-xpm do not use XPM library even if it is installed echo. --without-xpm do not use XPM library even if it is installed
echo. --enable-font-backend build with font backend support echo. --disable-font-backend build without font backend support
goto end goto end
rem ---------------------------------------------------------------------- rem ----------------------------------------------------------------------
:setprefix :setprefix
...@@ -213,10 +214,8 @@ set HAVE_XPM= ...@@ -213,10 +214,8 @@ set HAVE_XPM=
shift shift
goto again goto again
:withfont :withoutfont
set usercflags=%usercflags%%sep1%-DUSE_FONT_BACKEND set usefontbackend=N
set sep1= %nothing%
set usefontbackend=Y
shift shift
goto again goto again
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment