ChangeLog 297 KB
Newer Older
Paul Eggert's avatar
Paul Eggert committed
1
2011-07-08  Paul Eggert  <eggert@cs.ucla.edu>
2

Paul Eggert's avatar
Paul Eggert committed
3
	Add gnulib support for pthread_sigmask (Bug#9010).
4
	* Makefile.in (GNULIB_MODULES): Add pthread_sigmask.
5 6 7
	* configure.in (AC_TYPE_UID_T): New dummy macro.
	Configure gnulib after adjusting LIBS,
	so that gnulib can assume the libraries in LIBS.
8
	* lib/signal.in.h, m4/pthread_sigmask.m4, m4/signal_h.m4:
9
	* lib/pthread_sigprocmask.c, lib/sigprocmask.c, m4/signalblocking.m4:
10
	* lib/pthread_sigmask.c:
11 12 13 14 15
	New files, automatically imported from gnulib.
	* lib/gnulib.mk, m4/gl-comp.m4: Automatically-imported update
	due to the above changes.
	* .bzrignore: Add lib/signal.h.

16 17
	* lib/getopt.c, lib/unistd.in.h, m4/getopt.m4: Merge from gnulib.

18 19 20 21
2011-07-07  Andreas Schwab  <schwab@linux-m68k.org>

	* configure.in (maintainer-mode): Reflect default in help string.

22 23 24 25
2011-07-07  Dan Nicolaescu  <dann@ics.uci.edu>

	* configure.in: Remove reference to iris4d.h.

26 27 28 29
2011-07-05  Jan Djärv  <jan.h.d@swipnet.se>

	* configure.in (HAVE_GCONF): Allow both HAVE_GCONF and HAVE_GSETTINGS.

30 31 32 33
2011-07-01  Glenn Morris  <rgm@gnu.org>

	* configure.in (SETTINGS_CFLAGS, SETTINGS_LIBS) [HAVE_GCONF]: Fix typo.

34 35 36 37 38
2011-06-30  Lars Magne Ingebrigtsen  <larsi@gnus.org>

	* configure.in (HAVE_GSETTINGS): Fix syntax for GSETTINGS tests,
	which made ./configure infloop.

39 40 41 42
2011-06-30  Jan Djärv  <jan.h.d@swipnet.se>

	* configure.in (gsettings): New option and check for GSettings.

43 44 45 46
2011-06-29  Glenn Morris  <rgm@gnu.org>

	* configure.in: Try to test for the required crt*.o files.

47 48 49 50
2011-06-27  Bill Wohler  <wohler@newt.com>

	* .bzrignore: Add lisp/mh-e/mh-autoloads.el and lisp/mh-e/mh-cus-load.el.

51 52 53 54 55 56 57
2011-06-25  Paul Eggert  <eggert@cs.ucla.edu>

	Use gnulib's dup2 module instead of rolling our own.
	* Makefile.in (GNULIB_MODULES): Add dup2.
	* configure.in: Do not check for dup2; gnulib does that now.
	* lib/dup2.c, m4/dup2.m4: New files, from gnulib.

58 59 60 61
2011-06-23  Paul Eggert  <eggert@cs.ucla.edu>

	* lib/getopt.c, lib/stat.c, m4/gl-comp.m4: Merge from gnulib.

62
2011-06-22  Paul Eggert  <eggert@cs.ucla.edu>
Paul Eggert's avatar
Paul Eggert committed
63 64 65 66 67

	Use gnulib's alloca-opt module.
	* .bzrignore: Add lib/alloca.h.
	* Makefile.in (GNULIB_MODULES): Add alloca-opt.
	* configure.in (AC_FUNC_ALLOCA): Remove almost all the alloca stuff,
68 69
	as gnulib now does that for us.  Put alloca check in config.h.
	Include <alloca.h> before any other include file, for AIX 3.
Paul Eggert's avatar
Paul Eggert committed
70 71 72
	* lib/gnulib.mk, m4/gl-comp.m4: Regenerate.
	* lib/alloca.in.h, m4/alloca.m4: New files, from gnulib.

73 74 75 76 77 78 79 80 81 82 83 84 85 86 87
2011-06-21  Leo Liu  <sdl.web@gmail.com>

	* m4/sha256.m4:
	* m4/sha512.m4:
	* m4/gl-comp.m4:
	* lib/u64.h:
	* lib/sha256.c:
	* lib/sha256.h:
	* lib/sha512.c:
	* lib/sha512.h:
	* lib/makefile.w32-in (GNULIBOBJS):
	* lib/gnulib.mk:
	* Makefile.in (GNULIB_MODULES): Add crypto/sha256 and
	crypto/sha512 modules from gnulib.

88 89 90 91
2011-06-19  Paul Eggert  <eggert@cs.ucla.edu>

	* lib/unistd.in.h, m4/getloadavg.m4: Merge from gnulib.

Glenn Morris's avatar
Glenn Morris committed
92 93 94 95 96
2011-06-17  Glenn Morris  <rgm@gnu.org>

	* configure.in: Restore the behavior of checking crt-dir only
	when the user specified it (not all platforms use it).

97 98 99 100
2011-06-16  Paul Eggert  <eggert@cs.ucla.edu>

	* m4/lstat.m4: Merge from gnulib (Bug#8878).

101 102 103 104 105
2011-06-16  Miles Bader <miles@gnu.org>

	* configure.in: Try to determine CRT_DIR automatically when
	using gcc.

106 107
2011-06-15  Paul Eggert  <eggert@cs.ucla.edu>

108 109 110 111 112 113
	* lib/ftoastr.c, lib/stdio.in.h, lib/verify.h:
	* lib/gnulib.mk, m4/c-strtod.m4, m4/filemode.m4, m4/getloadavg.m4:
	* m4/getopt.m4, m4/gl-comp.m4, m4/lstat.m4, m4/md5.m4, m4/mktime.m4:
	* m4/readlink.m4, m4/sha1.m4, m4/stat.m4, m4/strftime.m4:
	* m4/strtoull.m4, m4/strtoumax.m4, m4/symlink.m4, m4/time_r.m4:
	Merge from gnulib.
114

115 116 117 118
2011-06-14  Jan Djärv  <jan.h.d@swipnet.se>

	* configure.in: Add emacsgtkfixed.o to GTK_OBJ if HAVE_GTK3.

119 120 121 122
2011-06-08  Paul Eggert  <eggert@cs.ucla.edu>

	* lib/gnulib.mk, m4/gnulib-common.m4: Merge from gnulib.

Paul Eggert's avatar
Paul Eggert committed
123 124 125 126 127
2011-06-07  Paul Eggert  <eggert@cs.ucla.edu>

	* configure.in: Add --with-wide-int.
	* INSTALL: Mention this.

Paul Eggert's avatar
Paul Eggert committed
128 129 130 131 132
2011-06-06  Paul Eggert  <eggert@cs.ucla.edu>

	Merge from gnulib.
	* lib/careadlinkat.c, lib/careadlinkat.h, m4/gnulib-common.m4: Merge.

133 134 135 136
2011-06-02  Paul Eggert  <eggert@cs.ucla.edu>

	* lib/allocator.h, lib/careadlinkat.c: Merge from gnulib.

Paul Eggert's avatar
Paul Eggert committed
137
2011-05-30  Paul Eggert  <eggert@cs.ucla.edu>
Paul Eggert's avatar
Paul Eggert committed
138 139

	Use 'inline', not 'INLINE'.
Paul Eggert's avatar
Paul Eggert committed
140
	* configure.in (INLINE): Remove.
Paul Eggert's avatar
Paul Eggert committed
141

142 143 144 145 146 147 148
2011-05-29  Paul Eggert  <eggert@cs.ucla.edu>

	Adjust to recent gnulib change for @GUARD_PREFIX@.
	* lib/makefile.w32-in (getopt_h): Substitute @GUARD_PREFIX@, too.
	All uses of _GL_ for guard prefixes in lib/*.h replaced with
	_@GUARD_PREFIX@_.

149 150
2011-05-27  Paul Eggert  <eggert@cs.ucla.edu>

151
	* lib/getopt.c, lib/intprops.h: Merge from gnulib.
152

153 154
2011-05-24  Glenn Morris  <rgm@gnu.org>

155 156
	* Makefile.in (check): Just give a message if no test/ directory.

157 158
	* configure.in: Avoid using variables inside AC_CONFIG_FILES.

159 160 161 162 163 164
	* configure.in (OPT_MAKEFILES_IN): Remove.
	(SUBDIR_MAKEFILES): New variable, passed to AC_CONFIG_FILES.
	(SUBDIR_MAKEFILES_IN): New output variable.
	* Makefile.in (OPT_MAKEFILES_IN): Remove.
	(SUBDIR_MAKEFILES_IN): Let configure set it.

Leo Liu's avatar
Leo Liu committed
165 166 167 168 169 170 171 172 173 174
2011-05-24  Leo Liu  <sdl.web@gmail.com>

	* m4/sha1.m4:
	* m4/gl-comp.m4:
	* lib/sha1.h:
	* lib/sha1.c:
	* lib/makefile.w32-in (GNULIBOBJS):
	* lib/gnulib.mk:
	* Makefile.in (GNULIB_MODULES): Add crypto/sha1 module.

175 176
2011-05-24  Glenn Morris  <rgm@gnu.org>

177 178 179
	* configure.in: Remove test for already configured source directory.
	AM_INIT_AUTOMAKE has already done a more stringent test.  (Bug#953)

180 181
	* Makefile.in (TAGS, tags, check): Pass MFLAGS to sub-makes.

182 183
2011-05-24  Glenn Morris  <rgm@gnu.org>

184 185 186 187 188 189 190
	* make-dist: Don't distribute test/.  (Bug#8107)
	* configure.in (OPT_MAKEFILES_IN): New output variable.
	(AC_CONFIG_FILES): Conditionally include test/automated/Makefile.
	* Makefile.in (OPT_MAKEFILES_IN): New, set by configure.
	(SUBDIR_MAKEFILES_IN): Use $OPT_MAKEFILES_IN.
	(check): Give an explicit error if test/ is not present.

191 192 193 194
	* Makefile.in (SUBDIR_MAKEFILES_IN): New variable.
	(SUBDIR_MAKEFILES): Derive from $SUBDIR_MAKEFILES_IN.
	(Makefile): Use $SUBDIR_MAKEFILES_IN.

195 196 197 198
2011-05-23  Paul Eggert  <eggert@cs.ucla.edu>

	* lib/verify.h: Merge from gnulib.

Paul Eggert's avatar
Paul Eggert committed
199 200 201 202 203
2011-05-22  Paul Eggert  <eggert@cs.ucla.edu>

	* lib/intprops.h, lib/stdint.in.h, m4/mktime.m4, m4/readlink.m4:
	Merge from gnulib.

204 205 206 207
2011-05-21  Andreas Schwab  <schwab@linux-m68k.org>

	* Makefile.in (AUTOMAKE_INPUTS): Add $(srcdir)/lib/gnulib.mk.

208 209
2011-05-20  Eli Zaretskii  <eliz@gnu.org>

210 211
	* .bzrignore: Add lib/stdio.in-h, lib/stdbool.h, and lib/stdint.h.

212 213
	* config.bat: Concatenate lisp.mk onto the end of src/Makefile.

214 215 216 217
2011-05-20  Glenn Morris  <rgm@gnu.org>

	* configure.in (lisp_frag): New output file.

218 219 220 221 222
2011-05-19  Glenn Morris  <rgm@gnu.org>

	* configure.in (NS_SUPPORT, MOUSE_SUPPORT, TOOLTIP_SUPPORT)
	(WINDOW_SUPPORT): Remove output variables that are no longer used.

223 224
2011-05-17  Paul Eggert  <eggert@cs.ucla.edu>

Eli Zaretskii's avatar
Eli Zaretskii committed
225 226 227 228 229 230
	* lib/gnulib.mk:
	* lib/intprops.h:
	* lib/unistd.in.h:
	* m4/inttypes.m4:
	* m4/stdint.m4:
	* m4/unistd_h.m4: Sync from gnulib.
231

232 233 234 235 236
2011-05-14  Glenn Morris  <rgm@gnu.org>

	* configure.in: Treat failure to find an X toolkit the same way we treat
	failure to find X and image support.

237 238 239 240 241
2011-05-12  Glenn Morris  <rgm@gnu.org>

	* Makefile.in (src, install-arch-indep, bootstrap-clean)
	(check-declare): Shell portability fixes.  (Bug#8642)

242 243 244 245
2011-05-09  Teodor Zlatanov  <tzz@lifelogs.com>

	* configure.in: Require GnuTLS 2.6.x or higher.

246
2011-05-06  Paul Eggert  <eggert@cs.ucla.edu>
247

248 249 250 251
	Use C99's va_copy to avoid undefined behavior on x86-64 GNU/Linux.
	* Makefile.in (GNULIB_MODULES): Add stdarg, for va_copy.
	* lib/stdarg.in.h, m4/stdarg.m4: New files, from gnulib.

252 253 254 255
	* Makefile.in (GNULIB_TOOL_FLAG): Add --conditional-dependencies.
	This new gnulib-tool option saves 'configure' the trouble of
	checking for strtoull when strtoumax exists.

256 257
	* configure.in (BITS_PER_LONG_LONG): New macro.

258 259 260 261 262
2011-05-05  Glenn Morris  <rgm@gnu.org>

	* Makefile.in (bootstrap-clean): Save config.log.  (Bug#765)
	(top_distclean): Delete config.log~.

263 264 265 266 267
2011-04-27  Ben Key  <bkey76@gmail.com>

	* configure.in: Fixed a bug that caused configure with
	--enable-checking=stringoverrun to have no effect.

Paul Eggert's avatar
Paul Eggert committed
268
2011-04-26  Paul Eggert  <eggert@cs.ucla.edu>
269 270 271 272 273 274

	* configure.in: Suppress unnecessary checks for size_t.
	(AC_TYPE_SIZE_T): Define an empty macro, to suppress obsolescent test.
	(size_t): Do not check for this, and do not typedef.  This code
	is never exercised now.

275 276 277 278
	* Makefile.in (GNULIB_MODULES): Add strtoumax.
	This is needed for the new integer-reading code in lread.c.
	It automatically pulls in the following gnulib files, which
	are used on old-fashioned platforms that don't have strtoumax:
279 280 281
	lib/inttypes.in.h, lib/strtoimax.c, lib/strtol.c, lib/strtoul.c,
	lib/strtoull.c, lib/strtoumax.c, lib/verify.h, m4/inttypes.m4,
	m4/strtoull.m4, m4/strtoumax.m4.
282
	* .bzrignore: Add lib/inttypes.h.
283

284 285 286 287
2011-04-24  Teodor Zlatanov  <tzz@lifelogs.com>

	* configure.in: Check for GnuTLS certificate verify callbacks.

288 289 290 291 292
2011-04-20  Stefan Monnier  <monnier@iro.umontreal.ca>

	* Makefile.in (config.status): Don't erase in case of error.
	In case it disappeared, rebuild it with `configure'.

293 294 295 296
2011-04-20  Ken Brown  <kbrown@cornell.edu>

	* configure.in (use_mmap_for_buffers): Set to yes on Cygwin.

Glenn Morris's avatar
Glenn Morris committed
297 298 299 300
2011-04-12  Glenn Morris  <rgm@gnu.org>

	* configure.in: Require ImageMagick >= 6.2.8.  (Bug#7955)

Paul Eggert's avatar
Paul Eggert committed
301
2011-04-09  Paul Eggert  <eggert@cs.ucla.edu>
Paul Eggert's avatar
Paul Eggert committed
302 303 304

	* lib/allocator.c: New file, automatically generated by gnulib.

305 306 307 308
2011-04-07  Glenn Morris  <rgm@gnu.org>

	* autogen/update_autogen: Ignore comment diffs in ldefs-boot.el.

309 310 311 312 313
2011-04-06  Eli Zaretskii  <eliz@gnu.org>

	* lib/makefile.w32-in ($(BLD)/careadlinkat.$(O), GNULIBOBJS):
	Revert last change.

314 315 316 317 318 319 320 321
2011-04-06  Juanma Barranquero  <lekktu@gmail.com>

	* lib/makefile.w32-in (GNULIBOBJS): Add careadlinkat.$(O).
	($(BLD)/careadlinkat.$(O)): New target.
	($(BLD)/dtoastr.$(O), $(BLD)/getopt.$(O), $(BLD)/getopt1.$(O))
	($(BLD)/strftime.$(O), $(BLD)/time_r.$(O), $(BLD)/md5.$(O)):
	Update dependencies.

Paul Eggert's avatar
Paul Eggert committed
322
2011-04-06  Paul Eggert  <eggert@cs.ucla.edu>
323

324 325
	Fix more problems found by GCC 4.6.0's static checks.

326 327
	* configure.in (ATTRIBUTE_FORMAT, ATTRIBUTE_FORMAT_PRINTF): New macros.

Paul Eggert's avatar
Paul Eggert committed
328
	Replace 2 copies of readlink code with 1 gnulib version (Bug#8401).
329 330 331 332
	* Makefile.in (GNULIB_MODULES): Add careadlinkat.
	* lib/allocator.h, lib/careadlinkat.c, lib/careadlinkat.h:
	* m4/ssize_t.m4: New files, automatically generated from gnulib.

333 334 335 336 337 338 339 340 341 342
2011-04-06  Glenn Morris  <rgm@gnu.org>

	* autogen/update_autogen: Handle loaddefs-like files as well.
	(usage): Add -l, -C.
	(clean, ldefs_flag, ldefs_in, ldefs_out): New variables.
	With -l, check status of lisp/ as well.
	With -C, clean before building.
	(autoreconf): Only pass -f in the `clean' case.
	(commit): New function.

343 344
2011-03-28  Glenn Morris  <rgm@gnu.org>

345 346
	* autogen/update_autogen: Pass -f to autoreconf.

347 348 349
	* autogen.sh (get_version): Discard "not found" lines.
	(check_version): Respect $AUTOCONF etc environment variables.

350 351 352 353 354
2011-03-27  Glenn Morris  <rgm@gnu.org>

	* configure.in (AC_TYPE_SIGNAL): Remove obsolete macro.
	(AH_BOTTOM): Do not define SIGTYPE.

355 356 357 358 359
2011-03-26  Glenn Morris  <rgm@gnu.org>

	* configure.in: Replace obsolete macros AC_TRY_COMPILE, AC_TRY_LINK,
	AC_TRY_RUN with AC_COMPILE_IFELSE, AC_LINK_IFELSE, AC_RUN_IFELSE.

360 361 362 363
2011-03-25  Andreas Schwab  <schwab@linux-m68k.org>

	* autogen/update_autogen: Remove useless function keyword.

364 365 366 367 368
2011-03-25  Eli Zaretskii  <eliz@gnu.org>

	* config.bat: Generate src/config.h and lib/Makefile from
	autogen/config.in and autogen/Makefile.in.

369 370 371 372 373 374 375 376 377 378 379 380 381 382
2011-03-25  Glenn Morris  <rgm@gnu.org>

	* compile, config.guess, config.sub, depcomp, install-sh, missing:
	Remove; autoreconf can supply them.
	* Makefile.in (sync-from-gnulib): Don't sync config.sub,
	config.guess, install-sh.  Pass -i to autoreconf.
	* autogen/update_autogen (genfiles): Add compile, config.guess,
	config.sub, depcomp, install-sh, missing.  Pass -i to autoreconf.
	Discard non-error output from autoreconf in -q case.
	* autogen/compile, autogen/config.guess, autogen/config.sub:
	* autogen/depcomp, autogen/install-sh, autogen/missing: New.
	* autogen/copy_autogen: Add compile, config.guess, config.sub, depcomp,
	install-sh, missing.

383 384
2011-03-23  Glenn Morris  <rgm@gnu.org>

385
	* autogen/update_autogen: Fix typo.
386
	(msg): Remove function; use `exec' instead.
387

388 389 390 391
	* Makefile.in (mkdir): Use `install-sh -d' instead of mkinstalldirs.
	(sync-from-gnulib): Don't sync mkinstalldirs.
	* make-dist: Don't distribute mkinstalldirs.

392
2011-03-23  Paul Eggert  <eggert@cs.ucla.edu>
393

394
	Fix more problems found by GCC 4.5.2's static checks.
395 396 397 398
	* Makefile.in (GNULIB_MODULES): Add socklen.
	* configure.in: Do not check for sys/socket.h, since socklen does that.
	* m4/socklen.m4: New automatically-generated file, from gnulib.

Paul Eggert's avatar
Paul Eggert committed
399 400 401 402
	fakemail: Remove dependency on ignore-value.
	* Makefile.in (GNULIB_MODULES): Add stdio.
	* lib/stdio.in.h, m4/stdio_h.m4: New files, automatically
	imported from gnulib.
Paul Eggert's avatar
Paul Eggert committed
403
	* .bzrignore: Add lib/stdio.h.
404

Glenn Morris's avatar
Glenn Morris committed
405 406 407 408 409 410
2011-03-22  Glenn Morris  <rgm@gnu.org>

	* autogen/copy_autogen: Work from ./ or ../.
	Fix time-stamps.
	* autogen.sh: Doc fix.

411 412 413 414 415 416 417 418 419 420 421 422
2011-03-20  Glenn Morris  <rgm@gnu.org>

	* autogen/: New directory, to be excluded from releases.
	* autogen/copy_autogen, autogen/update_autogen: New scripts.
	* autogen/README: New file.
	* autogen/aclocal.m4, autogen/config.in, autogen/configure:
	* autogen/Makefile.in: Add auto-updated generated files.
	* autogen.sh: No longer a no-op, now it tests for autotools
	and runs them as necessary.
	* configure.in: Defaule maintainer-mode to on.
	* aclocal.m4, configure, lib/Makefile.in: Remove files.

423 424 425 426 427 428 429 430
2011-03-13  Paul Eggert  <eggert@cs.ucla.edu>

	Update for gnulib.
	* Makefile.in (GNULIB_MODULES): Add intprops, as Emacs now
	includes <intprops.h> directly.
	* lib/sys_stat.in.h: New version from Gnulib, which fixes a bug
	when building Emacs on Solaris 9 and running it on Solaris 10.

431 432 433 434
2011-03-08  Jan Djärv  <jan.h.d@swipnet.se>

	* configure.in: Require 3.0 for --with-gtk3.  Add HAVE_GTK3.

435 436 437 438
2011-03-07  Chong Yidong  <cyd@stupidchicken.com>

	* Version 23.3 released.

439 440 441 442
2011-03-06  Glenn Morris  <rgm@gnu.org>

	* configure.in (FREETYPE_LIBS): Actually set it to something.

443 444 445 446 447 448 449 450 451 452 453 454 455
2011-03-02  Paul Eggert  <eggert@cs.ucla.edu>

	Work around some portability problems with symlinks.

	* Makefile.in (GNULIB_MODULES): Add lstat, readlink, symlink.
	* configure.in (lstat, HAVE_LSTAT): Remove special hack.
	* lib/dosname.h, lib/lstat.c, lib/readlink.c, lib/stat.c:
	* lib/symlink.c, m4/lstat.m4, m4/readlink.m4, m4/stat.m4:
	* m4/symlink.m4:
	New files, automatically generated from gnulib.
	* aclocal.m4, configure, lib/Makefile.in, lib/gnulib.mk:
	* m4/gl-comp.m4, src/config.in, config.sub: Regenerate.

456 457
2011-02-26  Eli Zaretskii  <eliz@gnu.org>

458 459
	* .bzrignore: Ignore new lib/*.in-h files.

460 461 462
	* config.bat: Rename stdint.in.h and sys_stat.in.h.  Call
	depfiles.bat even if lib/deps already exist.

Paul Eggert's avatar
Paul Eggert committed
463 464 465
2011-02-25  Paul Eggert  <eggert@cs.ucla.edu>

	* configure, lib/Makefile.in, lib/getopt_int.h, lib/gnulib.mk:
466 467
	* lib/stdlib.in.h, m4/stdlib_h.m4: Regenerate to incorporate
	recent changes to configure.in and to gnulib.
Paul Eggert's avatar
Paul Eggert committed
468

469 470 471 472 473
2011-02-24  Glenn Morris  <rgm@gnu.org>

	* configure.in: Replace obsolete AC_OUTPUT() with AC_CONFIG_FILES(),
	AC_CONFIG_COMMANDS(), and AC_OUTPUT sans arguments.

Paul Eggert's avatar
Paul Eggert committed
474 475 476 477 478 479 480 481
2011-02-22  Paul Eggert  <eggert@cs.ucla.edu>

	Assume S_ISLNK etc. work, since gnulib supports this.
	* Makefile.in (GNULIB_MODULES): Add sys_stat.
	* configure.in: Check for lstat and set HAVE_LSTAT=0 if not.
	Pretend to be using the gnulib lstat module for benefit of sys/stat.h.
	* configure, lib/Makefile.in, lib/gnulib.mk: Regenerate.

Paul Eggert's avatar
Paul Eggert committed
482 483 484 485
2011-02-21  Paul Eggert  <eggert@cs.ucla.edu>

	* lib/min-max.h: New file, for "min" and "max".

486 487
2011-02-21  Christoph Scholtes  <cschol2112@gmail.com>

Juanma Barranquero's avatar
Juanma Barranquero committed
488
	* lib/makefile.w32-in ($(BLD)/md5.$(O)): Added dependency on
489 490
	$(EMACS_ROOT)/nt/inc/stdint.h.

491 492 493 494 495 496
2011-02-21  Eli Zaretskii  <eliz@gnu.org>

	* lib/makefile.w32-in ($(BLD)/filemode.$(O)): Move from
	src/makefile.w32-in and adapt.  Depend on stamp_BLD.
	(GNULIBOBJS): Add $(BLD)/filemode.$(O).

497 498 499 500 501 502 503 504 505 506 507 508 509 510 511
2011-02-20  Paul Eggert  <eggert@cs.ucla.edu>

	Import filemode module from gnulib.
	* .bzrignore: Add lib/sys/.
	* Makefile.in (GNULIB_MODULES): Add filemode.
	* lib/Makefile.am (MOSTLYCLEANDIRS): New macro.
	* lib/filemode.c: Renamed from src/filemode.c and regenerated
	from gnulib.  This adds support for some more file types, e.g.,
	Cray DMF migrated files.
	* lisp/emacs-lisp/find-gc.el (find-gc-source-files): Remove filemode.c.
	* lib/filemode.h, lib/sys_stat.in.h, m4/filemode.m4, m4/st_dm_mode.m4:
	* m4/sys_stat_h.m4: New files, generated from gnulib.
	* aclocal.m4, configure, lib/Makefile.in, lib/gnulib.mk, m4/gl-comp.m4:
	Regenerate.

512 513 514 515 516
2011-02-20  Eli Zaretskii  <eliz@gnu.org>

	* lib/makefile.w32-in ($(BLD)/md5.$(O)): Don't depend on
	$(EMACS_ROOT)/nt/inc/sys/stat.h.

517 518 519 520 521 522 523 524 525 526
2011-02-20  Paul Eggert  <eggert@cs.ucla.edu>

	* configure.in (C_WARNINGS_SWITCH): Do not prepend -Wno-pointer-sign.
	This undoes the 2006-01-02 change.  The -Wno-pointer-sign option
	is no longer needed, due to the recent SSDATA and related changes.
	Perhaps -Wno-pointer-sign should also be removed from
	nextstep/Cocoa/Emacs.xcodeproj/project.pbxproj but I have no easy
	way to test this so I left it alone.
	* configure: Regenerate.

Juanma Barranquero's avatar
Juanma Barranquero committed
527
2011-02-20  Christoph Scholtes  <cschol2112@gmail.com>
528 529 530 531

	* lib/makefile.w32-in ($(BLD)/md5.$(O)): New recipe, moved from
	src/makefile.w32-in.

532
2011-02-20  Paul Eggert  <eggert@cs.ucla.edu>
533

534
	Import crypto/md5 and stdint modules from gnulib.
535
	* aclocal.m4, configure, lib/Makefile.in, lib/gnulib.mk, m4/gl-comp.m4:
536 537 538 539 540 541
	Regenerate.
	* lib/md5.c, lib/md5.h: Rename from src/md5.h and lib/md5.h.
	Import the new versions from gnulib; they assume a C99-style
	<stdint.h>, supplied by the stdint module.
	* lib/stdint.in.h, m4/longlong.m4, m4/stdint.m4, m4/md5.m4: New files,
	imported from gnulib.
542 543 544
	* Makefile.in (MAKEFILE_MODULES): Add crypto/md5.
	* admin/notes/copyright: Remove src/md5.c and src/md5.h as
	special cases.
545

546 547
2011-02-19  Eli Zaretskii  <eliz@gnu.org>

548
	* .bzrignore: Ignore cxxdefs.h and lib/*.in-h files.
549
	Add lib/deps/.
550

551
	* config.bat: Configure in `lib'.
552
	Generate *.Po files in lib/deps.
553

554 555 556 557 558
2011-02-18  Paul Eggert  <eggert@cs.ucla.edu>

	Import IRIX 6.5 getloadavg fixes from gnulib.
	* configure, lib/getloadavg.c, m4/getloadavg.m4: Regenerate.

559 560 561 562 563 564 565 566 567 568 569 570 571 572 573 574 575 576 577 578 579
2011-02-16  Paul Eggert  <eggert@cs.ucla.edu>

	Import getloadavg module from gnulib.
	* .bzrignore: Add lib/stdlib.h.
	* Makefile.in (GNULIB_MODULES): Add getloadavg.
	* admin/notes/copyright: Remove src/getloadavg.c as a special case.
	* configure.in (LIBS_SYSTEM): Omit -lkstat on sol2*; gnulib does this.
	(AC_CONFIG_LIBOBJ_DIR, AC_FUNC_GETLOADAVG, GETLOADAVG_FILES):
	Remove; gnulib does this now.
	* lib/getloadavg.c: Rename from src/getloadavg.c, and sync
	from gnulib.  This adds support for several other systems, such
	as Tru64 4.0D, QNX, AIX perfstat, etc.  It also fixes a potential
	buffer overrun on Linux hosts under very high load, and on hosts
	that maintain a channel to the load average file it makes sure
	the file descriptor is close-on-exec (on hosts that support this)
	and is not stdin, stdout, or stderr.
	* lib/stdlib.in.h, m4/getloadavg.m4, m4/stdlib_h.m4: New files,
	from gnulib.
	* aclocal.m4, configure, lib/Makefile.in, lib/gnulib.mk, m4/gl-comp.m4:
	* src/config.in: Regenerate.

Paul Eggert's avatar
Paul Eggert committed
580 581 582 583
2011-02-15  Paul Eggert  <eggert@cs.ucla.edu>

	Merge from gnulib.

584 585
	* install-sh: Update to scriptversion 2011-01-19.21.

Paul Eggert's avatar
Paul Eggert committed
586 587 588 589 590 591 592 593 594 595 596 597
	2011-02-13  Bruno Haible  <bruno@clisp.org>

	Consistent macro naming for macros that use GCC __attribute__.
	* lib/ignore-value.h (_GL_ATTRIBUTE_DEPRECATED): Renamed from
	ATTRIBUTE_DEPRECATED.

	2011-02-12  Bruno Haible  <bruno@clisp.org>

	setlocale: Prefer gnulib's override over libintl's override.
	* lib/gettext.h (setlocale): Redefine to rpl_setlocale if
	GNULIB_defined_setlocale is set.

598 599 600 601
2011-02-13  Glenn Morris  <rgm@gnu.org>

	* make-dist: Exclude generated file src/globals.h.

602 603 604 605 606 607 608
2011-02-10  Paul Eggert  <eggert@cs.ucla.edu>

	* arg-nonnull.h, c++defs.h, warn-on-use.h: Fix licenses.
	Sync from gnulib, which has been patched to fix the problem
	with the license notices.  Problem reported by Glenn Morris in
	<http://lists.gnu.org/archive/html/emacs-devel/2011-02/msg00403.html>.

609 610 611 612
2011-02-09  Stefan Monnier  <monnier@iro.umontreal.ca>

	* .bzrignore: Ignore globals.h and related stamp.

613 614 615 616 617 618 619 620 621
2011-02-09  Paul Eggert  <eggert@cs.ucla.edu>

	* lib/Makefile.in, lib/gnulib.mk: Regenerate.
	This merges the following fix from gnulib:

	2011-02-08  Bruno Haible  <bruno@clisp.org>

	Split large sed scripts, for HP-UX sed.

Tom Tromey's avatar
Tom Tromey committed
622 623 624 625 626
2011-02-08  Tom Tromey  <tromey@redhat.com>

	* configure: Rebuild.
	* configure.in (NS_OBJC_OBJ): New subst.

627 628
2011-02-06  Paul Eggert  <eggert@cs.ucla.edu>

629 630 631 632 633
	gnulib: allow multiple gnulib generated replacements to coexist
	This defines a few preprocessor symbols that should not affect Emacs.
	* lib/getopt.in.h, lib/time.in.h, lib/unistd.in.h: Regenerate
	via "make sync-from-gnulib".

Paul Eggert's avatar
Paul Eggert committed
634 635 636 637
	gnulib: undo previous change
	The upstream _HEADERS change was backed out of gnulib (see the
	same thread).  Stay in sync with gnulib.

638
	gnulib: adjust to upstream _HEADERS change
639 640 641 642 643 644 645
	* lib/Makefile.am (EXTRA_HEADERS, nodist_pkginclude_HEADERS):
	New empty macros, to accommodate recent changes to gnulib.  See
	<http://lists.gnu.org/archive/html/bug-gnulib/2011-02/msg00068.html>.
	* c++defs.h, lib/Makefile.in, lib/ftoastr.h, lib/getopt.in.h:
	* lib/gnulib.mk, lib/ignore-value.h, lib/stdbool.in.h, lib/stddef.in.h:
	* lib/time.in.h, lib/unistd.in.h:
	Regenerate.
646

647 648 649 650 651 652 653 654 655 656 657
2011-02-05  Paul Eggert  <eggert@cs.ucla.edu>

	sync from gnulib to remove HAVE_STDBOOL_H
	* m4/stdbool.m4 (AC_CHECK_HEADER_STDBOOL): Renamed from
	AC_HEADER_STDBOOL.  All uses changed.  Do not define
	HAVE_STDBOOL_H, as gnulib does not need this.  This change is
	imported from the latest Autoconf git.  It was motivated by Emacs,
	which uses gnulib but does not need HAVE_STDBOOL_H.
	* configure, src/config.in: Regenerate.
	* config.guess, config.sub: Sync to 2011-02-02 versions (whitespace)

658 659 660 661
2011-02-03  Paul Eggert  <eggert@cs.ucla.edu>

	allow C code to suppress warnings about ignored return values
	* Makefile.in (GNULIB_MODULES): Add ignore-value.
662 663
	* configure, lib/Makefile.in, lib/gnulib.mk, m4/gl-comp.m4: Regenerate.
	* lib/ignore-value.h: New file.
664

665
2011-01-31  Chong Yidong  <cyd@stupidchicken.com>
666 667 668 669

	* configure.in: Test existence of xaw3d library, not just the
	header (Bug#7642).

670 671 672 673 674 675 676 677 678
2011-01-31  Eli Zaretskii  <eliz@gnu.org>

	* lib/makefile.w32-in (GNULIBOBJS): Add $(BLD)/strftime.$(O) and
	$(BLD)/time_r.$(O).
	($(BLD)/dtoastr.$(O)): Depend on $(EMACS_ROOT)/src/s/ms-w32.h and
	$(EMACS_ROOT)/src/m/intel386.h.
	($(BLD)/strftime.$(O)):
	($(BLD)/time_r.$(O)): Define prerequisites.

679 680 681 682 683 684 685 686
2011-01-31  Paul Eggert  <eggert@cs.ucla.edu>

	src/emacs.c now gets version number from configure.in
	* configure.in (version): Set this from $PACKAGE_VERSION,
	which is set from AC_INIT, rather than scouting through src/emacs.c.
	* configure: Regenerate.
	* make-dist (version): Get it from configure.in, not src/emacs.c.

Paul Eggert's avatar
Paul Eggert committed
687 688 689 690 691 692
2011-01-30  Paul Eggert  <eggert@cs.ucla.edu>

	strftime: import from gnulib
	* Makefile.in (GNULIB_MODULES): Add strftime.
	* configure.in (AC_FUNC_STRFTIME, my_strftime): Remove; no longer
	needed.
693
	* aclocal.m4, configure, lib/Makefile.in, lib/gnulib.mk, m4/gl-comp.m4:
Paul Eggert's avatar
Paul Eggert committed
694
	Regenerate.
695 696
	* lib/strftime.c, lib/strftime.h, lib/stdbool.in.h: New files,
	imported from gnulib.
Paul Eggert's avatar
Paul Eggert committed
697 698 699 700 701 702
	* m4/strftime.m4, m4/stdbool.m4, m4/tm_gmtoff.m4: Likewise.
	This incorporates many changes from gnulib, including simpler
	handling of multibyte formats, porting to mingw32 and other
	platforms, and support for higher-resolution time stamps.
	Emacs does not yet use the higher-resolution interface.

703 704 705 706 707 708
2011-01-30  Paul Eggert  <eggert@cs.ucla.edu>

	gnulib: import mktime and move-if-change fixes from gnulib

	* configure: Regenerate from the following.

709 710 711 712 713 714 715 716
	2011-01-30  Paul Eggert  <eggert@cs.ucla.edu>

	mktime: clarify long_int width checking
	* lib/mktime.c (long_int_is_wide_enough): Move this assertion to
	the top level, to make it clearer that the assumption about
	long_int width is being checked.  See
	<http://lists.gnu.org/archive/html/bug-gnulib/2011-01/msg00554.html>.

717 718 719
	2011-01-29  Paul Eggert  <eggert@cs.ucla.edu>

	TYPE_MAXIMUM: avoid theoretically undefined behavior
720
	* lib/intprops.h (TYPE_MINIMUM, TYPE_MAXIMUM): Do not shift a
721 722 723 724
	negative number, which the C Standard says has undefined behavior.
	In practice this is not a problem, but might as well do it by the book.
	Reported by Rich Felker and Eric Blake; see
	<http://lists.gnu.org/archive/html/bug-gnulib/2011-01/msg00493.html>.
725 726 727 728 729 730 731 732 733 734 735 736 737 738 739 740 741 742 743 744 745 746 747 748 749 750 751 752 753 754 755 756 757 758 759 760 761 762 763 764 765 766 767
	* m4/mktime.m4 (AC_FUNC_MKTIME): Likewise.
	* lib/mktime.c (TYPE_MAXIMUM): Redo slightly to match the others.

	mktime: #undef mktime before #defining it
	* lib/mktime.c (mktime) [DEBUG]: #undef mktime before #defining it.

	mktime: systematically normalize tm_isdst comparisons
	* lib/mktime.c (isdst_differ): New function.
	(__mktime_internal): Use it systematically for all isdst comparisons.
	This completes the fix for libc BZ #6723, and removes the need for
	normalizing tm_isdst.  See
	<http://sourceware.org/bugzilla/show_bug.cgi?id=6723>
	(not_equal_tm) [DEBUG]: Use isdst_differ here, too.

	mktime: fix some integer overflow issues and sidestep the rest

	This was prompted by a bug report by Benjamin Lindner for MinGW
	<http://lists.gnu.org/archive/html/bug-gnulib/2011-01/msg00472.html>.
	His bug is due to signed integer overflow (0 - INT_MIN), and I
	I scanned through mktime.c looking for other integer overflow
	problems, fixing all the bugs I found.

	Although the C Standard says the resulting code is still not safe
	in the presence of integer overflow, in practice it should be good
	enough for all real-world two's-complement implementations, except
	for debugging environments that deliberately trap on integer
	overflow (e.g., gcc -ftrapv).

	* lib/mktime.c (WRAPV): New macro.
	(SHR): Also check that long_int and time_t shift right in the
	usual way, before using the fast-but-unportable method.
	(TYPE_ONES_COMPLEMENT, TYPE_SIGNED_MAGNITUDE): Remove, no longer
	used.  The code already assumed two's complement, so there's
	no need to test for alternatives.  All uses removed.
	(TYPE_MAXIMUM): Don't rely here on overflow behavior not defined by
	the C standard.  Problem reported by Rich Felker in
	<http://lists.gnu.org/archive/html/bug-gnulib/2011-01/msg00488.html>.
	(twos_complement_arithmetic): Also check long_int and time_t.
	(time_t_avg, time_t_add_ok, time_t_int_add_ok): New functions.
	(guess_time_tm, ranged_convert, __mktime_internal): Use them.
	(__mktime_internal): Avoid integer overflow with unary subtraction
	in two instances where -1 - X is an adequate replacement for -X,
	since the calculations are approximate.
768 769 770 771 772 773 774 775

	2011-01-29  Eric Blake  <eblake@redhat.com>

	mktime: avoid infinite loop
	* m4/mktime.m4 (AC_FUNC_MKTIME): Avoid overflow on possibly-signed
	type; behavior is still undefined but portable to all known targets.
	Reported by Rich Felker.

776 777 778 779 780 781 782 783 784 785 786 787 788 789 790
	2011-01-28  Paul Eggert  <eggert@cs.ucla.edu>

	mktime: avoid problems on NetBSD 5 / i386
	* lib/mktime.c (long_int): New type.  This works around a problem
	on NetBSD 5 / i386, where 'long int' and 'int' are both 32 bits
	but time_t is 64 bits, and where I expect the existing code is
	wrong in some cases.
	(leapyear, ydhms_diff, guess_time_tm, __mktime_internal): Use it.
	(ydhms_diff): Bring back the compile-time check for wide-enough
	year and yday.

	mktime: fix misspelling in comment
	* lib/mktime.c (__mktime_internal): Fix misspelling in comment.
	This merges all recent glibc changes of importance.

791 792 793 794 795 796 797 798 799 800 801
	2011-01-28  Ralf Wildenhues  <Ralf.Wildenhues@gmx.de>

	move-if-change: cope with concurrent mv of identical file.
	* move-if-change (CMPPROG): Accept environment
	variable as an override for `cmp'.
	(usage): Document CMPPROG.
	Adjust comparison to drop stdout.  Cope with failure of mv if
	the target file exists and is identical to the source, for
	parallel builds.
	Report from H.J. Lu against binutils in PR binutils/12283.

802 803 804 805 806
2011-01-29  Eli Zaretskii  <eliz@gnu.org>

	* lib/makefile.w32-in:
	* lib/getopt_.h: New files.

807 808 809 810 811 812 813 814 815
2011-01-28  Paul Eggert  <eggert@cs.ucla.edu>

	improve fix for MS-DOS file name clash
	* Makefile.in (DOS_gnulib_comp.m4): Renamed from DOS-gnulib-comp.m4,
	for portability to POSIX make.  Reported by Bruno Haible.
	(sync-from-gnulib): Copy gl-comp.m4 (if present) back to
	gnulib-comp.m4 before running gnulib-tool, to prevent old gnulib
	files from accumulating as garbage.  Also reported by Bruno Haible.

816 817 818 819 820 821 822 823 824 825
2011-01-27  Paul Eggert  <eggert@cs.ucla.edu>

	fix two m4/gnulib-*.m4 file names that clashed under MS-DOS
	* Makefile.in (DOS-gnulib-comp.m4): New macro.
	(sync-from-gnulib): Rename m4/gnulib-comp.m4 to m4/gl-comp.m4 to avoid
	problems with MS-DOS 8+3 file name restrictions.
	Remove m4/gnulib-cache.m4, as we can live without it.  If we kept
	it, it would also cause problems when extracting Emacs distribution
	tarballs on MS-DOS hosts.
	(ACLOCAL_INPUTS): Adjust to file renaming.
826
	* aclocal.m4, configure, lib/Makefile.in, src/config.in: Regenerate.
827 828 829 830
	* config.guess, config.sub: Sync from gnulib.
	* m4/gnulib-cache.m4: Remove from repository.
	* m4/gl-comp.m4: Rename from m4/gnulib-comp.m4.

831 832
2011-01-25  Glenn Morris  <rgm@gnu.org>

833 834
	* README: Add a note about ranges in copyright years.

835 836
	* configure.in: Set CANNOT_DUMP on ia64 hpux (port from emacs-23).

Glenn Morris's avatar
Glenn Morris committed
837
2011-01-25  Peter O'Gorman  <bug-gnu-emacs@mlists.thewrittenword.com>  (tiny change)
838 839 840

	* configure.in: Add HP-UX on IA64 (Bug#6811).

841 842 843 844 845
2011-01-24  Paul Eggert  <eggert@cs.ucla.edu>

	Remove HAVE_RAW_DECL_CHOWN etc. from config.h
	* Makefile.in (sync-from-gnulib): Remove m4/warn-on-use.m4,
	as it is no longer needed.
846
	* aclocal.m4, configure, lib/Makefile.in, src/config.in: Regenerate.
847 848 849 850 851 852 853 854 855
	* configure.in: Invoke the new gnulib macro
	gl_ASSERT_NO_GNULIB_POSIXCHECK, which removes the need for
	warn-on-use.m4 and for the HAVE_RAW_DECL_* symbols in config.h.
	* m4/getopt.m4: Sync from gnulib; this removes the need for
	HAVE_DECL_OPTRESET and HAVE_DECL_GETOPT_CLIP from config.h.
	* m4/gnulib-common.m4 (gl_ASSERT_NO_GNULIB_POSIXCHECK):
	New macro, synced from gnulib.
	* m4/warn-on-use.m4: Remove.

856 857 858 859 860 861 862 863 864 865 866
2011-01-22  Paul Eggert  <eggert@cs.ucla.edu>

	aclocal.m4: put this file back into repository
	This way, we don't have to assume that the maintainer has
	the automake package installed.  See
	<http://lists.gnu.org/archive/html/emacs-devel/2011-01/msg00746.html>.
	* .bzrignore: Remove aclocal.m4, undoing the previous change.
	* Makefile.in (top_maintainer_clean): Do not remove aclocal.m4,
	undoing the previous change.
	* aclocal.m4: New file (actually, resurrected).

867 868 869 870 871 872 873
2011-01-22  Miles Bader  <miles@gnu.org>

	* configure.in: Don't zero-out FONTCONFIG_CFLAGS and
	FONTCONFIG_LIBS when building with XFT (doing so is incorrect, as
	Emacs directly uses fontconfig, and breaks building when using a
	strict linker).

874 875
2011-01-21  Paul Eggert  <eggert@cs.ucla.edu>

Paul Eggert's avatar
Paul Eggert committed
876 877 878 879 880 881 882 883 884 885
	src/config.in: shrink slightly
	* configure.in: Invoke the new gnulib macro gl_ASSERT_NO_GNULIB_TESTS.
	This makes src/config.in a bit smaller, by removing identifiers
	like GNULIB_TEST_MKTIME that Emacs does not need.
	* m4/getopt.m4, m4/gnulib-common.m4, m4/include_next.m4:
	* m4/multiarch.m4, m4/stddef_h.m4, m4/time_h.m4, m4/unistd_h.m4:
	Sync from gnulib.  This removes a few more unnecessary symbols from
	src/config.in, such as AA_APPLE_UNIVERSAL_BUILD and HAVE_STDDEF_H.
	* configure, src/config.in: Regenerate.

886 887 888 889 890 891
	aclocal.m4: tweaks to regenerate more conveniently
	This attempts to act better when the source is in a weird state.  See
	<http://lists.gnu.org/archive/html/emacs-devel/2011-01/msg00734.html>.
	* Makefile.in (am--refresh): Add aclocal.m4, configure, config.in.
	* .bzrignore: Add aclocal.m4.

892 893 894 895 896 897 898 899 900
2011-01-20  Paul Eggert  <eggert@cs.ucla.edu>

	aclocal.m4: omit auto-generated file from repository
	* Makefile.in (top_maintainer_clean): Remove aclocal.m4; this undoes
	the most recent change here.
	* aclocal.m4: Remove from bzr repository.  This file is
	auto-generated and isn't needed to run 'configure'.  See
	<http://lists.gnu.org/archive/html/emacs-devel/2011-01/msg00698.html>.

901 902 903 904 905 906 907
2011-01-19  Paul Eggert  <eggert@cs.ucla.edu>

	Minor Makefile.in tweaks to build from gnulib better.
	<http://lists.gnu.org/archive/html/emacs-devel/2011-01/msg00673.html>
	* Makefile.in (sync-from-gnulib): Also run autoreconf -I m4.
	(top_maintainer_clean): Don't remove aclocal.m4.

908 909
2011-01-18  Paul Eggert  <eggert@cs.ucla.edu>

Paul Eggert's avatar
Paul Eggert committed
910 911 912 913 914
	Minor cleanups for 'bzr status'
	* .bzrignore: Add emacs-*/, the output of make-dist, and stamp-h1,
	the output of config.guess.
	* Makefile.in (top_distclean): Remove stamp-h1 too.

915 916 917 918 919
	* configure.in (HAVE_ATTRIBUTE_ALIGNED): Arrange for this to be
	defined if the compiler supports GCC-style __attribute__
	((__aligned__ ...)).  IBM AIX and Oracle Solaris Studio support
	this syntax.

Paul Eggert's avatar
Paul Eggert committed
920
2011-01-17  Paul Eggert  <eggert@cs.ucla.edu>
921

922 923 924 925 926 927 928 929
	Makefile.in: tidy up the building of lib
	* Makefile.in (am--refresh): Mark as .PHONY.
	(top_maintainer_clean): Don't remove lib/gnulib.mk m4/gnulib-cache.m4,
	as they're not rebuilt unless you do a "make sync-from-gnulib"
	and the former is needed for "configure".
	(maintainer-clean): Don't recurse into lib, as "make bootstrap-clean"
	has already removed lib/Makefile.

930 931 932
	* Makefile.in (GNULIB_MODULES): Change ftoastr to dtoastr.
	This avoids building ftoastr and ldtoastr, which aren't needed.  See
	<http://lists.gnu.org/archive/html/bug-gnulib/2011-01/msg00199.html>.
Paul Eggert's avatar
Paul Eggert committed
933

934 935 936 937 938 939
	* .bzrignore: Add .h files that are host-dependent.
	Add lib/.deps/, lib/arg-nonnull.h, lib/c++defs.h, lib/getopt.h,
	lib/time.h, lib/unistd.h, lib/warn-on-use.h.  These are
	host-dependent and are built as part of an ordinary 'make', and
	should not be checked in.

940 941 942
	* lib/Makefile.in: Regenerate.
	* lib/COPYING: New file, a copy of COPYING.

Paul Eggert's avatar
Paul Eggert committed
943
	* configure: Regenerate.
944 945
	* configure.in (AC_USE_SYSTEM_EXTENSIONS): Remove: gnulib does this.

Paul Eggert's avatar
Paul Eggert committed
946
	Regenerate.
947 948 949 950
	* lib/getopt.c, lib/getopt.in.h, lib/getopt1.c, lib/getopt_int.h:
	* lib/gettext.h, lib/unistd.in.h, m4/unistd_h.m4:
	New files, copied from gnulib by gnulib-tool.
	* aclocal.m4, configure, lib/Makefile.in, m4/getopt.m4:
Paul Eggert's avatar
Paul Eggert committed
951 952
	* m4/gnulib-cache.m4, m4/gnulib-comp.m4, src/config.in:
	Regenerate.
953

Paul Eggert's avatar
Paul Eggert committed
954 955 956 957 958 959 960
	Use gnulib's getopt-gnu module.
	* Makefile.in (GNULIB_MODULES): Add getopt-gnu.
	(AUTOCONF_INPUTS): Remove getopt.m4; aclocal.m4 is a good-enough
	representative of the dependencies.
	* configure.in: Do not configure getopt, as gnulib does that now.
	* make-dist: Do not worry about lib-src/getopt.h, as gnulib handles
	getopt now, in lib.
961

Paul Eggert's avatar
Paul Eggert committed
962
	Regenerate.
963 964
	* arg-nonnull.h, c++defs.h, lib/mktime-internal.h, lib/mktime.c:
	* lib/stddef.in.h, lib/time.h, lib/time.in.h, lib/time_r.c:
Paul Eggert's avatar
Paul Eggert committed
965 966 967 968 969 970
	* m4/extensions.m4, m4/include_next.m4, m4/mktime.m4:
	* m4/multiarch.m4, m4/stddef_h.m4, m4/time_h.m4, m4/time_r.m4:
	* m4/extensions.m4, m4/include_next.m4, m4/mktime.m4, m4/multiarch.m4:
	* m4/stddef_h.m4, m4/time_h.m4, m4/time_r.m4, m4/warn-on-use.m4:
	* m4/wchar_t.m4, warn-on-use.h:
	New files, copied from gnulib by gnulib-tool.
971
	* aclocal.m4, configure, lib/Makefile.in, lib/gnulib.mk:
Paul Eggert's avatar
Paul Eggert committed
972 973 974
	* m4/gnulib-cache.m4, m4/gnulib-comp.m4, src/config.in:
	Regenerate.

Paul Eggert's avatar
Paul Eggert committed
975 976 977 978 979 980 981 982 983 984 985
	Use gnulib's mktime module.
	* Makefile.in (GNULIB_MODULES): Add mktime.
	* configure.in: Remove code no longer needed, as gnulib now does it.
	(AC_CHECK_FUNCS): Remove mktime.
	(AC_FUNC_MKTIME, BROKEN_MKTIME): Remove.
	(__restrict): Remove, as this now gets in the way of the C99
	support for 'restrict' pulled in by the gnulib mktime module.
	Code should now use 'restrict' and not '__restrict".
	(mktime): Remove.
	* make-dist: Put gnulib-generated files arg-nonnull.h, c++defs.h,
	and warn-on-use.h into the distribution.
Paul Eggert's avatar
Paul Eggert committed
986 987

	Regenerate.
988 989
	* lib/dtoastr.c, lib/ftoastr.c, lib/ftoastr.h, lib/intprops.h:
	* lib/ldtoastr.c, m4/c-strtod.m4:
Paul Eggert's avatar
Paul Eggert committed
990
	New files, copied from gnulib by gnulib-tool.
991 992
	* lib/dummy.c: Remove.
	* aclocal.m4, configure, lib/Makefile.in, lib/gnulib.mk:
Paul Eggert's avatar
Paul Eggert committed
993 994
	* m4/gnulib-cache.m4, m4/gnulib-comp.m4, src/config.in:
	Regenerate.
995

Paul Eggert's avatar
Paul Eggert committed
996
	Use gnulib's ftoastr module.
Paul Eggert's avatar
Paul Eggert committed
997 998
	* Makefile.in (GNULIB_MODULES): Add ftoastr.  Remove dummy.

Paul Eggert's avatar
Paul Eggert committed
999
	Regenerate.
1000 1001
	* aclocal.m4, compile, depcomp, lib/Makefile.in, lib/dummy.c:
	* lib/gnulib.mk, m4/00gnulib.m4, m4/gnulib-cache.m4:
Paul Eggert's avatar
Paul Eggert committed
1002 1003 1004 1005 1006
	* m4/gnulib-common.m4, m4/gnulib-comp.m4, m4/gnulib-tool.m4, missing:
	New files, generated automatically, with 'make sync-from-gnulib'
	followed by 'make'.
	* configure, lisp/dired.el, src/config.in: Regenerate.

Paul Eggert's avatar
Paul Eggert committed
1007 1008 1009 1010 1011 1012 1013 1014 1015 1016 1017 1018 1019 1020 1021 1022 1023 1024 1025 1026 1027 1028 1029
	Automate syncing from gnulib.
	* INSTALL, README: Document new subdirectory 'lib'.
	* Makefile.in (SUBDIR): Add lib.
	(SUBDIR_MAKEFILES): Add lib/Makefile.
	(lib-src, src, TAGS, tags): Depend on lib.
	(gnulib_srcdir, GNULIB_MODULES, GNULIB_TOOL_FLAGS): New macros.
	($(gnulib_srcdir)): New rule.
	(sync-from-gnulib): New rule, which is .PHONY.
	(lib): New rule, which is like lib-src.
	(Makefile): Depend on lib/Makefile.in.
	(AUTOCONF_INPUTS): Depend on aclocal.m4.
	(ACLOCAL_INPUTS, AUTOMAKE_INPUTS): New macros.
	($(srcdir)/aclocal.m4, $(srcdir)/lib/Makefile.in): New rules.
	(am--refresh): New rule, to pacify Automake.
	(mostlyclean, clean, distclean, bootstrap-clean, maintainer-clean):
	Clean lib, too.
	(top_maintainer_clean): New macro, to remove gnulib-tool and Automake
	droppings.
	(maintainer-clean, extraclean): Use it.
	* configure.in: Initialize for automake and gnulib, by invoking
	AM_INIT_AUTOMAKE, AM_PROG_CC_C_O, gl_EARLY, and gl_INIT.  Output
	lib/Makefile, too.  Use automake to build gnulib, as gnulib works
	more conveniently with automake.
1030
	* lib/Makefile.am: New file.
Paul Eggert's avatar
Paul Eggert committed
1031 1032 1033
	* make-dist: Also put into the distribution aclocal.m4,
	compile, depcomp, missing, and the files under lib/.

1034 1035 1036 1037
2011-01-15  Glenn Morris  <rgm@gnu.org>

	* Makefile.in (epaths-force): No more arch-tag to edit.

1038 1039 1040 1041
2011-01-15  Chong Yidong  <cyd@stupidchicken.com>

	* configure.in: Bump min libxml2 version to 2.6.17 (Bug#7603).

1042 1043 1044 1045 1046 1047 1048 1049
2011-01-14  Paul Eggert  <eggert@cs.ucla.edu>

	* make-dist: Distribute test/ files too.
	Distribute every file under test/ that is under version control,
	using patterns like *.el to capture files that are added later.
	Without this change, "configure" would fail, because it would
	attempt to build from a Makefile.in that was not distributed.

1050 1051 1052 1053 1054 1055 1056 1057 1058
2011-01-13  Christian Ohler  <ohler@gnu.org>

	* Makefile.in (INFO_FILES): Add ERT.

	* Makefile.in (check): Run tests in test/automated.

	* Makefile.in:
	* configure.in: Add test/automated/Makefile.

1059 1060
2011-01-07  Paul Eggert  <eggert@cs.ucla.edu>

1061 1062 1063
	* install-sh, mkinstalldirs, move-if-change: Update from master
	source in gnulib.

1064 1065
	* config.guess, config.sub: Updated from master source.

1066 1067 1068 1069
2011-01-05  Andreas Schwab  <schwab@linux-m68k.org>

	* configure.in: Check for __builtin_unwind_init.

1070 1071 1072 1073 1074 1075 1076
2011-01-05  Glenn Morris  <rgm@gnu.org>

	* configure.in (HAVE_MAKEINFO): New output variable.
	(MAKEINFO): Reset to "makeinfo" if not found.
	* Makefile.in (install-arch-indep, info):
	Replace MAKEINFO = off with HAVE_MAKEINFO = no.

1077 1078 1079 1080
2010-12-29  Ulrich Mueller  <ulm@gentoo.org>

	* configure.in: Make gameuser configurable (Bug#7717).

1081 1082 1083 1084 1085
2010-12-15  Glenn Morris  <rgm@gnu.org>

	* Makefile.in (install-arch-dep, uninstall): Remove code relating to the
	long absent lib-src/fns-*.el.

Glenn Morris's avatar
Glenn Morris committed
1086 1087 1088 1089
2010-12-11  Glenn Morris  <rgm@gnu.org>

	* make-dist: Exclude etc/*.pyc.

1090 1091 1092 1093
2010-12-10  Andreas Schwab  <schwab@linux-m68k.org>

	* configure.in: Don't double machfile in final message.

1094 1095 1096 1097
2010-12-04  Chong Yidong  <cyd@stupidchicken.com>

	* configure.in: Fix last change.

1098 1099 1100 1101 1102 1103
2010-12-04  Andreas Schwab  <schwab@linux-m68k.org>

	* configure.in: Remove reference to removed machine description
	files and allow $machine and $machfile to be empty.  Substitute
	M_FILE/S_FILE instead of machfile/opsysfile.

1104 1105 1106 1107 1108 1109 1110 1111 1112 1113 1114 1115 1116 1117 1118 1119 1120 1121 1122 1123 1124 1125 1126 1127 1128 1129 1130 1131 1132 1133 1134 1135 1136 1137 1138 1139 1140 1141 1142 1143 1144 1145 1146 1147 1148 1149 1150 1151 1152 1153 1154 1155 1156 1157 1158 1159 1160 1161 1162 1163 1164 1165 1166 1167 1168 1169 1170 1171 1172 1173 1174 1175 1176 1177 1178 1179 1180 1181 1182 1183 1184 1185 1186 1187 1188 1189 1190 1191 1192 1193 1194 1195 1196 1197 1198 1199 1200 1201 1202 1203 1204 1205 1206 1207 1208 1209 1210 1211 1212 1213 1214 1215 1216 1217 1218 1219 1220 1221 1222 1223 1224 1225 1226 1227 1228 1229 1230 1231 1232 1233 1234 1235 1236 1237 1238 1239 1240 1241 1242 1243 1244 1245 1246 1247 1248 1249 1250 1251 1252 1253 1254 1255 1256 1257 1258 1259 1260 1261 1262 1263 1264 1265 1266 1267 1268 1269 1270 1271 1272 1273 1274 1275 1276 1277 1278 1279 1280 1281 1282 1283 1284 1285 1286 1287 1288 1289 1290 1291 1292 1293 1294 1295 1296 1297 1298 1299 1300 1301 1302 1303 1304 1305 1306 1307 1308 1309 1310 1311 1312 1313 1314 1315 1316 1317 1318 1319 1320 1321 1322 1323 1324 1325 1326 1327 1328 1329 1330 1331 1332 1333 1334 1335 1336 1337 1338 1339 1340 1341 1342 1343 1344 1345 1346 1347 1348 1349 1350 1351 1352 1353 1354 1355 1356 1357 1358 1359 1360 1361 1362 1363 1364 1365 1366 1367 1368 1369 1370 1371 1372 1373 1374 1375 1376 1377 1378 1379 1380 1381 1382 1383 1384 1385 1386 1387 1388 1389
2010-12-03  Glenn Morris  <rgm@gnu.org>

	* make-dist: Remove EMACS_UNIBYTE unsetting; it does nothing.

2010-11-23  Dan Nicolaescu  <dann@ics.uci.edu>

	* configure.in <AC_CHECK_HEADERS>: Remove sys/ioctl.h.
	(EXTERNALLY_VISIBLE): New definition.

2010-11-21  Dan Nicolaescu  <dann@ics.uci.edu>

	* configure.in (INLINE): Do not depend on OPTIMIZE, unused.

2010-11-15  Dan Nicolaescu  <dann@ics.uci.edu>

	* configure.in: Do not check for unconditionally included headers.

2010-11-09  Stefan Monnier  <monnier@iro.umontreal.ca>

	* .dir-locals.el (log-edit-mode): Set log-edit-rewrite-fixes.

2010-11-09  Michael Albinus  <michael.albinus@gmx.de>

	* configure.in: Don't write a warning for D-Bus anymore.

2010-11-06  Andreas Schwab  <schwab@linux-m68k.org>

	* configure.in: Fix indentation.

2010-10-31  Ken Brown  <kbrown@cornell.edu>

	* configure.in (checking whether localtime caches TZ): Use
	unsetenv instead of modifying environment directly.

2010-10-25  Andreas Schwab  <schwab@linux-m68k.org>

	* configure.in (checking for -znocombreloc): Use AC_LANG_PROGRAM
	to avoid warning.

2010-10-24  Lars Magne Ingebrigtsen  <larsi@gnus.org>

	* configure.in: Remove the BROKEN annotation from gnutls.

2010-10-22  Glenn Morris  <rgm@gnu.org>

	* make-dist: Avoid listing .el files twice.  Don't try to run
	autoconf if --no-update.

2010-10-20  Glenn Morris  <rgm@gnu.org>

	* make-dist: No longer create lisp/MANIFEST.

2010-10-14  Glenn Morris  <rgm@gnu.org>

	* BUGS, INSTALL.BZR, README: Updates.

2010-10-13  Glenn Morris  <rgm@gnu.org>

	* make-dist: Remove --compress.  Check for the appropriate
	gzip-like executable, and if not found, don't compress.
	Check version number in README, don't change it.
	Use find for nt/inc/*.h.

2010-10-12  Dan Nicolaescu  <dann@ics.uci.edu>

	* configure (ns_appdir, OLDXMENU, TOOLTIP_SUPPORT): Remove
	trailing / from directory names.

2010-10-12  Glenn Morris  <rgm@gnu.org>

	* make-dist: Update and simplify.

2010-10-12  Eli Zaretskii  <eliz@gnu.org>

	* make-dist: Don't distribute src/buildobj.h.  (Bug#7167)

2010-10-10  Dan Nicolaescu  <dann@ics.uci.edu>

	* configure.in (PROFILING_LDFLAGS): Do not define, remove all uses.

2010-10-09  Glenn Morris  <rgm@gnu.org>

	* make-dist: No more doc/emacs/*.texi.in.

	* configure.in (AC_OUTPUT): Remove doc/emacs/emacsver.texi.

2010-10-09  Glenn Morris  <rgm@gnu.org>

	* configure.in: Combine some conditionals.

	* configure.in (AC_OUTPUT): Add doc/emacs/emacsver.texi.
	* make-dist: Include doc/emacs/*.texi.in.

	* INSTALL, make-dist: Remove references to b2m.
	* Makefile.in (MAN_PAGES): Remove b2m.1.

2010-10-05  Glenn Morris  <rgm@gnu.org>

	* .dir-locals.el: The Emacs convention is sentence-end-double-space.

2010-10-03  Dan Nicolaescu  <dann@ics.uci.edu>

	* configure.in (NO_INLINE, noinline): Move here from src/xterm.c.

2010-10-01  Dan Nicolaescu  <dann@ics.uci.edu>

	* configure.in: Include stdlib.h and string.h unconditionally.

2010-09-29  Romain Francoise  <romain@orebokech.com>

	* configure.in: Don't enable ImageMagick unless HAVE_X11.

2010-09-28  Glenn Morris  <rgm@gnu.org>

	* configure.in (HAVE_GNUTLS): Add a description to make autoheader
	happy.

2010-09-27  Lars Magne Ingebrigtsen  <larsi@gnus.org>

	* configure.in: Enable imagemagick by default.

2010-09-26  Lars Magne Ingebrigtsen  <larsi@gnus.org>

	* configure.in (HAVE_GNUTLS): Don't break if we don't have the
	gnutls libraries.

2010-09-26  Teodor Zlatanov  <tzz@lifelogs.com>

	* configure.in: Set up GnuTLS.

2010-09-22  Chong Yidong  <cyd@stupidchicken.com>

	* configure.in: Announce whether libxml2 is linked to.

2010-09-20  Dan Nicolaescu  <dann@ics.uci.edu>

	* configure.in (LINKER): Rename to LD_FIRSTFLAG, do not include $(CC).

2010-09-18  Eli Zaretskii  <eliz@gnu.org>

	* config.bat: Detect that libxml2 is installed and if so, build
	with it.

2010-09-13  Lars Magne Ingebrigtsen  <larsi@gnus.org>

	* configure.in (HAVE_LIBXML2): Check that the libxml2 we found can
	be used.  This fixes a conf problem on Mac OS X.

2010-09-10  Lars Magne Ingebrigtsen  <larsi@gnus.org>

	* configure.in: Check for libxml2.

2010-09-09  Glenn Morris  <rgm@gnu.org>

	* make-dist: No more TODO files under lisp/.

2010-09-04  Eli Zaretskii  <eliz@gnu.org>

	* config.bat: Produce lisp/gnus/_dir-locals.el from
	lisp/gnus/.dir-locals.el.

2010-08-23  Andreas Schwab  <schwab@linux-m68k.org>

	* configure.in: Fix check for librsvg, imagemagick and
	MagickExportImagePixels.

2010-08-18  Joakim Verona  <joakim@verona.se>

	* Makefile.in, configure.in: Checks for ImageMagick.

2010-08-10  Dan Nicolaescu  <dann@ics.uci.edu>

	* configure.in (AC_PREREQ): Require autoconf 2.65.

2010-08-09  Dan Nicolaescu  <dann@ics.uci.edu>

	* configure.in (AC_PREREQ): Require autoconf 2.66 to stop version churn.

2010-08-09  Andreas Schwab  <schwab@linux-m68k.org>

	* configure.in: Add AC_C_BIGENDIAN.

2010-08-09  Dan Nicolaescu  <dann@ics.uci.edu>

	* configure.in (ORDINARY_LINK): Use on hpux* too.

2010-08-06  Jan Djärv  <jan.h.d@swipnet.se>

	* configure.in: Check for util.h.
	Use -Wimplicit-function-declaration if compiler supports it.

2010-08-05  Eli Zaretskii  <eliz@gnu.org>

	* configure.in (UNEXEC_OBJ): Rename unexec.o => unexcoff.o.

2010-08-04  Andreas Schwab  <schwab@linux-m68k.org>

	* configure.in: Restore accidentally removed use of
	GCC_TEST_OPTIONS/NON_GCC_TEST_OPTIONS.

2010-07-29  Chad Brown  <yandros@mit.edu>

	* configure.in: Check for dirent.h.

2010-07-29  Dan Nicolaescu  <dann@ics.uci.edu>

	* configure.in: Remove reference to usg5-4, unused.

2010-07-25  Andreas Schwab  <schwab@linux-m68k.org>

	* configure.in: Check for __executable_start.

2010-07-24  Ken Brown  <kbrown@cornell.edu>

	* configure.in (LINKER, LIB_GCC): Remove cygwin special cases (Bug#6715)

2010-07-24  Juanma Barranquero  <lekktu@gmail.com>

	* .bzrignore, .gitignore: Ignore README.W32 on the root directory.

2010-07-24  Ken Brown  <kbrown@cornell.edu>  (tiny change)

	* configure.in (START_FILES) [cygwin]: Set to pre-crt0.o (Bug#6715).

2010-07-12  Andreas Schwab  <schwab@linux-m68k.org>

	* configure.in (C_WARNINGS_SWITCH, PROFILING_CFLAGS)
	(PROFILING_LDFLAGS): Substitute, don't add them to CFLAGS/LDFLAGS.
	(C_OPTIMIZE_SWITCH): Remove.
	(TEMACS_LDFLAGS2): Add ${PROFILING_LDFLAGS}.

2010-07-11  Andreas Schwab  <schwab@linux-m68k.org>

	* configure.in: Don't check for index and rindex, check for strchr
	and strrchr.  Define strchr and strrchr as index and rindex,
	resp., in src/config.h if not available.

2010-07-08  Dan Nicolaescu  <dann@ics.uci.edu>

	* configure.in: Use -Wold-style-definition if available.
	This helps with the transition to standard C code, it can be
	removed when done.

	* configure.in (PRE_EDIT_LDFLAGS, POST_EDIT_LDFLAGS): Remove.

	* configure.in (UNEXEC_OBJ): Add comment about values for MSDOS
	and MSWindows.

2010-07-07  Andreas Schwab  <schwab@linux-m68k.org>

	* configure.in: Don't check for bcopy, bcmp, bzero.  Don't include
	<strings.h> and don't define bcopy, bzero, BCMP in config.h.

2010-07-07  Dan Nicolaescu  <dann@ics.uci.edu>

	* configure.in (getenv): Remove K&R declaration.

2010-07-02  Jan Djärv  <jan.h.d@swipnet.se>

	* configure.in: Remove define __P.

2010-07-02  Dan Nicolaescu  <dann@ics.uci.edu>

	* configure.in (--enable-use-lisp-union-type): New flag.

2010-06-30  Dan Nicolaescu  <dann@ics.uci.edu>

	Fix CFLAGS for non-GCC compilers.
	* configure.in (CFLAGS): Always use -g like it was done before the
	2010-03-30 change.
	(REAL_CFLAGS): Use CFLAGS for non-GCC to get optimization flags.
	(Bug#6538)

2010-06-30  Glenn Morris  <rgm@gnu.org>

	* configure.in (HAVE_SOUND, HAVE_X_I18N, HAVE_X11R6_XIM):
	Set with AC_DEFINE rather than AH_BOTTOM.

	* configure.in (C_OPTIMIZE_SWITCH, CANNOT_DUMP, SYSTEM_MALLOC):
	(USE_MMAP_FOR_BUFFERS, C_WARNING_SWITCH, CFLAGS, REAL_CFLAGS):
	Set with shell, not cpp.
	(LIBX): Remove, just use -lX11 in the one place this was used.
	(cannot_dump): Replace with CANNOT_DUMP.

2010-06-28  Jan Djärv  <jan.h.d@swipnet.se>

Juanma Barranquero's avatar
Juanma Barranquero committed
1390
	* configure.in: Add --with-x-toolkit=gtk3.  Remove HAVE_GTK_MULTIDISPLAY,
1391 1392 1393 1394 1395 1396 1397 1398 1399 1400 1401 1402 1403 1404 1405 1406 1407 1408 1409 1410 1411 1412 1413 1414 1415 1416 1417 1418 1419 1420 1421 1422 1423 1424 1425 1426 1427 1428 1429 1430 1431 1432 1433 1434 1435 1436 1437 1438 1439 1440 1441 1442 1443 1444 1445 1446 1447 1448 1449 1450 1451 1452 1453 1454 1455 1456 1457 1458 1459 1460 1461 1462 1463 1464 1465 1466 1467 1468 1469 1470 1471 1472 1473 1474 1475 1476 1477 1478 1479 1480 1481 1482 1483 1484 1485 1486 1487 1488 1489 1490 1491 1492 1493 1494 1495 1496 1497 1498 1499 1500 1501 1502 1503 1504 1505 1506 1507 1508 1509 1510 1511 1512 1513 1514 1515 1516 1517 1518 1519 1520 1521 1522 1523 1524 1525 1526 1527 1528 1529 1530 1531 1532 1533 1534 1535 1536 1537 1538 1539 1540 1541 1542 1543 1544 1545 1546 1547 1548 1549 1550 1551 1552 1553 1554 1555 1556 1557 1558 1559 1560 1561 1562 1563 1564 1565 1566 1567 1568 1569 1570 1571 1572 1573 1574 1575 1576 1577 1578 1579 1580 1581 1582 1583 1584 1585 1586 1587 1588 1589 1590 1591 1592 1593 1594 1595 1596 1597 1598 1599 1600 1601 1602 1603 1604 1605 1606 1607 1608 1609 1610