1
0
mirror of https://git.savannah.gnu.org/git/emacs.git synced 2024-11-29 07:58:28 +00:00
Commit Graph

16 Commits

Author SHA1 Message Date
Paul Eggert
24e0f6b1dc Merge from gnulib, using build-aux to remove clutter.
* m4/largefile.m4: New file, so that Emacs does not mess up when
accessing files with large inode numbers in MacOS X 10.5 and later.
* m4/nocrash.m4: New file, to avoid triggering background debugger
and/or create core dumps during 'configure'.
* build-aux/move-if-change: Renamed from move-if-change.
* build-aux/snippet/arg-nonnull.h: Renamed from arg-nonnull.h.
* build-aux/snippet/c++defs.h: Renamed from c++defs.h.
* build-aux/snippet/warn-on-use.h: Renamed from warn-on-use.h.
* build-aux/snippet/_Noreturn.h: New file, for draft C1X _Noreturn.
* .bzrignore: The autogenerated files compile, config.guess,
config.sub, depcomp, install-sh, and missing are now in build-aux.
* Makefile.in (epaths-force, sync-from-gnulib):
move-if-change is now in build-aux.
(GNULIB_TOOL_FLAGS): Avoid threadlib; this is now a prerequisite
of gnulib's pthread_sigmask module, but Emacs doesn't need it.
(mkdir): install-sh is now in build-aux.
* config.bat: c++defs.h is now in build-aux/snippets.
* configure.in: Specify AC_CONFIG_AUX_DIR with build-aux (the
usual parameter).
* lib/gnulib.mk, m4/gl-comp.m4: Regenerate.
* lib/makefile.w32-in (ARG_NONNULL_H): arg-nonnull.h moved
to build-aux/snippet.
* lib/pthread_sigmask.c, lib/stdlib.in.h, m4/extensions.m4:
* m4/getopt.m4, m4/gnulib-common.m4, m4/pthread_sigmask.m4:
Merge from gnuilib.  This fixes porting bugs on Cygwin, Irix, and
Solaris, enables MacOS extensions, and enables nocrash during
'configure'.
* make-dist: Adjust to new build-aux and build-aux/snippit dirs.
* admin/notes/copyright: The files compile, config.guess, config.sub,
depcomp, install-sh, missing, and move-if-change are now in the
new build-aux subdirectory.  The files arg-nonnull.h, c++defs.h,
and warn-on-use.h are now in build-aux/snippets.  New file
build-aux/snippets/_Noreturn.h.
* leim/Makefile.in (install): install-sh is now in build-aux.
* lib-src/Makefile.in ($(DESTDIR)${archlibdir}): install-sh moved
to build-aux.
* msdos/sedlibmk.inp (CONFIG_CLEAN_VPATH_FILES): Adjust to snippet moves
from top level to build-aux/snippet.
* src/Makefile.in (gl-stamp): move-if-change is now in build-aux.
2011-07-24 15:15:47 -07:00
Eli Zaretskii
2c631e0e82 Fix the MS-DOS build broken by STRING_BYTES_MAX.
msdos/sedlibmk.inp (PTRDIFF_T_SUFFIX): Edit to nothing.
2011-06-07 16:57:44 +03:00
Eli Zaretskii
d451b08791 Adapt the MSDOS build to introduction of sha1 and other latest changes.
msdos/sed1v2.inp: Edit "make-docfile -d FOO" commands to chdir back to
 src/.  Make editing of RUN_TEMACS commands less sensitive to
 leading whitespace.
 msdos/sedlibmk.inp (gl_LIBOBJS): Add sha1.o.
2011-05-28 13:00:09 +03:00
Eli Zaretskii
7285dc67f4 Fix the MSDOS build as follows from 2011-05-19T06:04:16Z!rgm@gnu.org, 2011-05-20T00:41:03Z!rgm@gnu.org.
config.bat: Concatenate lisp.mk onto the end of src/Makefile.
 msdos/sed1v2.inp (make-docfile commands): Recognize only if the line
 begins with a TAB.  Use $(etc) rather than a literal "../etc".
 (`sed SED-COMMAND $(srcdir)/lisp.mk`): Edit to replace with "$(lisp).
 (@lisp_frag@): Edit out.
 msdos/sedlibmk.inp (GNULIB_GROUP_MEMBER, HAVE_GROUP_MEMBER): Edit to
 zero.
 src/callproc.c (Fcall_process) [MSDOS]: Fix arguments to
 report_file_error introduced by the change from 2011-05-07.
2011-05-20 12:47:59 +03:00
Eli Zaretskii
75c0d28a6a Adapt MS-DOS configury to latest changes.
msdos/inttypes.h: Include stdint.h.
 (uintmax_t): Don't define, it is defined in stdint.h.
 msdos/sedlibmk.inp (am__append_1): Edit to comment out.
 (am__append_2): Edit to expose.
 (NEXT_AS_FIRST_DIRECTIVE_STDARG_H, NEXT_STDARG_H, STDARG_H): Edit
 to empty.
 (@GL_GENERATE_STDARG_H_TRUE@, @GL_GENERATE_STDARG_H_FALSE@): Edit
 to comment out corresponding lines.
2011-05-07 13:24:55 +03:00
Eli Zaretskii
8db90b7394 Adapt the MSDOS build to latest changes.
msdos/inttypes.h: New file.
 msdos/sed2v2.inp (HAVE_DECL_STRTOULL, HAVE_DECL_STRTOUMAX)
 (HAVE_STRTOULL, HAVE_STRTOULL): Define to 1.
 src/sedlibmk.inp (BUILT_SOURCES): Edit out inttypes.h.
 src/sed1v2.inp (CPPFLAGS): Edit to "-I../msdos".
 Add ../msdos/inttypes.h to prerequisites of lread.o.
 src/dosfns.c (Fint86, Fdos_memget, Fdos_memput): Use `ASIZE (FOO)'
 rather than `XVECTOR (FOO)->size'.
2011-04-30 13:31:17 +03:00
Eli Zaretskii
1b2de27459 Repair the MSDOS build following latest changes.
msdos/sedlibmk.inp (am_libgnu_a_OBJECTS): Edit out
 allocator.$(OBJEXT).  Add editing for the new GNULIB_* and
 REPLACE_* variables.
 src/msdos.c (XMenuActivate, XMenuAddSelection): Adjust argument list
 to changes in oldXMenu/XMenu.h from 2011-04-16.
 <menu_help_message, prev_menu_help_message>: Constify.
 (IT_menu_make_room): menu->help_text is now `const char **';
 adjust.
 src/msdos.h (XMenuActivate, XMenuAddSelection): Adjust prototypes
 to changes in oldXMenu/XMenu.h from 2011-04-16.
 (struct XMenu): Declare `help_text' `const char **'.
 src/xfaces.c <Qunspecified>: Make extern again.
 src/syntax.c: Include sys/types.h before including regex.h, as
 required by Posix.
2011-04-24 15:48:30 +03:00
Eli Zaretskii
7c106b1e1e Adapt the MS-DOS build to changes in gnulib.
msdos/sedlibmk.inp: Update checklist.
 (am_libgnu_a_OBJECTS): Remove careadlinkat.$(OBJEXT).
 ($(top_builddir)/config.status): Edit away, both as target and in
 prerequisites.
 (@am__fastdepCC_FALSE@): Fix editing.
 (@GL_GENERATE_STDBOOL_H_TRUE@, @GL_GENERATE_STDBOOL_H_FALSE@)
 (@GL_GENERATE_STDDEF_H_TRUE@, @GL_GENERATE_STDDEF_H_FALSE@)
 (@GL_GENERATE_STDINT_H_TRUE@, @GL_GENERATE_STDINT_H_FALSE@): Edit
 to either nothing or "#".
 src/msdos.c (careadlinkat, careadlinkatcwd): MS-DOS replacements.
2011-04-06 20:49:21 +03:00
Eli Zaretskii
f4d87671c6 Fix previous commit.
config.bat: Use autogen/config.in in one more place.
 msdos/sedlibmk.inp (GNULIB_PRINTF, GNULIB_PRINTF_POSIX): Add missing
 variables.
 (MKDIR_P): Fix replacement command.
 (NEXT_AS_FIRST_DIRECTIVE_STDIO_H, NEXT_STDIO_H): Edit to
 "<stdio.h>", as lib/stdio.h cannot be left unused.
2011-03-25 14:52:03 +02:00
Eli Zaretskii
07da4b3c92 Adapt config.bat and msdos/sedlibmk.inp to autogen and addition of stdio.
msdos/sedlibmk.inp: Adapt to addition of the gnulib stdio module.
 config.bat: Generate src/config.h and lib/Makefile from
 autogen/config.in and autogen/Makefile.in.
2011-03-25 14:10:45 +02:00
Eli Zaretskii
ea2bc7b02f Test and finish fixing the MS-DOS build.
msdos/sedlib.mk (APPLE_UNIVERSAL_BUILD): New edit.
 (gl_LIBOBJS): Add md5.o and filemode.o.
2011-02-26 15:38:25 +02:00
Eli Zaretskii
003fa8b6f4 Fix Sed scripts and srs/s/msdos.h for gnulib additions. Not tested yet.
src/s/msdos.h (HAVE_LSTAT): Define for DJGPP >= 2.04.
 (lstat): Define for DJGPP < 2.04.
 msdos/sedlibmk.inp (BITSIZEOF_PTRDIFF_T, BITSIZEOF_SIG_ATOMIC_T)
 (BITSIZEOF_SIZE_T, BITSIZEOF_WCHAR_T)
 (BITSIZEOF_WINT_TGNULIB_FCHMODAT, GNULIB_FSTATAT, GNULIB_FUTIMENS)
 (GNULIB_LCHMOD, GNULIB_LSTAT, GNULIB_MBTOWC, GNULIB_MKDIRAT)
 (GNULIB_MKFIFO, GNULIB_MKFIFOAT, GNULIB_MKNOD, GNULIB_MKNODAT)
 (GNULIB_STAT, GNULIB_UTIMENSAT, GNULIB_WCTOMB, HAVE_FCHMODAT)
 (HAVE_FSTATAT, HAVE_FUTIMENS, HAVE_INTTYPES_H, HAVE_LCHMOD)
 (HAVE_LONG_LONG_INT, HAVE_LSTAT, HAVE_MKDIRAT, HAVE_MKFIFO)
 (HAVE_MKFIFOAT, HAVE_MKNOD, HAVE_MKNODAT)
 (HAVE_SIGNED_SIG_ATOMIC_T, HAVE_SIGNED_WCHAR_T)
 (HAVE_SIGNED_WINT_T, HAVE_STDINT_H, HAVE_SYS_BITYPES_H)
 (HAVE_SYS_INTTYPES_H, HAVE_SYS_TYPES_H)
 (HAVE_UNSIGNED_LONG_LONG_INT, HAVE_UTIMENSAT, HAVE_WCHAR_H)
 (MKDIR_P, NEXT_AS_FIRST_DIRECTIVE_STDINT_H)
 (NEXT_AS_FIRST_DIRECTIVE_SYS_STAT_H, NEXT_STDINT_H)
 (NEXT_SYS_STAT_H, REPLACE_LSTAT, REPLACE_MBTOWC, REPLACE_MKDIR)
 (REPLACE_MKFIFO, REPLACE_MKNOD, REPLACE_STAT, REPLACE_UTIMENSAT)
 (REPLACE_WCTOMB, SIG_ATOMIC_T_SUFFIX, SIZE_T_SUFFIX, STDINT_H)
 (WCHAR_T_SUFFIX, WINT_T_SUFFIX): New edits.
 ($(MKDIR_P)): Replace with equivalent DOS command.
 msdos/sed2v2.inp (BITSIZEOF_PTRDIFF_T, BITSIZEOF_SIG_ATOMIC_T)
 (BITSIZEOF_SIZE_T, BITSIZEOF_WCHAR_T, BITSIZEOF_WINT_T)
 (HAVE_LONG_LONG_INT, HAVE_SIGNED_SIG_ATOMIC_T, HAVE_SIGNED_WINT_T)
 (HAVE_UNSIGNED_LONG_LONG_INT, HAVE_WCHAR_H, HAVE_INTTYPES_H): New
 edits.
2011-02-26 14:55:10 +02:00
Eli Zaretskii
f601db19da Finish fixing the MS-DOS build. Everything builds and works.
src/termcap.c (tputs): Don't declare baud_rate.
 msdos/sedlibmk.inp (gl_LIBOBJS): Add getloadavg.o.
 msdos/sedleim.inp (RUN_EMACS): Rename from RUN-EMACS.
 (BUILT_EMACS): Rename from BUILT-EMACS.
 msdos/sed6.inp (MAKEINFO): Edit to "makeinfo".
 (ENVADD): Adjust to MAKEINFO_OPTS.
 (texinputdir): Don't edit.
 msdos/sed2v2.inp (my_strftime): Edit to nstrftime.
 msdos/sed1v2.inp (LIBOBJS): Edit to empty.
 ($(libsrc)/make-docfile): Two new edits, one each for every
 invocation of make-docfile.
 (move-if-change): Fix edit.
 Remove some unused switches from $(ALL_CFLAGS), to make the GCC
 command line shorter.
2011-02-19 21:41:00 +02:00
Eli Zaretskii
27087453c9 Fix msdos/sedlibmk.inp. lib/ builds now.
sedlibmk.inp (HAVE_GETOPT_H, PRAGMA_SYSTEM_HEADER, PRAGMA_COLUMNS): Fix
 editing.
 (DEFS): Edit to -DHAVE_CONFIG_H.
 (Makefile, &&): Fix removal.
2011-02-19 19:35:11 +02: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
9d9ce65995 Commit new Sed scripts in msdos/. 2011-02-19 18:05:27 +02:00