1
0
mirror of https://git.savannah.gnu.org/git/emacs.git synced 2024-11-23 07:19:15 +00:00
Commit Graph

1331 Commits

Author SHA1 Message Date
Glenn Morris
870d9cf691 * configure.in (FREETYPE_LIBS): Actually set it to something.
This was needed for linking a lucid toolkit build on a recent
Debian testing system.  Without this, it failed with:
ftfont.o: undefined reference to symbol 'FT_New_Face'
2011-03-05 17:42:13 -08:00
Paul Eggert
6c0dea8a89 Merge: Work around some portability problems with symlinks. 2011-03-01 21:25:09 -08:00
Paul Eggert
ba46f4d85a Merge from mainline. 2011-03-01 17:52:03 -08:00
Glenn Morris
2b0c733045 Merge from emacs-23; up to 2010-06-03T05:41:49Z!rgm@gnu.org. 2011-02-27 17:07:29 -08:00
Eli Zaretskii
03382788bd .bzrignore: Ignore new lib/*.in-h files. 2011-02-26 11:35:07 +02:00
Eli Zaretskii
945d8b4444 Fix the MS-DOS configury due to new gnulib modules.
config.bat: Rename stdint.in.h and sys_stat.in.h.  Call
 depfiles.bat even if lib/deps already exist.
 msdos/depfiles.bat: Create a dummy .Po file only if a file by the same
 name does not already exist in the deps/ subdirectory.
2011-02-26 11:27:05 +02:00
Paul Eggert
36f13e1667 Simplify symlink portability workaround. 2011-02-25 12:05:36 -08:00
Paul Eggert
d3af8a57b4 Elaborate my most-recent ChangeLog entry. 2011-02-25 02:03:28 -08:00
Paul Eggert
4394ee0474 Merge from mainline. 2011-02-24 23:36:37 -08:00
Paul Eggert
9411886d38 Regenerate. 2011-02-24 23:23:41 -08:00
Paul Eggert
a07b892ff1 Merge from mainline. 2011-02-24 22:42:06 -08:00
Glenn Morris
1e8dbdc6e8 Replace some obsolete autoconf syntax.
* configure.in: Replace obsolete AC_OUTPUT() with AC_CONFIG_FILES(),
AC_CONFIG_COMMANDS(), and AC_OUTPUT sans arguments.
2011-02-23 20:28:17 -08:00
Glenn Morris
6e81c8191f Fix typo "comand". 2011-02-22 23:15:55 -08:00
Glenn Morris
0105dc3e03 Fix spelling of "supersede". 2011-02-22 21:10:10 -08:00
Paul Eggert
ae0d725005 [ChangeLog]
Work around some portability problems with symlinks.
* Makefile.in (GNULIB_MODULES): Add lstat, readlink, symlink.
* configure.in (lstat, HAVE_LSTAT): Remove special hack.
* lib/lstat.c, lib/readlink.c, lib/stat.c, lib/symlink.c:
* m4/dos.m4, 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:
* lib/stdlib.in.h, m4/gl-comp.m4, m4/stdlib_h.m4: Regenerate.

2011-02-22  Paul Eggert  <eggert@cs.ucla.edu>
[src/ChangeLog]
Work around some portability problems with symlinks.
* fileio.c (Frename_file, Fmake_symbolic_link, Ffile_symlink_p):
Simplify the code by assuming that the readlink and symlink calls
exist, even if they always fail on this host.
(Ffile_readable_p): Likewise, for fifos.
* config.in: Regenerate.
2011-02-22 11:30:07 -08:00
Paul Eggert
f68c809d7e [ChangeLog]
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.
[lib-src/ChangeLog]
Assume S_ISLNK etc. work, since gnulib supports this.
* etags.c (S_ISREG): Remove.
[src/ChangeLog]
Assume S_ISLNK etc. work, since gnulib supports this.
* config.in: Regenerate.
* dired.c (lstat): Remove.
(file_name_completion): Assume S_ISDIR works.
(file_name_completion_stat): Assume S_ISLNK works.
Do not bother calling stat unless lstat says it's a symlink.
* fileio.c (S_ISLNK, S_ISFIFO, S_ISREG, lstat): Remove.
(Fcopy_file): Assume S_ISREG and S_ISLNK work.
(check_writable, Ffile_writable_p, Fset_file_times):
Assume S_ISDIR works.
(Ffile_readable_p): Use S_IFIFO, not S_ISFIFO, to guess whether
fifos exist.
(Ffile_regular_p, Finsert_file_contents): Assumes S_ISREG works.
* filelock.c (S_ISLNK): Remove.
* lread.c (openp): Assume S_ISDIR works.
* xrdb.c (S_ISDIR): Remove.
2011-02-21 17:55:20 -08:00
Paul Eggert
9441f0e4fc Merge from mainline. 2011-02-21 15:46:32 -08:00
Paul Eggert
ba01e9d785 [ChangeLog]
* lib/min-max.h: New file, for "min" and "max".
[lib-src/ChangeLog]
New file "lib/min-max.h".
* ebrowse.c (min, max): Define them by including <min-max.h>
instead of defining it ourselves.
* pop.c (min): Likewise.
2011-02-21 15:22:34 -08:00
Christoph Scholtes
9f8370e63f Add stdint.h for MS-Windows.
nt/inc/stdint.h: New file, to support compilation with tool chains
 that do not have stdint.h (e.g. MSVC).
 lib/makefile.w32-in: ($(BLD)/md5.$(O)): Added dependency on
 $(EMACS_ROOT)/nt/inc/stdint.h.
2011-02-21 22:16:43 +02:00
Eli Zaretskii
25c51af3a9 Adapt MS-Windows build to import of filemode.c from gnulib.
nt/inc/sys/stat.h (S_ISUID, S_ISGID, S_ISVTX, S_IRGRP, S_IROTH)
 (S_IWGRP, S_IWOTH, S_IXGRP, S_IXOTH, S_ISSOCK, S_ISLNK, S_ISCTG)
 (S_ISDOOR, S_ISMPB, S_ISMPC, S_ISNWK, S_ISPORT, S_ISWHT)
 (S_TYPEISMQ, S_TYPEISSEM, S_TYPEISSHM, S_TYPEISTMO): Define.
 (lstat): Define to stat.
 lib/makefile.w32-in ($(BLD)/filemode.$(O)): Move from
 src/makefile.w32-in and adapt.  Depend on stamp_BLD.
 (GNULIBOBJS): Add $(BLD)/filemode.$(O).
 src/makefile.w32-in ($(BLD)/filemode.$(O)): Move recipe to
 lib/makefilw.w32-in.
 ($(BLD)/dired.$(O)): Depend on $(EMACS_ROOT)/lib/filemode.h.
 (GLOBAL_SOURCES): Remove filemode.c.
 (OBJ1): Remove $(BLD)/filemode.$(O).
 lib-src/makefile.w32-in ($(BLD)/ctags.$(O), $(BLD)/emacsclient.$(O))
 ($(BLD)/etags.$(O), $(BLD)/movemail.$(O), $(BLD)/ntlib.$(O)):
 Depend on $(EMACS_ROOT)/nt/inc/sys/stat.h.
2011-02-21 22:00:19 +02:00
Paul Eggert
5c185672d6 Import filemode module from gnulib. 2011-02-21 09:56:37 -08:00
Eli Zaretskii
e1e6b4fb85 Followup for 2011-02-20T18:50:26Z!eliz@gnu.org.
lib/makefile.w32-in ($(BLD)/md5.$(O)): Don't depend on
 $(EMACS_ROOT)/nt/inc/sys/stat.h.
2011-02-20 23:09:45 +02:00
Paul Eggert
6cac9cb117 * configure.in (C_WARNINGS_SWITCH): Do not prepend -Wno-pointer-sign. 2011-02-20 11:46:08 -08:00
Paul Eggert
2763cfc268 Merge from mainline. 2011-02-20 11:31:01 -08:00
Christoph Scholtes
32159fc37e Fix the MS-Windows build due to import of md5 from gnulib.
src/makefile.w32-in: Remove md5.$(O).
 ($(BLD)/md5.$(O)): Remove prerequisites, moved to
 lib/makefile.w32-in.
 ($(BLD)/fns.$(O)): Depend on $(EMACS_ROOT)/lib/md5.h and on stamp_BLD.
 lib/makefile.w32-in ($(BLD)/md5.$(O)): New recipe, moved from
 src/makefile.w32-in.
2011-02-20 20:50:26 +02:00
Paul Eggert
5fa4ac767c 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.

2011-02-20  Paul Eggert  <eggert@cs.ucla.edu>
2011-02-20 02:51:50 -08:00
Paul Eggert
61353ac8cd Merge: Import crypto/md5 and stdint modules from gnulib. 2011-02-20 00:48:52 -08:00
Eli Zaretskii
219463da10 Fix generation of auto-dependency files in lib/.
.bzrignore: Add lib/deps/.
 config.bat: Generate *.Po files in lib/deps.
 msdos/sedlibmk.inp (CONFIG_CLEAN_VPATH_FILES): Fix editing of *-clean
 rules.
 msdos/depfiles.bat: New file.
2011-02-19 18:53:10 +02:00
Eli Zaretskii
152be435b9 Update .bzrignore for files produced by the MS-DOS build.
.bzrignore: Ignore cxxdefs.h and lib/*.in-h files.
2011-02-19 18:12:18 +02:00
Eli Zaretskii
9d9d12cdf3 Initial version of fix for the MS-DOS build, not yet tested.
config.bat: Configure in `lib'.
 msdos/sedlibmk.inp: New file.
 msdos/sedlibcf.inp: New file.
 msdos/sed1v2.inp (NS_OBJC_OBJ): Edit to empty.
 (@true): Edit to "@rem".
 (move-if-change): Edit to "update".
 (echo): Edit to "djecho".
 (cd $(lib) && ...): Edit to "$(MAKE) -C ...".
 msdos/mainmake.v2 (version): Remove, no longer needed (config.in
 defines VERSION).
 (all): Add lib.
 (lib): New target and recipe.
 (lib-src): Depend on lib.
 (src): Depend on lib and lib-src.
 (clean, mostlyclean, distclean, maintainer-clean, extraclean)
 (bootstrap-clean): Recurse into lib.
 msdos/sed2v2.inp: Remove workaround for the "#if ! HAVE_MKTIME ||
 BROKEN_MKTIME" stuff -- it's no longer in src/config.in.
 (HAVE_ATTRIBUTE_ALIGNED, HAVE_C99_STRTOLD, HAVE_DECL_GETENV)
 (HAVE__BOOL): Edit to 1.
 (VERSION, inline, restrict): Edit for DJGPP.
 src/s/msdos.h (strtold): Define to _strtold.
 admin/admin.el (set-version): Add msdos/sed2v2.inp.
2011-02-19 17:57:35 +02:00
Paul Eggert
5f90be1bb7 Import simpler crypto/md5 module from gnulib, plus stdint module.
* aclocal.m4, configure, lib/Makefile.in, lib/gnulib.mk, m4/gl-comp.m4:
* src/config.in: Regenerate.
* lib/md5.c, lib/md5.h: Regenerate with simpler version, which
assumes C99-style <stdint.h>, supplied by the stdint module.
* lib/stdint.in.h, m4/longlong.m4, m4/stdint.m4: New files,
generated from gnulib.
* src/deps.mk (fns.o): Do not depend on md5.h, fixing a typo in
the earlier patch.
2011-02-18 23:28:29 -08:00
Paul Eggert
942f733fd1 Import crypto/md5 module from gnulib.
* Makefile.in (MAKEFILE_MODULES): Add crypto/md5.
* admin/notes/copyright: Remove src/md5.c and src/md5.h as
special cases.
* src/Makefile.in (base_obj): Remove md5.o, since this file
is in lib now.
* src/deps.mk (md5.o): Remove.
* aclocal.m4, configure, lib/Makefile.in, lib/gnulib.mk, m4/gl-comp.m4:
Regenerate.
* lib/md5.c: Regenerate.  This renames the file from src/md5.c,
and adds some porting improvements from gnulib.
* lib/md5.h: Regenerate, likwise; rename from src/md5.h.
* m4/md5.m4: New file, from gnulib.

2011-02-18  Paul Eggert  <eggert@cs.ucla.edu>
2011-02-18 00:07:03 -08:00
Paul Eggert
37b3d30244 Merge from mainline. 2011-02-17 23:44:39 -08:00
Paul Eggert
7d315eb678 Import IRIX 6.5 getloadavg fixes from gnulib.
* configure, lib/getloadavg.c, m4/getloadavg.m4: Regenerate.
2011-02-17 23:41:43 -08:00
Paul Eggert
0ca2f89e09 Merge from mainline. 2011-02-15 17:35:20 -08:00
Paul Eggert
1f5d53eb53 Import getloadavg module from gnulib. 2011-02-15 16:33:44 -08:00
Paul Eggert
5740d4abab Merge from mainline. 2011-02-15 16:21:32 -08:00
Paul Eggert
7127b760ae * install-sh: Update to scriptversion 2011-01-19.21. 2011-02-15 16:19:57 -08:00
Paul Eggert
9502925a79 Merge from proposed getloadavg simplifications in gnulib.
* configure, lib/Makefile.in, src/config.in: Regenerate.
* lib/getloadavg.c, lib/stdlib.in.h, m4/getloadavg.m4: New
versions from gnulib.

2011-02-15  Paul Eggert  <eggert@cs.ucla.edu>
2011-02-14 22:40:12 -08:00
Paul Eggert
fae95934b8 Merge from mainline. 2011-02-14 21:41:07 -08:00
Paul Eggert
bb55f713d2 Merge from gnulib. 2011-02-14 20:53:29 -08:00
Glenn Morris
57e96f8e22 * make-dist: Exclude generated file src/globals.h. 2011-02-12 18:04:18 -08:00
Paul Eggert
be6d99804b Merge from mainline. 2011-02-09 23:04:56 -08:00
Paul Eggert
6ffb2c0ceb Undo my previous commit, as per Stefan. 2011-02-09 19:56:30 -08:00
Paul Eggert
102252aa03 New file lib/ChangeLog, with entries moved from ChangeLog 2011-02-09 19:32:03 -08:00
Paul Eggert
988c07dff2 * arg-nonnull.h, c++defs.h, warn-on-use.h: Fix licenses. 2011-02-09 19:16:11 -08:00
Stefan Monnier
ccded26c1e * lisp/progmodes/sh-script.el (sh-font-lock-open-heredoc): Fix case
of here-doc that immediately follows a comment.
* .bzrignore: Ignore globals.h and related stamp.
* test/indent/shell.sh:
* test/indent/shell.rc: New files.
2011-02-09 13:59:55 -05:00
Paul Eggert
caf825516a Sync texinfo.tex and sed-related fixes from gnulib. 2011-02-08 17:40:01 -08:00
Tom Tromey
00b3c7ac85 Make globals.h a generated header
* configure: Rebuild.
	* configure.in (NS_OBJC_OBJ): New subst.
lib-src
	* make-docfile.c: Unconditionally include stdlib.h.
	(generate_globals): New global.
	(xrealloc): New function.
	(main): Handle '-g'.  Call start_globals, write_globals.
	(scan_file): Conditionally call put_filename.
	(start_globals): New function.
	(struct global): New.
	(num_globals, globals): New globals.
	(add_global, compare_globals, write_globals): New functions.
	(scan_c_file): Update for "-g".
	(scan_lisp_file): Fail if "-g".
	(enum global_type): New.
src
	* Makefile.in (NS_OBJC_OBJ): New variable.
	(base_obj): Rename from 'obj'.
	(obj): New variable.
	(globals.h, gl-stamp, $(obj)): New targets.
	(GLOBAL_SOURCES): New variable.
	* globals.h: Remove.
	* nsselect.m (Vselection_alist): Define.  Reverts part of
	2011-01-19T22:11:33Z!jan.h.d@swipnet.se.
	* buffer.c: Don't use "no_cell" for name of kill-buffer-hook's
	variable.
	* xselect.c (Vselection_alist): Define.  Reverts part of 2011-01-19T23:32:42Z!eggert@cs.ucla.edu.
2011-02-08 14:42:56 -07:00
Paul Eggert
79ab4b7f0e Import getloadavg module from gnulib. 2011-02-07 23:05:03 -08:00
Paul Eggert
595785701d 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".
2011-02-06 17:01:26 -08:00
Paul Eggert
e765a38829 gnulib: undo previous change 2011-02-06 14:13:03 -08:00
Paul Eggert
91ccade49b gnulib: adjust to upstream _HEADERS change 2011-02-06 00:28:30 -08:00
Paul Eggert
d67985d3f9 sync from gnulib to remove HAVE_STDBOOL_H 2011-02-04 21:07:22 -08:00
Paul Eggert
5dc7a1d2c4 * lib/ignore-value.h: New file. 2011-02-03 13:38:34 -08:00
Paul Eggert
67342916c9 allow C code to suppress warnings about ignored return values 2011-02-03 11:29:35 -08:00
Chong Yidong
14beddf471 Merge changes from emacs-23 branch 2011-01-31 18:54:50 -05:00
Eli Zaretskii
70b0d280eb Fix the MS-Windows build broken by 2011-01-30T23:34:18Z!eggert@cs.ucla.edu and 2011-01-31T08:15:13Z!eggert@cs.ucla.edu.
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.
 src/makefile.w32-in (OBJ2): Remove strftime.$(O).
 ($(BLD)/strftime.$(O)): Remove prerequisites.
 lib-src/makefile.w32-in (VERSION): Don't define, defined on nt/config.nt.
 (ECLIENT_CFLAGS): Remove -DVERSION.
 ($(BLD)/emacsclient.$(O)): Don't depend on makefile.w32-in.
 nt/config.nt (VERSION): Uncomment definition.
 (restrict): Define.
 nt/inc/stdbool.h: New file.
 admin/admin.el (set-version): Remove lib-src/makefile.w32-in.  Add
 nt/config.nt.
2011-01-31 21:36:08 +02:00
Paul Eggert
16fab14354 src/emacs.c now gets version number from configure.in 2011-01-31 00:12:52 -08:00
Paul Eggert
16c3e636a6 strftime: import from gnulib 2011-01-30 15:34:18 -08:00
Paul Eggert
3de84ad9c4 gnulib: import mktime and move-if-change fixes from gnulib
* configure: Regenerate from the following.

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>.

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

TYPE_MAXIMUM: avoid theoretically undefined behavior
* lib/intprops.h (TYPE_MINIMUM, TYPE_MAXIMUM): Do not shift a
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>.
* 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.

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.

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.

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.
2011-01-30 11:22:02 -08:00
Eli Zaretskii
f915f0f7c8 Fix the MS-Windows build broken by 2011-01-17T19:01:01Z!eggert@cs.ucla.edu and emacs-23/2010-05-21T19:51:48Z!acm@muc.de.
lib/makefile.w32-in:
 lib/getopt_.h: New files.
 src/s/ms-w32.h (HAVE_MKTIME): Remove.
 src/makefile.w32-in (LOCAL_FLAGS): Add -I../lib.
 (GNULIB): New variable.
 (LIBS): Add $(GNULIB).
 $(TEMACS): Depend on $(GNULIB).
 <top-level>: Fix font-lock disrupted by a lone `"'.
 src/makefile.w32-in (LOCAL_FLAGS): Add -I../lib.
 (GETOPTOBJS, GETOPTDEPS): Remove targets.
 (MOVEMAILOBJS): Replace $(GETOPTOBJS) with ../lib/$(BLD)/libgnu.$(A).
 ($(BLD)/movemail.exe): Depend on ../lib/getopt.h.
 (ECLIENTOBJS, ETAGSOBJ, CTAGSOBJ, EBROWSEOBJ): Replace getopt.o
 and getopt1.o with ../lib/$(BLD)/libgnu.$(A).
 (clean): Don't remove getopt.h.
 (getopt.h, $(BLD)/getopt.$(O), $(BLD)/getopt1.$(O)): Remove targets.
 ($(BLD)/ctags.$(O), $(BLD)/etags.$(O)): Replace getopt.h with
 $(EMACS_ROOT)/lib/getopt.h.
 nt/makefile.w32-in (all-other-dirs-nmake, all-other-dirs-gmake)
 (bootstrap-nmake, bootstrap-gmake, bootstrap-clean-nmake)
 (bootstrap-clean-gmake, clean-other-dirs-nmake)
 (clean-other-dirs-gmake, cleanall-other-dirs-nmake)
 (cleanall-other-dirs-gmake, distclean-other-dirs-nmake)
 (distclean-other-dirs-gmake, maintainer-clean-other-dirs-nmake)
 (maintainer-clean-other-dirs-gmake): Recurse into ../lib as well.
 nt/configure.bat: Create lib/makefile.
 nt/config.nt (HAVE_MKTIME, BROKEN_MKTIME): Remove.
 (HAVE_ATTRIBUTE_ALIGNED, HAVE_C99_STRTOLD, HAVE_DECL_GETENV)
 (HAVE_DECL_LOCALTIME_R, HAVE_WCHAR_T, PACKAGE, VERSION, inline)
 (_GL_UNUSED, _UNUSED_PARAMETER_): Add definitions, for gnulib.
2011-01-29 14:36:11 +02:00
Paul Eggert
c7e95b9146 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.
2011-01-27 16:25:24 -08:00
Chong Yidong
37f7b7843a * configure.in: Test existence of xaw3d library, not just the header (Bug#7642).
* configure: Regenerate.
2011-01-27 15:49:48 -05:00
Paul Eggert
125c3718c2 fix two m4/gnulib-*.m4 file names that clashed under MS-DOS 2011-01-26 23:24:57 -08:00
Glenn Morris
95df8112a0 Refill some long/short copyright headers. 2011-01-26 00:36:39 -08:00
Glenn Morris
73b0cd5003 Convert consecutive FSF copyright years to ranges. 2011-01-24 20:08:28 -08:00
Glenn Morris
0b5c5d8291 * README: Add a note about ranges in copyright years.
(See current maintain.info.)
2011-01-24 20:03:31 -08:00
Glenn Morris
4004ef4661 * configure.in: Set CANNOT_DUMP on ia64 hpux (port from emacs-23). 2011-01-24 19:55:12 -08:00
Glenn Morris
06d8ace515 Merge from emacs-23.
Note setting of CANNOT_DUMP on ia64 hpux is still to be merged manually.
2011-01-24 19:47:47 -08:00
Paul Eggert
d6974efa70 Remove HAVE_RAW_DECL_CHOWN etc. from config.h 2011-01-23 20:53:39 -08:00
Peter O'Gorman
6de1218f3c Two more hunks from the HP-UX patch at Bug#6811.
* configure.in: Add HP-UX on IA64 (Bug#6811).
* src/s/hpux11.h: Set CANNOT_DUMP on IA64 (Bug#6811).
2011-01-23 17:00:22 -05:00
Paul Eggert
e02ea74b7e 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).
2011-01-21 23:18:23 -08:00
Miles Bader
48dcd48260 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).
2011-01-22 11:45:57 +09:00
Paul Eggert
b06b1098fc 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.
2011-01-21 16:12:10 -08:00
Paul Eggert
925e561d32 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.
2011-01-21 12:23:24 -08:00
Paul Eggert
942be821a9 aclocal.m4: omit auto-generated file from repository 2011-01-19 21:00:40 -08:00
Paul Eggert
0813c96eb2 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.
2011-01-19 15:56:53 -08:00
Paul Eggert
53911e8f4e 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.
2011-01-17 21:23:52 -08:00
Paul Eggert
7cae64b4ee Improve performance on non-GCC hosts with __aligned__. 2011-01-17 20:54:23 -08:00
Paul Eggert
3cbecb8f28 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.
2011-01-17 11:20:37 -08:00
Paul Eggert
a3e44e7937 Merge from mainline. 2011-01-17 11:01:01 -08:00
Glenn Morris
dc3e3e7b22 * Makefile.in (epaths-force): No more arch-tag to edit. 2011-01-15 15:23:57 -08:00
Chong Yidong
dab7376027 * configure: Bump min libxml2 version to 2.6.17 (Bug#7603). 2011-01-14 22:21:48 -05:00
Paul Eggert
c35917bae4 Merge from mainline. 2011-01-14 13:12:57 -08:00
Paul Eggert
9f4b8b4732 * 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.
2011-01-14 10:56:58 -08:00
Paul Eggert
193770eec9 Merge from mainline. 2011-01-13 09:17:33 -08:00
Christian Ohler
d221e7808c Add ERT, a tool for automated testing in Emacs Lisp.
* Makefile.in, configure.in, doc/misc/Makefile.in, doc/misc/makefile.w32-in:
Add ERT.  Make "make check" run tests in test/automated.

* doc/misc/ert.texi, lisp/emacs-lisp/ert.el, lisp/emacs-lisp/ert-x.el:
New files.

* test/automated: New directory.
2011-01-13 03:08:24 +11:00
Paul Eggert
ecbfcc83bf * 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>.
2011-01-11 22:10:37 -08:00
Chong Yidong
70ba1ec80c Distinguish between terminfo and termcap on NetBSD (Bug#7642).
* configure.in [netbsd systems]: Check for tputs definition.

* src/config.in (TERMINFO): New definition.

* src/s/netbsd.h: Use it to choose between terminfo and termcap.
2011-01-11 21:29:23 -05:00
Paul Eggert
803059b950 * .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.
2011-01-09 00:30:09 -08:00
Paul Eggert
2582eaa4cc * lib/Makefile.in: Regenerate. 2011-01-08 23:46:17 -08:00
Paul Eggert
9bfeed9359 * lib/COPYING: New file, a copy of COPYING. 2011-01-08 23:43:55 -08:00
Paul Eggert
2a78afcc89 * configure: Regenerate. 2011-01-08 23:40:50 -08:00
Paul Eggert
375645439e * configure.in (AC_USE_SYSTEM_EXTENSIONS): Remove: gnulib does this. 2011-01-08 23:40:01 -08:00
Paul Eggert
e275c824b0 Regenerate. 2011-01-08 23:33:50 -08:00
Paul Eggert
84bbb1add5 Use gnulib's getopt-gnu module. 2011-01-08 23:29:26 -08:00
Paul Eggert
1fd182f018 Regenerate. 2011-01-08 22:57:07 -08:00
Paul Eggert
1e11dbe3d8 Use gnulib's mktime module. 2011-01-08 20:31:19 -08:00
Paul Eggert
fa2c4f5619 Use gnulib's ftoastr module. 2011-01-08 17:18:39 -08:00
Paul Eggert
743c80a725 Regenerate.
* aclocal.m4, compile, depcomp, lib/Makefile.in, lib/dummy.c:
* lib/gnulib.mk, m4/00gnulib.m4, m4/gnulib-cache.m4:
* 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.
2011-01-08 13:19:44 -08:00
Paul Eggert
9a514d4a6c Automate syncing from gnulib. 2011-01-08 13:02:38 -08:00
Paul Eggert
2b3f5bc80a * install-sh, mkinstalldirs, move-if-change: Update from master 2011-01-07 12:42:11 -08:00
Paul Eggert
bc5585d187 * config.guess, config.sub: Updated from master source. 2011-01-07 11:39:48 -08:00
Andreas Schwab
2018939f5d Use __builtin_unwind_init if available
* configure.in: Check for __builtin_unwind_init.

* src/alloc.c (mark_stack): Use __builtin_unwind_init if available.
2011-01-05 14:09:07 +01:00
Glenn Morris
e536513812 Don't use $MAKEINFO for both a flag and a program.
* 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.
2011-01-04 23:10:47 -08:00
Glenn Morris
5df4f04cd3 Add 2011 to FSF/AIST copyright years. 2011-01-02 15:50:46 -08:00
Ulrich Mueller
4fc5868a33 * configure.in: Make gameuser configurable (Bug#7717).
* configure: Regenerate
2010-12-29 19:11:25 +08:00
Glenn Morris
68251e1661 Remove code and comments related to lib-src/fns-*.el; long removed.
* Makefile.in (install-arch-dep, uninstall): Remove code relating to the
long absent lib-src/fns-*.el.

* lisp/loadup.el (symbol-file-load-history-loaded): Remove; unused.
Remove related, old, commented-out code.

* lisp/subr.el (symbol-file-load-history-loaded)
  (load-symbol-file-load-history): Remove old, commented-out code.
2010-12-15 00:16:53 -08:00
Glenn Morris
7470c6f07f [Backport from trunk]: * make-dist: Exclude etc/*.pyc. 2010-12-10 18:32:10 -08:00
Glenn Morris
838db88908 * make-dist: Exclude etc/*.pyc. 2010-12-10 18:30:29 -08:00
Andreas Schwab
fe646d2c4e * configure.in: Don't double machfile in final message. 2010-12-10 18:29:54 +01:00
Chong Yidong
d96c83fa56 * configure.in: Fix last change. 2010-12-04 17:32:32 -05:00
Andreas Schwab
d6a003a8b5 Remove empty machine description files
* 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.

* msdos/sed1v2.inp (M_FILE, S_FILE): Add $(srcdir)/ prefix.

* Makefile.in (M_FILE): Substitute @M_FILE@ instead of @machfile@.
(S_FILE): Substitute @S_FILE@ instead of @opsysfile@.
* src/m/arm.h, src/m/sh3.h, src/m/xtensa.h: Remove files.
2010-12-04 20:50:39 +01:00
Katsumi Yamaoka
067d23c97a Restore files that I seem to have mistakenly deleted. 2010-12-03 14:45:09 +00:00
Julien Danjou
19b9c467ea gnus-demon.el (gnus-demon-init): Fix time computing when time is nil. 2010-12-03 11:52:43 +00:00
Glenn Morris
adbf62ffab EMACS_UNIBYTE trivia.
* make-dist: Remove EMACS_UNIBYTE unsetting; it does nothing.
2010-12-02 18:54:34 -08:00
Dan Nicolaescu
42c8bc9b87 Mark debugger related variables and functions as EXTERNALLY_VISIBLE
so that they do not get optimized away.

* configure.in (EXTERNALLY_VISIBLE): New definition.

* src/emacs.c (gdb_use_union, gdb_valbits,gdb_gctypebits)
(gdb_data_seg_bits, gdb_array_mark_flag, PVEC_FLAG)
(gdb_pvec_type):
* src/print.c (print_output_debug_flag):
* src/lisp.h (debug_print): Mark as EXTERNALLY_VISIBLE.
(safe_debug_print): New declaration.
2010-11-23 10:47:23 -08:00
Dan Nicolaescu
2e8a479790 Include <sys/ioctl.h> unconditionally.
* configure.in <AC_CHECK_HEADERS>: Remove sys/ioctl.h.
* src/xterm.c:
* src/systty.h:
* src/sound.c: Include <sys/ioctl.h> unconditionally.
2010-11-23 10:09:55 -08:00
Dan Nicolaescu
33726611e7 * configure.in (INLINE): Do not depend on OPTIMIZE, unused. 2010-11-20 21:17:19 -08:00
Stefan Monnier
25f38310f9 Remove "tiny change"s for Eric Hanchrow 2010-11-17 10:07:48 -05:00
Dan Nicolaescu
aa42211e74 * configure.in: Do not check for unconditionally included headers. 2010-11-14 22:39:02 -08:00
Dan Nicolaescu
4d613e98a7 Backport fix for Bug#6170 from trunk.
Fix alloca definition when using gcc on non-gnu systems.
* configure.in: Use the code sequence indicated by "info autoconf"
for alloca (bug#6170).
2010-11-13 12:22:52 -05:00
Stefan Monnier
d607b96bc2 Merge from emacs-23 2010-11-09 15:07:10 -05:00
Stefan Monnier
dfb70734ef * .dir-locals.el (log-edit-mode): Set log-edit-rewrite-fixes. 2010-11-08 16:07:41 -05:00
Andreas Schwab
4abfb7532c configure.in: Fix indentation 2010-11-06 11:31:56 +01:00
Michael Albinus
f34477d7f0 * configure.in: Don't write a warning for D-Bus anymore. 2010-11-04 17:00:35 +01:00
Glenn Morris
754996bcf8 Fix for Bug#5655, backported from trunk.
* configure.in (CRT_DIR): New output variable.
(--with-crt-dir): New option.  (Bug#5655)
(HAVE_LIB64_DIR): Remove.

* src/Makefile.in (CRT_DIR): New variable, set by configure.
* src/m/amdx86-64.h, m/ibms390x.h (START_FILES, LIB_STANDARD):
Use $CRT_DIR rather than HAVE_LIB64_DIR.  (Bug#5655)
2010-11-03 14:55:19 -04:00
Ken Brown
983ae18569 * configure.in (checking whether localtime caches TZ): Use
unsetenv instead of modifying environment directly.
2010-10-31 19:21:53 -04:00
Andreas Schwab
d47f34de4b * configure.in (checking for -znocombreloc): Use AC_LANG_PROGRAM
to avoid warning.
2010-10-25 19:23:45 +02:00
Lars Magne Ingebrigtsen
d52bb9b4f6 * configure.in: Remove the BROKEN annotation from gnutls. 2010-10-24 22:46:17 +02:00
Glenn Morris
f3dd02ea54 * make-dist: Avoid listing .el files twice.
Don't try to run autoconf if --no-update.
2010-10-21 20:26:34 -07:00
Glenn Morris
daabcfb9c6 * make-dist: No longer create lisp/MANIFEST.
No-one can remember what this file was for.
http://lists.gnu.org/archive/html/emacs-devel/2010-10/msg00512.html
2010-10-19 20:55:30 -07:00
Juanma Barranquero
220d91b834 Merge changes from emacs-23 branch. 2010-10-14 16:32:27 +02:00
Glenn Morris
b9f56298c1 More make-dist simplification.
* 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 20:08:45 -07:00
Dan Nicolaescu
fe239e8e52 Remove trailing / from directory names.
* configure (ns_appdir, OLDXMENU, TOOLTIP_SUPPORT): Remove
trailing / from directory names.
2010-10-12 14:03:09 -07:00
Glenn Morris
baf81c5524 * make-dist: Update and simplify.
Eg: there are no symlinks in the tree for a long time
Check for version in emacsver.texi.
Clean up *~ etc files using a find at the end.
Add etc/srecode.
2010-10-11 21:32:20 -07:00
Glenn Morris
1c8ca3e6d6 * README: Updates. 2010-10-11 20:47:36 -07:00
Glenn Morris
6c3ab469a4 * BUGS, INSTALL.BZR: Updates. 2010-10-11 20:45:41 -07:00
Juanma Barranquero
4c14013dbe Merge changes from emacs-23 branch. 2010-10-12 01:57:49 +02:00
Dan Nicolaescu
a4daeecfef Pass CFLAGS to the linker.
* configure.in (PROFILING_LDFLAGS): Do not define, remove all uses.

* lib-src/Makefile.in (PROFILING_LDFLAGS): Remove, not needed.

* msdos/sed1v2.inp (PROFILING_LDFLAGS):
* msdos/sed3v2.inp (PROFILING_LDFLAGS): Remove, not defined anymore.

* src/Makefile.in (temacs): Use $(ALL_CFLAGS) on the link line.
(PROFILING_LDFLAGS): Remove, not needed anymore.
2010-10-10 08:35:04 -07:00
Glenn Morris
485bbe962a * make-dist: No more doc/emacs/*.texi.in. 2010-10-09 11:46:57 -07:00
Glenn Morris
f4f358f172 * configure.in (AC_OUTPUT): Remove doc/emacs/emacsver.texi.
* configure: Regenerate.

* .bzrignore: Remove doc/emacs/emacsver.texi.

* doc/emacs/Makefile.in (distclean): Do not delete emacsver.texi.
* doc/emacs/emacsver.texi: New file, replacing emacsver.texi.in.

* admin/admin.el (set-version): Add doc/emacs/emacsver.texi.
2010-10-09 10:59:55 -07:00
Glenn Morris
870b199e02 * configure.in: Combine some conditionals. 2010-10-08 19:16:38 -07:00
Glenn Morris
f7a31f1108 Set the version number in the texinfo manuals using configure.
* doc/misc/Makefile.in (emacsdir): New variable.
($(infodir)/efaq): Pass -I $(emacsdir) to makeinfo.
* doc/misc/faq.texi (VER): Replace with EMACSVER from emacsver.texi.

* doc/lispref/Makefile.in (emacsdir): New variable.
(MAKEINFO): Add -I $emacsdir.
(dist): Copy emacsver.texi.
* doc/lispref/book-spine.texinfo, doc/lispref/elisp.texi:
* doc/lispref/vol2.texi, doc/lispref/vol1.texi:
Set EMACSVER by including emacsver.texi.

* doc/emacs/emacsver.texi.in: New file.
* doc/emacs/emacs.texi: Set EMACSVER by including emacsver.texi.
* doc/emacs/Makefile.in (distclean): Delete emacsver.texi.
(dist): Copy emacsver.texi.

* admin/admin.el (set-version): No need to act on doc/ files any more.

* configure.in (AC_OUTPUT): Add doc/emacs/emacsver.texi.
* make-dist: Include doc/emacs/*.texi.in.
2010-10-08 18:41:21 -07:00
Glenn Morris
3fb78d1f33 Remove lib-src/b2m.c and b2m.pl.
Emacs does not use Babyl files since 23.1, and you can use M-x unrmail.

* msdos/mainmake.v2 (install): Remove b2m.

* lisp/emacs-lisp/authors.el (authors-valid-file-names): Add b2m.c.

* lib-src/b2m.c, lib-src/b2m.pl: Remove files.
* lib-src/Makefile.in (INSTALLABLES): Remove b2m.
* lib-src/makefile.w32-in ($(BLD)/b2m.$(O)): Remove.

* doc/emacs/ack.texi (Acknowledgments): No more b2m.c.

* admin/quick-install-emacs (PUBLIC_LIBSRC_BINARIES): Remove b2m.

* INSTALL, make-dist: Remove references to b2m.
* Makefile.in (MAN_PAGES): Remove b2m.1.
2010-10-08 18:15:15 -07:00
Eli Zaretskii
47a814f530 Mention the bug number for the last change in make-dist. 2010-10-08 11:52:34 +02:00
Eli Zaretskii
66cdbd3a0e make-dist: Don't distribute src/buildobj.h. 2010-10-08 11:36:38 +02:00
Glenn Morris
888328d21b * .dir-locals.el: The Emacs convention is sentence-end-double-space.
Remove arch-tag comment.
2010-10-04 19:40:34 -07:00
Dan Nicolaescu
4777478a50 * configure.in (NO_INLINE, noinline): Move here from src/xterm.c.
* src/xterm.c (NO_INLINE, noinline): Move definitions to ../configure.in.
2010-10-03 08:39:21 -07:00