Commit graph

123 commits

Author SHA1 Message Date
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
Glenn Morris
97efb62959 Move LIBS_SYSTEM from cpp to configure.
* configure.in (LIBS_SYSTEM): New output variable, replacing cpp.

* lib-src/Makefile.in (LIBS_SYSTEM) [!MSDOS]: Set with configure, not cpp.
(LIBS_SYSTEM) [MSDOS]: Use MSDOS_LIBS_SYSTEM.
(NOT_C_CODE): Remove, no longer used.
(config.h) [!MSDOS]: No longer include.
(LOADLIBES): Use LIBS_SYSTEM as a variable.

* src/Makefile.in (LIBS_SYSTEM): Set using configure, not cpp.
(LIBS_SYSTEM) [MSDOS]: Reset with MSDOS_LIBS_SYSTEM.
(LIBES): Use LIBS_SYSTEM as a variable.
* src/s/msdos.h (LIBS_SYSTEM): Rename to MSDOS_LIBS_SYSTEM.  Always define.
* src/s/aix4-2.h (LIBS_SYSTEM):
* src/s/freebsd.h (LIBS_SYSTEM):
* src/s/hpux10-20.h (LIBS_SYSTEM):
* src/s/sol2-6.h (LIBS_SYSTEM):
* src/s/unixware.h (LIBS_SYSTEM):
Move to configure.

* msdos/sed1v2.inp, msdos/sed3v2.inp (LIBS_SYSTEM): Edit to empty.
2010-05-09 19:16:09 -07:00
Glenn Morris
7490175bc3 Move MAIL_USE_FLOCK, MAIL_USE_LOCKF, BLESSMAIL_TARGET from cpp to configure.
* configure.in (MAIL_USE_FLOCK, MAIL_USE_LOCKF): New AC_DEFINEs.
(BLESSMAIL_TARGET): New output variable.

* lib-src/Makefile.in (BLESSMAIL_TARGET): Set with configure, not cpp.

* src/s/aix4-2.h (MAIL_USE_LOCKF):
* src/s/bsd-common.h (MAIL_USE_FLOCK):
* src/s/darwin.h (MAIL_USE_FLOCK):
* src/s/gnu-linux.h (MAIL_USE_FLOCK):
* src/s/irix6-5.h (MAIL_USE_FLOCK):
* src/s/template.h (MAIL_USE_FLOCK):
Move to configure.

* src/s/ms-w32.h: Comment.

* msdos/sed3v2.inp (BLESSMAIL_TARGET): Edit to need-blessmail.
2010-05-09 17:07:47 -07:00
Stefan Monnier
0235128c15 Merge from emacs-23 2010-05-08 14:47:07 -04:00
Chong Yidong
61a808e819 Bump version to 23.2. 2010-05-07 23:28:26 -04:00
Glenn Morris
40c178792e Move TERMINFO, LIBS_TERMCAP from cpp to configure.
* configure.in (HAVE_LIBNCURSES): New local variable.
(TERMINFO, LIBS_TERMCAP, TERMCAP_OBJ): New output variables,
replacing cpp in src/s/*.h and src/Makefile.in.

* src/Makefile.in (LIBS_TERMCAP): Set with configure, not cpp.
(TERMCAP_OBJ): New, set by configure, replacing termcapobj.
(termcapobj): Replace with TERMCAP_OBJ.
(otherobj): Use $TERMCAP_OBJ instead of $termcapobj.
(LIBES): Use LIBS_TERMCAP as a variable.

* src/s/freebsd.h (osreldate.h): No longer include, since this file
does not use __FreeBSD_version any more.

* srs/s/aix4-2.h (TERMINFO):
* srs/s/cygwin.h (TERMINFO):
* srs/s/darwin.h (TERMINFO, LIBS_TERMCAP) [HAVE_LIBNCURSES]:
* srs/s/freebsd.h (TERMINFO, LIBS_TERMCAP):
* srs/s/gnu-linux.h (TERMINFO, LIBS_TERMCAP) [HAVE_LIBNCURSES]:
* srs/s/gnu.h (TERMINFO, LIBS_TERMCAP) [HAVE_LIBNCURSES]:
* srs/s/hpux10-20.h (TERMINFO, LIBS_TERMCAP):
* srs/s/irix6-5.h (TERMINFO):
* srs/s/netbsd.h (LIBS_TERMCAP):
* srs/s/openbsd.h (TERMINFO, LIBS_TERMCAP):
* srs/s/sol2-6.h (LIBS_TERMCAP) [!TERMINFO]:
* srs/s/usg5-4.h (TERMINFO):
Move to configure.

* msdos/sed1v2.inp (LIBS_TERMCAP): Edit to empty.
(TERMCAP_OBJ): Edit to tparam.o.

* admin/CPP-DEFINES (LIBS_TERMCAP, TERMINFO): Remove.
2010-05-07 19:05:24 -07:00
Eli Zaretskii
9fdec8bc72 Fix MS-DOS configuring in lib-src/ and src/, broken by autoconfiscation.
src/Makefile.in: Don't use Make-style comments past the "start of
 cpp stuff" line.
 (MSDOS_OBJ): Remove xmenu.o (it is now defined by XMENU_OBJ).
 src/s/msdos.h (UNEXEC): Don't define (@unexec@ in Makefile.in is
 edited directly by msdos/sed1v2.inp).
 msdos/sed3v2.inp (C_SWITCH_MACHINE): Edit to empty.
 msdos/sed1v2.inp (@LIB_MATH@): Edit to -lm.
 (C_SWITCH_MACHINE, C_SWITCH_SYSTEM, LD_SWITCH_SYSTEM_TEMACS)
 (LD_SWITCH_X_SITE_AUX, LD_SWITCH_X_SITE_AUX_RPATH)
 (LD_SWITCH_SYSTEM, LD_SWITCH_SYSTEM_EXTRA, LIBTIFF, LIBJPEG)
 (LIBPNG, LIBGIF, LIBXPM, XFT_LIBS, DBUS_CFLAGS, DBUS_LIBS)
 (DBUS_OBJ, GCONF_CFLAGS, GCONF_LIBS, GTK_OBJ, LIBXMU, LIBXSM)
 (LIBXTR6, XOBJ, TOOLKIT_LIBW, WIDGET_OBJ, CYGWIN_OBJ, NS_OBJ)
 (NS_SUPPORT, LIBSELINUX_LIBS, START_FILES): Edit to empty.
 (XMENU_OBJ): Edit to xmenu.o.
 (FONT_OBJ): Edit to value used for X on Unix.
 (PRE_ALLOC_OBJ): Edit to lastfile.o.
 (POST_ALLOC_OBJ): Edit to $(vmlimitobj).
 (@unexec@): Edit to unexec.o.
2010-05-07 15:57:24 +03:00
Glenn Morris
e3cf0cded8 Remove some unused Makefile.in variables.
* configure.in (AC_PROG_LN_S): Remove test, nothing uses @LN_S@.

* Makefile.in (CPP, C_SWITCH_SYSTEM, ALLOCA, LN_S, C_SWITCH_X_SITE)
(LD_SWITCH_X_SITE): Remove unused variables.

* lwlib/Makefile.in (CPP, LN_S, TOP, LN): Remove unused variables.

* oldXMenu/Makefile.in (CPP, LN_S, AS, LD, MV, LS, LINTOPTS, LINTLIBFLAG, MAKE)
(STD_DEFINES, CDEBUGFLAGS, RM_CMD): Remove unused variables.

* src/Makefile.in (CPP, LN_S): Remove unused variables.

* msdos/sed1v2.inp, msdos/sed5x.inp: Remove LN_S, unused.
2010-05-06 00:24:18 -07:00
Stefan Monnier
2912322b80 Merge from emacs-23 2010-04-02 21:54:24 -04:00
Juanma Barranquero
194d44e717 Fix typos in ChangeLogs. 2010-04-02 04:22:17 +02:00
Eli Zaretskii
ed68db4d2c Remove support for DJGPP v1.x (bug#5813).
src/:
 w16select.c (__dpmi_int): Remove DJGPP v1.x compatibility.
 s/msdos.h: 
 unexec.c (make_hdr, copy_text_and_data): 
 sysdep.c (wait_for_termination, sys_subshell): 
 msdos.c (dos_set_window_size, msdos_set_cursor_shape)
 (IT_set_terminal_modes): 
 (__write, _rename, gethostname, gettimeofday, alarm, fork, kill)
 (dos_ttraw, dos_ttcooked, run_msdos_command, abort): Remove DJGPP
 v1.x code and tests of the value of __DJGPP__.
 (nice, pause, sigsetmask, sigblock): Remove DJGPP v1.x
 compatibility code.
 lread.c: 
 gmalloc.c (memalign): 
 fileio.c (Fcopy_file, check_executable, Ffile_modes): 
 emacs.c (main): 
 dosfns.c (init_dosfns): 
 dired.c (file_name_completion_stat): Remove tests of __DJGPP__.

 msdos/:
 sed3.inp:
 sed2.inp:
 sed1.inp:
 mainmake: Files removed.
2010-04-01 17:59:46 +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
Chong Yidong
288f9fc069 Bump version to 24.0.50. 2010-03-10 10:17:13 -05:00
Eli Zaretskii
e413818176 INSTALL: Remove a CVS-specific note. Update for latest versions of Windows. 2010-02-19 15:26:50 +02:00
Glenn Morris
114f9c9679 Add 2010 to copyright years. 2010-01-13 00:35:10 -08:00
Eli Zaretskii
e2a1f10077 (OTHER_FILES): Edit to empty. 2009-09-17 18:02:58 +00:00
Eli Zaretskii
66205aea4b (bootstrap): Ensure enough environment space will be available
to run config.bat.
2009-09-11 10:01:21 +00:00
Eli Zaretskii
a6e656a475 (buildobj.h): Replace "echo" with "djecho". 2009-08-27 19:03:20 +00:00
Chong Yidong
7024347875 Add "Branch for 23.1" ChangeLog entry. 2009-06-21 14:35:26 +00:00
Eli Zaretskii
dfec862219 (src) <gdb.ini>: Don't replace the line with x_error_quitter; instead
append "set environment NAME" to the end.
Set NAME and USERNAME in the environment to the same value.
2009-04-14 10:37:59 +00:00
Eli Zaretskii
2a1573ff0d *** empty log message *** 2009-02-28 14:31:20 +00:00
Eli Zaretskii
291f6a31ae (boot): Don't require b-emacs.exe if not building out of CVS. 2009-02-28 14:01:41 +00:00
Glenn Morris
f5d0ac07d6 Add 2009 to copyright years. 2009-01-08 03:38:51 +00:00
Eli Zaretskii
bd448b7a32 Document the problems on Windows Vista and the --with-system-malloc option
to config.bat.
2008-12-19 11:02:42 +00:00
Juanma Barranquero
b97439ce37 Fix typos. 2008-12-02 16:40:31 +00:00
Eli Zaretskii
0c123bd12e (misc): New target.
(all, info): Depend on `misc'.
2008-11-21 15:55:58 +00:00
Eli Zaretskii
aae2a498d7 (src): Move removal of src/bootlisp after recursing into `lisp'. 2008-11-15 20:29:14 +00:00
Eli Zaretskii
ead9233b5e Update the list of utilities needed by lisp/Makefile and for bootstrapping. 2008-11-15 15:41:56 +00:00
Eli Zaretskii
71a692011c Update the list of utilities needed by lisp/Makefile and for bootstrapping. 2008-11-15 10:24:08 +00:00
Eli Zaretskii
cafb950452 New file, with build instructions moved from the top-level INSTALL. 2008-11-08 19:24:59 +00:00
Eli Zaretskii
e16acc2c37 (lisp): Set to absolute file name of current directory, not to ".", to have
it on EMACSLOADPATH when we descend into subdirectories.
2008-10-14 09:24:05 +00:00
Juanma Barranquero
10d1d0af5f Fix typos. 2008-09-24 01:16:16 +00:00
Eli Zaretskii
293a3986b8 *** empty log message *** 2008-08-23 17:07:57 +00:00
Juanma Barranquero
69587bba21 Fix typos. 2008-06-25 14:05:38 +00:00
Glenn Morris
ff0cdfb99b Switch to recommended form of GPLv3 permissions notice. 2008-05-09 04:44:29 +00:00
Kenichi Handa
880820fe87 (Fdefine_charset_internal): Change the way of
registering charsets in Vcharset_order_list.
(syms_of_charset): Make the charset `eight-bit' supplementary.
2008-03-27 11:36:43 +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
Juanma Barranquero
8de5628cc9 *** empty log message *** 2008-01-07 14:50:58 +00:00
Glenn Morris
b9b14d130b Add 2008 to copyright years. 2008-01-07 08:31:52 +00:00
Eli Zaretskii
57df543ca0 Update comment to reflect doc directory structure. 2007-10-05 09:37:09 +00:00
Glenn Morris
cacc7b5131 Switch license to GPLv3 or later. 2007-07-25 07:11:02 +00:00
Glenn Morris
4a9f99bdfb Switch license to GPLv3 or later. 2007-07-25 05:08:27 +00:00
Chong Yidong
537a062fd7 Version 22.1 released. 2007-06-02 11:11:31 +00:00
Glenn Morris
7f6d64f85a Switch to standard GPL text for license. 2007-02-11 00:15:39 +00:00
Glenn Morris
f5f4e20ddd *** empty log message *** 2007-02-10 22:41:35 +00:00
Juanma Barranquero
5e1a6e3270 Fix typos. 2007-02-02 16:42:31 +00:00
Glenn Morris
222b4fde76 Initial version. 2007-01-28 01:13:25 +00:00
Glenn Morris
4e6835dbc4 Add 2007 to copyright years. 2007-01-21 04:57:37 +00:00
Eli Zaretskii
818f5ca242 Remove -unix from coding: tags. 2006-12-22 23:37:42 +00:00
Eli Zaretskii
2231193892 *** empty log message *** 2006-12-04 20:39:22 +00:00