diff options
| author | Jason Rumney | 2008-05-14 15:24:21 +0000 |
|---|---|---|
| committer | Jason Rumney | 2008-05-14 15:24:21 +0000 |
| commit | 26a3b3103ccd60e900d38b9924b9f23cf5c5a0b4 (patch) | |
| tree | bca935adbfa5e1c96ac467be50013c45e16c3f86 | |
| parent | e5e29349e12b31e694060c4c138464ed7e88a911 (diff) | |
| download | emacs-26a3b3103ccd60e900d38b9924b9f23cf5c5a0b4.tar.gz emacs-26a3b3103ccd60e900d38b9924b9f23cf5c5a0b4.zip | |
Remove code dealing with --disable-font-backend.
| -rw-r--r-- | nt/ChangeLog | 4 | ||||
| -rwxr-xr-x | nt/configure.bat | 9 |
2 files changed, 4 insertions, 9 deletions
diff --git a/nt/ChangeLog b/nt/ChangeLog index 6b0ad30b696..cfc73033208 100644 --- a/nt/ChangeLog +++ b/nt/ChangeLog | |||
| @@ -1,3 +1,7 @@ | |||
| 1 | 2008-05-14 Jason Rumney <jasonr@gnu.org> | ||
| 2 | |||
| 3 | * configure.bat: Remove code dealing with --disable-font-backend. | ||
| 4 | |||
| 1 | 2008-05-09 Eli Zaretskii <eliz@gnu.org> | 5 | 2008-05-09 Eli Zaretskii <eliz@gnu.org> |
| 2 | 6 | ||
| 3 | * inc/sys/stat.h (struct stat): Move st_dev after st_ino, for | 7 | * inc/sys/stat.h (struct stat): Move st_dev after st_ino, for |
diff --git a/nt/configure.bat b/nt/configure.bat index a26f369f0b8..957ed14b949 100755 --- a/nt/configure.bat +++ b/nt/configure.bat | |||
| @@ -88,7 +88,6 @@ set userldflags= | |||
| 88 | set doldflags= | 88 | set doldflags= |
| 89 | set sep1= | 89 | set sep1= |
| 90 | set sep2= | 90 | set sep2= |
| 91 | set usefontbackend=Y | ||
| 92 | 91 | ||
| 93 | rem ---------------------------------------------------------------------- | 92 | rem ---------------------------------------------------------------------- |
| 94 | rem Handle arguments. | 93 | rem Handle arguments. |
| @@ -108,7 +107,6 @@ if "%1" == "--without-jpeg" goto withoutjpeg | |||
| 108 | if "%1" == "--without-gif" goto withoutgif | 107 | if "%1" == "--without-gif" goto withoutgif |
| 109 | if "%1" == "--without-tiff" goto withouttiff | 108 | if "%1" == "--without-tiff" goto withouttiff |
| 110 | if "%1" == "--without-xpm" goto withoutxpm | 109 | if "%1" == "--without-xpm" goto withoutxpm |
| 111 | if "%1" == "--disable-font-backend" goto withoutfont | ||
| 112 | if "%1" == "" goto checkutils | 110 | if "%1" == "" goto checkutils |
| 113 | :usage | 111 | :usage |
| 114 | echo Usage: configure [options] | 112 | echo Usage: configure [options] |
| @@ -126,7 +124,6 @@ echo. --without-jpeg do not use JPEG library even if it is installed | |||
| 126 | echo. --without-gif do not use GIF library even if it is installed | 124 | echo. --without-gif do not use GIF library even if it is installed |
| 127 | echo. --without-tiff do not use TIFF library even if it is installed | 125 | echo. --without-tiff do not use TIFF library even if it is installed |
| 128 | echo. --without-xpm do not use XPM library even if it is installed | 126 | echo. --without-xpm do not use XPM library even if it is installed |
| 129 | echo. --disable-font-backend build without font backend support | ||
| 130 | goto end | 127 | goto end |
| 131 | rem ---------------------------------------------------------------------- | 128 | rem ---------------------------------------------------------------------- |
| 132 | :setprefix | 129 | :setprefix |
| @@ -213,11 +210,6 @@ set HAVE_XPM= | |||
| 213 | shift | 210 | shift |
| 214 | goto again | 211 | goto again |
| 215 | 212 | ||
| 216 | :withoutfont | ||
| 217 | set usefontbackend=N | ||
| 218 | shift | ||
| 219 | goto again | ||
| 220 | |||
| 221 | rem ---------------------------------------------------------------------- | 213 | rem ---------------------------------------------------------------------- |
| 222 | rem Check that necessary utilities (cp and rm) are present. | 214 | rem Check that necessary utilities (cp and rm) are present. |
| 223 | :checkutils | 215 | :checkutils |
| @@ -492,7 +484,6 @@ for %%v in (%usercflags%) do if not (%%v)==() set docflags=Y | |||
| 492 | if (%docflags%)==(Y) echo USER_CFLAGS=%usercflags%>>config.settings | 484 | if (%docflags%)==(Y) echo USER_CFLAGS=%usercflags%>>config.settings |
| 493 | for %%v in (%userldflags%) do if not (%%v)==() set doldflags=Y | 485 | for %%v in (%userldflags%) do if not (%%v)==() set doldflags=Y |
| 494 | if (%doldflags%)==(Y) echo USER_LDFLAGS=%userldflags%>>config.settings | 486 | if (%doldflags%)==(Y) echo USER_LDFLAGS=%userldflags%>>config.settings |
| 495 | if (%usefontbackend%) == (Y) echo USE_FONTBACKEND=1 >>config.settings | ||
| 496 | echo # End of settings from configure.bat>>config.settings | 487 | echo # End of settings from configure.bat>>config.settings |
| 497 | echo. >>config.settings | 488 | echo. >>config.settings |
| 498 | 489 | ||