1
0
mirror of https://git.savannah.gnu.org/git/emacs.git synced 2024-12-15 09:47:20 +00:00
Commit Graph

87 Commits

Author SHA1 Message Date
Eli Zaretskii
42a53d84f6 Fix the MSDOS build following gnulib update.
config.bat (lib): Create/update lib/stdalign.in-h and
 lib/sys_types.in-h.
 msods/sedlibmk.inp (GNULIB_GL_UNISTD_H_GETOPT, GNULIB_POSIX_OPENPT)
 (GNULIB_ISATTY, GNULIB_PTSNAME_R, GNULIB_RANDOM)
 (GNULIB_SETHOSTNAME, HAVE_POSIX_OPENPT, HAVE_PTSNAME_R)
 (HAVE_RANDOM, HAVE_SETHOSTNAME, NEXT_SYS_TYPES_H)
 (NEXT_AS_FIRST_DIRECTIVE_SYS_TYPES_H, REPLACE_FTRUNCATE)
 (REPLACE_ISATTY, REPLACE_PTSNAME_R, REPLACE_RANDOM_R)
 (REPLACE_STRTOIMAX, STDALIGN_H, WINDOWS_64_BIT_OFF_T)
 (WINDOWS_64_BIT_ST_SIZE, GL_GENERATE_STDALIGN_H_TRUE)
 (GL_GENERATE_STDALIGN_H_FALSE): Edit as appropriate for DJGPP.
 (cat FOO): Edit into "sed -e '' FOO >>".
2012-05-27 16:42:13 +03:00
Glenn Morris
7497ef13c9 Convert some consecutive FSF copyright years to ranges; add 2012. 2012-01-05 01:44:36 -08:00
Eli Zaretskii
07f3add98f Fix previous commit.
config.bat: Use config.in and Makefile.in from src/ and lib/, if
 they exist there, else from autogen/.
 make-dist: Don't add `autogen'.
2011-10-31 19:49:10 +02:00
Eli Zaretskii
7cc013b5ba Restore GNUmakefile. Fix capitalization in config.bat. 2011-09-29 15:08:36 +03:00
Eli Zaretskii
31bed48620 Fix the MSDOS build.
msdos/mainmake.v2 (boot): Condition the value on the existence of
 autogen/README, not admin/admin.el, since the latter is now part
 of the release tarball.
 (install): Don't copy lib-src/fns.el, as that file is no longer
 generated in that directory.
 msdos/sed1v2.inp (LIB_PTHREAD, LIB_PTHREAD_SIGMASK): Edit to empty.
 (SETTINGS_CFLAGS, SETTINGS_LIBS): Edit these instead of
 GCONF_CFLAGS and GCONF_LIBS.
 msdos/sedlibmk.inp (ALLOCA_H, AR, ARFLAGS, GNULIB_CHDIR, GNULIB_DUP)
 (GNULIB_FDATASYNC, GNULIB_FDOPEN, GNULIB_FSTAT, GNULIB_PCLOSE)
 (GNULIB_PTHREAD_SIGMASK, GNULIB_RAISE, GNULIB_SIGACTION)
 (GNULIB_SIGPROCMASK, GNULIB_SIGNAL_H_SIGPIPE, HAVE_FDATASYNC)
 (HAVE_PCLOSE, HAVE_POPEN, HAVE_POSIX_SIGNALBLOCKING)
 (HAVE_PTHREAD_SIGMASK, HAVE_RAISE, HAVE_SIGACTION)
 (HAVE_SIGHANDLER_T, HAVE_SIGINFO_T, HAVE_SIGSET_T)
 (HAVE_STRUCT_SIGACTION_SA_SIGACTION)
 (HAVE_TYPE_VOLATILE_SIG_ATOMIC_T, LIB_PTHREAD)
 (LIB_PTHREAD_SIGMASK, NEXT_AS_FIRST_DIRECTIVE_SIGNAL_H)
 (NEXT_SIGNAL_H, REPLACE_FDOPEN, REPLACE_PTHREAD_SIGMASK)
 (REPLACE_RAISE): New edits.
 (gl_LIBOBJS): Remove md5.o, filemode.o, and sha1.o.  Add
 pthread_sigmask.o.
 (@GL_GENERATE_ALLOCA_H_TRUE@, @GL_GENERATE_ALLOCA_H_FALSE@): Edit
 to comment out unneeded lines.
 (warn-on-use.h): Edit the recipe commands to work with DJGPP
 without requiring a Unixy shell.
 msdos/inttypes.h (strtoimax) [DJGPP < 2.04]: New macro.
 msdos/sed2v2.inp (HAVE_ALLOCA, HAVE_DECL_STRTOLL, HAVE_DECL_STRTOIMAX)
 (HAVE_STRTOLL, HAVE_SIGSET_T, HAVE_SNPRINTF): New edits.

 .bzrignore: Add ./GNUMakefile.unix.
 config.bat: Rename GNUMakefile, so it is not run on MS-DOS.
 Rename signal.in.h and alloca.in.h.

 src/sysdep.c (snprintf) [EOVERFLOW]: If EOVERFLOW is not defined,
 use EDOM.
2011-09-29 15:00:18 +03:00
Paul Eggert
f13cae31f1 Use backslashes where DOS requires it. 2011-07-25 11:48:17 -07:00
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
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
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
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
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
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
Glenn Morris
0d9f702fd0 Nuke arch-tags. 2011-01-15 15:16:57 -08:00
Stefan Monnier
77ab81d054 Merge from emacs-23 2011-01-14 12:18:41 -05:00
Glenn Morris
5df4f04cd3 Add 2011 to FSF/AIST copyright years. 2011-01-02 15:50:46 -08: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
Eli Zaretskii
1ff11b21a8 Support building with libxml2, if it is installed.
config.bat: Detect that libxml2 is installed and if so, build with it.
2010-09-18 15:57:06 +02:00
Eli Zaretskii
dd0c613c9f Update config.bat due to lisp/gnus/.dir-locals.el.
config.bat: Produce lisp/gnus/_dir-locals.el from lisp/gnus/.dir-locals.el.
2010-09-04 10:30:14 +03:00
Eli Zaretskii
394f238630 Fix the MS-DOS build due to changes in configury.
config.bat: Remove white space around "+" in COPY commands.
 msods/mainmake.v2 (version): Use emacs_version[] in src/emacs.c
 instead of lisp/version.el (see 2010-05-15T21:11:37Z!raeburn@raeburn.org).
 msdos/sed1v2.inp (MKDEPDIR): Edit to empty.
 Delete lines in rules that invoke $(MKDEPDIR).
 Fix editing rules that begin with "cd ../lisp".
 Edit out sh if-then-else-fi constructs that test ${CANNOT_DUMP}.
 Edit out "|| exit ;\" constructs in emacs${EXEEXT} rule.
2010-06-26 17:36:27 +03:00
Glenn Morris
81ac4f3536 Do not preprocess src/Makefile.in.
* configure.in: Do not preprocess src/Makefile.in.
(cpp_undefs, CPP_NEED_TRADITIONAL): Remove.
(AC_EGREP_CPP): Test no longer needed.
* configure: Regenerate.

* config.bat: Do not preprocess src/Makefile.in.

* make-dist: No more Makefile.c files.

* INSTALL, src/README: Makefiles are not preprocessed.

* src/Makefile.in, src/autodeps.mk, src/deps.mk, src/ns.mk:
Convert comments to Makefile format.

* lib-src/Makefile.in (distclean): No more Makefile.c.
* src/Makefile.in (bootstrap-clean): No more Makefile.c.

* admin/notes/cpp: Remove file.

* admin/quick-install-emacs (AVOID): No more Makefile.c files.

* etc/PROBLEMS, etc/MACHINES: Remove details of cpp problems which can
no longer occur.
2010-05-26 22:43:27 -07:00
Glenn Morris
74e6ff9a60 * config.bat: Need to add the deps.mk file before running cpp. 2010-05-19 23:24:35 -07:00
Glenn Morris
9d5cf9b6b6 Handle auto-depend with configure.
* make-dist (src): Include *.mk.
* config.bat: Concatenate deps.mk onto the end of src/Makefile.
* configure.in (DEPFLAGS, MKDEPDIR): New output variables.
(deps_frag): New output file.
(AUTO_DEPEND): Remove this definition.

* src/Makefile.in (DEPDIR): New constant.
(DEPFLAGS): Set with configure, not cpp.
(MKDEPDIR): New, set by configure.
(.c.o, .m.o, ecrt0.o): Use $MKDEPDIR.
(clean): Use $DEPDIR.
(deps_frag): Include from configure.
Move static/dynamic dependency stuff to deps.mk/autodeps.mk.
* src/deps.mk, src/autodeps.mk: New files, extracted from Makefile.in.

* msdos/sed1v2.inp (DEPFLAGS, deps_frag): Edit to empty.
(MKDEPDIR): Edit to ':'.
2010-05-19 23:11:27 -07:00
Glenn Morris
40dc6bf44e Set rallocobj with configure, not cpp.
* configure.in (REL_ALLOC): Unset on gnu, gnu-linux if DOUG_LEA_MALLOC.
(RALLOC_OBJ): New output variable.
* config.bat (RALLOC_OBJ): Edit to empty if sys_malloc.

* src/Makefile.in (RALLOC_OBJ): New, set by configure.
(rallocobj): Replace with the previous variable.
(otherobj): Use $RALLOC_OBJ.

* src/s/gnu.h (REL_ALLOC) [DOUG_LEA_MALLOC]:
* src/s/gnu-linux.h (REL_ALLOC) [DOUG_LEA_MALLOC]: Move undef to configure.

* msdos/sed1v2.inp (RALLOC_OBJ): Edit to ralloc.o.
2010-05-17 19:44:07 -07:00
Glenn Morris
be4ff9dad8 Define some malloc objects with configure, not cpp.
* configure.in (GMALLOC_OBJ, VMLIMIT_OBJ): New output variables.
* config.bat (GMALLOC_OBJ, VMLIMIT_OBJ): Edit to empty if sys_malloc.

* src/Makefile.in (GMALLOC_OBJ, VMLIMIT_OBJ): New, set by configure.
(gmallocobj, vmlimitobj): Replace with previous two variables.
(otherobj): Use $GMALLOC_OBJ, $VMLIMIT_OBJ.

* msdos/sed1v2.inp (GMALLOC_OBJ): Edit to gmalloc.o.
(VMLIMIT_OBJ): Edit to vm-limit.o.
2010-05-17 19:30:13 -07:00
Eli Zaretskii
78248b76e3 config.bat: Remove support for DJGPP v1.x. 2010-05-15 10:51:52 +03:00
Glenn Morris
d3b23034e8 Do not preprocess lib-src/Makefile.in
* configure.in: Generate lib-src/Makefile directly, do not run cpp.
* config.bat: Do not run cpp on lib-src/Makefile.in.

* lib-src/Makefile.in: Convert comments to makefile format.

* admin/notes/cpp: lib-src/Makefile not preprocessed.
2010-05-10 20:00:32 -07:00
Glenn Morris
acddf8aec7 On msdos, set LIBS_SYSTEM with config.bat, not cpp.
* config.bat [HAVE_X11]: Run sed3x.inp on lib-src/Makefile.

* src/Makefile.in (LIBS_SYSTEM) [MSDOS]: Do not reset.
* src/s/msdos.h (MSDOS_LIBS_SYSTEM): Remove.

* msdos/sed1x.inp (LIBS_SYSTEM): Edit to -lxext -lsys.
* msdos/sed3x.inp: New file.

* lib-src/Makefile.in (LIBS_SYSTEM) [MSDOS]: Do not reset.
(config.h) [MSDOS]: Do not include.
2010-05-10 19:51:08 -07:00
Eli Zaretskii
f724825e89 Fix the "config msdos" step of MS-DOS build (due to removal of some cpp stuff from configury).
config.bat: Allow for 2 leading `#'s in comments in src/Makefile.in.
 src/Makefile.in: Don't use Make-style comments past the
 "start of cpp stuff" line.
2010-05-07 14:21:29 +03:00
Eli Zaretskii
2201e7e2be Fix the MSDOS build as fallout from the latest Makefile.in changes.
config.bat <lib-src>: Edit out lines that begin with several #
 characters.

 msdos/sedlisp.inp (VPATH): Don't edit, no longer needed.
 (lisp, srcdir): Adapt to lisp/Makefile.in changes.
 (abs_top_builddir): New edit.
 msdos/sed3v2.inp (KRB4LIB, DESLIB, KRB5LIB, CRYPTOLIB, COM_ERRLIB)
 (LIBHESIOD, LIBRESOLV, LIBS_MAIL): Edit to empty values.
 msdos/sed3.inp (KRB4LIB, DESLIB, KRB5LIB, CRYPTOLIB, COM_ERRLIB)
 (LIBHESIOD, LIBRESOLV, LIBS_MAIL): Edit to empty values.
 msdos/sed1v2.inp (abs_builddir): Edit into "../src".
2010-03-27 13:49:18 +03:00
Glenn Morris
114f9c9679 Add 2010 to copyright years. 2010-01-13 00:35:10 -08:00
Eli Zaretskii
1685daf251 Copy .dbxinit to _dbxinit. 2009-02-28 14:04:58 +00:00
Glenn Morris
dfe07b9de6 Add 2009 to copyright years. 2009-01-08 03:47:42 +00:00
Eli Zaretskii
745ebc1319 Produce _dir-locals.el from .dir-locals.el. 2008-12-26 15:03:47 +00:00
Eli Zaretskii
b5a0990328 (--with-system-malloc): New option; see msdos/INSTALL for rationale. 2008-12-19 11:05:49 +00:00
Eli Zaretskii
b5ba727193 Tell user to expect one "File not found" message while the `doc' directory
is being configured.
2008-10-31 10:56:30 +00:00
Eli Zaretskii
d95d9b2360 Fix last change: don't use < and > in "rem" lines, they are interpreted
as redirection by DOS shells.
2008-05-07 10:32:47 +00:00
Glenn Morris
b33ba8120b Switch to recommended form of GPLv3 permissions notice. 2008-05-07 07:35:58 +00:00
Miles Bader
59ce725a3b Merge from emacs--rel--22
Revision: emacs@sv.gnu.org/emacs--devo--0--patch-987
2008-01-08 20:46:54 +00:00
Glenn Morris
57ebf0bedb Add 2008 to copyright years. 2008-01-07 08:53:20 +00:00
Eli Zaretskii
799303b632 Fix configuring `doc' due to changes in the directory structure. 2007-10-05 09:39:39 +00:00
Glenn Morris
fca4a5de17 Switch license to GPLv3 or later. 2007-07-25 06:48:19 +00:00
Glenn Morris
4e6835dbc4 Add 2007 to copyright years. 2007-01-21 04:57:37 +00:00
Glenn Morris
e91081eb9e Update copyright years. 2006-12-05 06:15:26 +00:00
Ramprasad B
667f78d702 Updated copyright year(s) 2006-04-20 06:59:38 +00:00
Lute Kamstra
0d07bc90bc Update FSF's address. 2005-07-04 14:42:45 +00:00
Eli Zaretskii
e823737069 Protect & with "" since & is special for cmd.exe;
filter through Sed to remove the quotes.

----------------------------------------------------------------------
2004-11-27 18:22:45 +00:00
Eli Zaretskii
60c49bc1a3 If 8-byte alignment is not supported, define
NO_DECL_ALIGN in src/config.h, instead of trivially defining
DECL_ALIGN.
2004-11-27 12:28:40 +00:00
Eli Zaretskii
a30fb04fbc Add a test for DECL_ALIGN support, and add a trivial definition to
src/config.h if 8-byte alignment is not supported.
2004-11-12 18:18:43 +00:00