aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJason Rumney2008-05-14 15:24:21 +0000
committerJason Rumney2008-05-14 15:24:21 +0000
commit26a3b3103ccd60e900d38b9924b9f23cf5c5a0b4 (patch)
treebca935adbfa5e1c96ac467be50013c45e16c3f86
parente5e29349e12b31e694060c4c138464ed7e88a911 (diff)
downloademacs-26a3b3103ccd60e900d38b9924b9f23cf5c5a0b4.tar.gz
emacs-26a3b3103ccd60e900d38b9924b9f23cf5c5a0b4.zip
Remove code dealing with --disable-font-backend.
-rw-r--r--nt/ChangeLog4
-rwxr-xr-xnt/configure.bat9
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 @@
12008-05-14 Jason Rumney <jasonr@gnu.org>
2
3 * configure.bat: Remove code dealing with --disable-font-backend.
4
12008-05-09 Eli Zaretskii <eliz@gnu.org> 52008-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=
88set doldflags= 88set doldflags=
89set sep1= 89set sep1=
90set sep2= 90set sep2=
91set usefontbackend=Y
92 91
93rem ---------------------------------------------------------------------- 92rem ----------------------------------------------------------------------
94rem Handle arguments. 93rem Handle arguments.
@@ -108,7 +107,6 @@ if "%1" == "--without-jpeg" goto withoutjpeg
108if "%1" == "--without-gif" goto withoutgif 107if "%1" == "--without-gif" goto withoutgif
109if "%1" == "--without-tiff" goto withouttiff 108if "%1" == "--without-tiff" goto withouttiff
110if "%1" == "--without-xpm" goto withoutxpm 109if "%1" == "--without-xpm" goto withoutxpm
111if "%1" == "--disable-font-backend" goto withoutfont
112if "%1" == "" goto checkutils 110if "%1" == "" goto checkutils
113:usage 111:usage
114echo Usage: configure [options] 112echo Usage: configure [options]
@@ -126,7 +124,6 @@ echo. --without-jpeg do not use JPEG library even if it is installed
126echo. --without-gif do not use GIF library even if it is installed 124echo. --without-gif do not use GIF library even if it is installed
127echo. --without-tiff do not use TIFF library even if it is installed 125echo. --without-tiff do not use TIFF library even if it is installed
128echo. --without-xpm do not use XPM library even if it is installed 126echo. --without-xpm do not use XPM library even if it is installed
129echo. --disable-font-backend build without font backend support
130goto end 127goto end
131rem ---------------------------------------------------------------------- 128rem ----------------------------------------------------------------------
132:setprefix 129:setprefix
@@ -213,11 +210,6 @@ set HAVE_XPM=
213shift 210shift
214goto again 211goto again
215 212
216:withoutfont
217set usefontbackend=N
218shift
219goto again
220
221rem ---------------------------------------------------------------------- 213rem ----------------------------------------------------------------------
222rem Check that necessary utilities (cp and rm) are present. 214rem 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
492if (%docflags%)==(Y) echo USER_CFLAGS=%usercflags%>>config.settings 484if (%docflags%)==(Y) echo USER_CFLAGS=%usercflags%>>config.settings
493for %%v in (%userldflags%) do if not (%%v)==() set doldflags=Y 485for %%v in (%userldflags%) do if not (%%v)==() set doldflags=Y
494if (%doldflags%)==(Y) echo USER_LDFLAGS=%userldflags%>>config.settings 486if (%doldflags%)==(Y) echo USER_LDFLAGS=%userldflags%>>config.settings
495if (%usefontbackend%) == (Y) echo USE_FONTBACKEND=1 >>config.settings
496echo # End of settings from configure.bat>>config.settings 487echo # End of settings from configure.bat>>config.settings
497echo. >>config.settings 488echo. >>config.settings
498 489