1
Fork 0
mirror of git://git.sv.gnu.org/emacs.git synced 2025-12-20 04:30:55 -08:00
Commit graph

2507 commits

Author SHA1 Message Date
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
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
19ae0deb1c Bump version to 23.2.50. 2010-05-08 00:46:44 -04:00
Chong Yidong
61a808e819 Bump version to 23.2. 2010-05-07 23:28:26 -04:00
Glenn Morris
7b42b29f3d Remove unused Makefile definition THIS_IS_MAKEFILE.
* src/Makefile.in (THIS_IS_MAKEFILE): Remove, unused.
* lib-sc/Makefile.in (THIS_IS_MAKEFILE): Remove, unused.
* admin/CPP-DEFINES (THIS_IS_MAKEFILE): Remove.
2010-05-07 19:11:06 -07:00
Glenn Morris
f6c0ee20ba Minimize blessmail-related cpp usage, with an eye to future removal.
* lib-src/Makefile.in: (BLESSMAIL_TARGET): New variable.
(MOVEMAIL_NEEDS_BLESSING): Remove, replace by above variable.
(blessmail): Always define this rule.
(need-blessmail): New rule, split out from maybe-blessmail.
(maybe-blessmail): Use BLESSMAIL_TARGET.
2010-05-06 01:03:27 -07:00
Juanma Barranquero
07e995905d lib-src/ChangeLog: Remove duplicate entry. 2010-05-06 00:14:15 +02:00
Chong Yidong
bab1431e6c * makefile.w32-in (OTHER_PLATFORM_SUPPORT): Use parenthesis for macros for nmake compatibility. 2010-05-05 15:54:04 -04:00
Glenn Morris
496287859b Move C_SWITCH_MACHINE, C_SWITCH_SYSTEM from cpp to autoconf.
* configure.in (C_SWITCH_MACHINE, C_SWITCH_SYSTEM): New output
variables, replacing c_switch_machine, c_switch_system.

* src/s/aix4-2.h (C_SWITCH_SYSTEM):
* src/m/alpha.h (C_SWITCH_MACHINE):
Move to configure.in.
* src/Makefile.in (C_SWITCH_MACHINE, C_SWITCH_SYSTEM):
New variables, set by configure.
(ALL_CFLAGS): Use $C_SWITCH_MACHINE and $C_SWITCH_SYSTEM in place of
$c_switch_machine and $c_switch_system.

* lib-src/Makefile.in: Use @C_SWITCH_SYSTEM@, @C_SWITCH_MACHINE@
rather than @c_switch_system@, @c_switch_machine@.
2010-05-03 19:56:19 -07:00
Chong Yidong
8838172bf0 Bump version to 23.1.97. 2010-05-03 21:31:59 -04:00
Dan Nicolaescu
10ccb130e0 * Makefile.in (LIBS_MACHINE): Remove, unused. 2010-04-26 11:23:01 -07:00
Dan Nicolaescu
7e10844c72 * Makefile.in (LIBS_MACHINE): Remove, unused.
* Makefile.in (LIBS_MACHINE): Remove all uses, unused.
* configure.in (LIBS_MACHINE): Remove, unused.
2010-04-26 11:14:24 -07:00
Chong Yidong
958631c4cc Bump version to 23.1.96. 2010-04-19 21:29:37 -04:00
Stefan Monnier
6e104790e7 Merge from emacs-23 2010-04-19 11:07:52 -04:00
Stefan Monnier
eb6967a081 Remove the Arch metafiles. 2010-04-12 23:06:50 -04:00
Dan Nicolaescu
4794a58232 * Makefile.in (ALL_CFLAGS, LINK_CFLAGS, CPP_CFLAGS): Move to the
non-cpp section.
2010-04-12 07:38:42 -07:00
Dan Nicolaescu
76bd82023f Use autoconf, not cpp for some variables.
* Makefile.in (C_SWITCH_SYSTEM, C_SWITCH_MACHINE)
(C_SWITCH_X_SITE): Define using autoconf.

* Makefile.in (C_SWITCH_SYSTEM, C_SWITCH_MACHINE)
(C_SWITCH_X_SITE): Define using autoconf.

* Makefile.in (C_SWITCH_SYSTEM, C_SWITCH_MACHINE): Define using
autoconf, not cpp.
(ALL_CFLAGS): Use them as make variables.
2010-04-11 13:17:24 -07:00
Christoph
42d3cab7ad * lib-src/makefile.w32-in: Use parenthesis for macros for nmake compatibility. 2010-04-07 15:43:04 +02:00
Juanma Barranquero
b372fceb03 Add stubs for Windows, required after CVE-2010-0825 change.
* ntlib.c (getgid, getegid, setegid): New stubs.
* ntlib.h (getgid, getegid, setegid): Declare them.
2010-04-03 04:23:51 +02:00
Juanma Barranquero
6f5b06547b Add stubs for Windows, required after CVE-2010-0825 change.
* ntlib.c (getgid, getegid, setegid): New stubs.
* ntlib.h (getgid, getegid, setegid): Declare them.
2010-04-03 04:16:16 +02:00
Stefan Monnier
2912322b80 Merge from emacs-23 2010-04-02 21:54:24 -04:00
Chong Yidong
d86d8ea85a Bump version to 23.1.95. 2010-04-02 20:42:10 -04:00
Chong Yidong
51a91f9da6 Fix permissions handling (CVE-2010-0825).
* movemail.c (main): Check return values of setuid.  Avoid
possibility of symlink attack when movemail is setgid mail
(CVE-2010-0825).
2010-04-02 11:26:24 -04:00
Chong Yidong
c8f19d8102 Fix permissions handling (CVE-2010-0825).
* movemail.c (main): Check return values of setuid.  Avoid
possibility of symlink attack when movemail is setgid mail
(CVE-2010-0825).
2010-04-02 11:24:16 -04:00
Dan Nicolaescu
42a2c62292 Remove extern errno declarations.
* xterm.c:
* xrdb.c:
* w32term.c:
* unexec.c:
* unexaix.c:
* sysdep.c:
* process.c:
* lread.c:
* keyboard.c:
* floatfns.c:
* filelock.c:
* fileio.c:
* emacs.c (main):
* ecrt0.c:
* dispnew.c:
* callproc.c:
* buffer.c: Remove errno extern declarations.
* s/netbsd.h (NEED_ERRNO): Remove.

* movemail.c:
* etags.c:
* emacsclient.c: Remove extern errno declarations.
2010-04-01 20:10:33 -07:00
Juanma Barranquero
194d44e717 Fix typos in ChangeLogs. 2010-04-02 04:22:17 +02:00
Glenn Morris
5e58e3a4f7 Cosmetic changes to lib-src/Makefile.in.
* Makefile.in (KRB4LIB, DESLIB, KRB5LIB, CRYPTOLIB, COM_ERRLIB)
(LIBHESIOD, LIBRESOLV): Make previous change a bit more friendly by
defining these as Makefile variables.
(LIBS_MOVE): Add LIBS_MAIL into this.
(movemail${EXEEXT}): Just use LIBS_MOVE, not LIBS_MAIL as well.
2010-03-20 11:13:46 -07:00
Chong Yidong
8eae7a421b `make uninstall' fix (Bug#5620).
* Makefile.in (uninstall): Handle the case where archlibdir does
not exist.  (Bug#5720)
2010-03-19 11:27:49 -04:00
Glenn Morris
aded53ff76 Replace some cpp with autoconf.
* configure.in (--with-mmdf, --with-mail-unlink):
New options, off by default.
(--with-mailhost): New option to set default POP host.
(LIBXPM, LIBJPEG, LIBPNG, LIBTIFF, LIBGIF, LIBGPM, LIBS_MAIL)
(LIBHESIOD, LIBRESOLV, COM_ERRLIB, CRYPTOLIB, KRB5LIB, DESLIB, KRB4LIB):
New variables, substituted in Makefiles.
(try_libungif, ac_gif_lib_name): Replace with HAVE_GIF=maybe, LIBGIF.
(LIBGIF): Use AC_SUBST rather than AC_DEFINE.
(HAVE_LIBMAIL, HAVE_LIBLOCKFILE, HAVE_LIBCOM_ERR, HAVE_LIBCRYPTO)
(HAVE_LIBK5CRYPTO, HAVE_LIBKRB5, HAVE_LIBDES425, HAVE_LIBDES)
(HAVE_LIBKRB4, HAVE_LIBKRB): New AC_DEFINEs.

* lib-src/Makefile.in (KRB4LIB, DESLIB, KRB5LIB, CRYPTOLIB, COM_ERRLIB)
(HESIODLIB, LIBS_MAIL): Set using autoconf rather than cpp.
(BASE_CFLAGS): Remove (identical to CPP_CFLAGS).

* src/Makefile.in (XFT_LIBS, LIBXPM, LIBJPEG, LIBPNG, LIBTIFF, LIBGIF)
(LIBGPM, LIBRESOLV): Set using autoconf rather than cpp.
2010-03-17 22:49:31 -07:00
Tetsurou Okazaki
f838857030 Close bug#5720.
* Makefile.in, lib-src/Makefile.in (uninstall): Handle the case where
archlibdir does not exist.
2010-03-17 22:17:11 -07:00
Chong Yidong
66da5719da Bump version to 23.1.94 and regenerate ldefs-boot.el. 2010-03-10 23:03:11 -05:00
Chong Yidong
288f9fc069 Bump version to 24.0.50. 2010-03-10 10:17:13 -05:00
Juanma Barranquero
f7e0618c13 Fix typos in Changelogs. 2010-03-08 14:00:18 +01:00
Chong Yidong
5d752593a5 Bump version to 23.1.93; regenerate AUTHORS. 2010-02-26 22:09:45 -05:00
Chong Yidong
f9b84f9f4b * etags.c (Scheme_functions): Don't loop past a null character (Bug#5601). 2010-02-20 09:11:20 -05:00
Chong Yidong
e1c6f91c71 Bump version to 23.1.92. 2010-01-29 21:09:50 -05:00
Chong Yidong
c14902e0a0 Mark last change as tiny. 2010-01-29 14:14:26 -05:00
Chong Yidong
9d77a91fda * etags.c (Fortran_functions): Handle recursive keyword (Bug#5484). 2010-01-29 14:13:13 -05:00
Juanma Barranquero
33972e8014 Fix typos in comments. 2010-01-18 04:58:35 +01:00
Mario Lang
045b9da787 Mario Lang <mlang@delysid.org>: Remove some duplicated words.
* cedet/ede/cpp-root.el (ede-cpp-root-project):
* cedet/ede/files.el (ede-expand-filename):
* cedet/ede/simple.el (ede-simple-project):
* cedet/semantic/complete.el (semantic-complete-read-tag-engine)
(semantic-complete-inline-tag-engine):
* cedet/semantic/db-el.el (semanticdb-equivalent-mode):
* cedet/semantic/db-global.el (semanticdb-equivalent-mode):
* cedet/semantic/db-javascript.el (semanticdb-equivalent-mode):
* cedet/semantic/db.el (semanticdb-equivalent-mode):
* cedet/semantic/decorate/include.el (semantic-decoration-unknown-include-describe):
* cedet/semantic/idle.el (semantic-idle-work-for-one-buffer):
* emacs-lisp/chart.el (chart-translate-namezone):
* textmodes/artist.el (artist-compute-popup-menu-table):
Remove duplicated words in doc-strings.

* srecode/doc-cpp.srt, srecode/doc-default.srt:
* srecode/doc-java.srt: Remove duplicated words.

* ede.texi (ede-target):
* org.texi (Refiling notes): Remove duplicated words.
2010-01-15 18:51:50 -08:00
Juanma Barranquero
768c0c0f39 Fix typos in comments and ChangeLogs. 2010-01-13 16:38:28 +01:00
Glenn Morris
114f9c9679 Add 2010 to copyright years. 2010-01-13 00:35:10 -08:00
Glenn Morris
6589a2f98d Set copyright year to 2010.
* Cocoa/Emacs.base/Contents/Info.plist:
* Cocoa/Emacs.base/Contents/Resources/English.lproj/InfoPlist.strings:
* GNUstep/Emacs.base/Resources/Info-gnustep.plist:
Set copyright year to 2010.

* version.el (emacs-copyright): Set copyright year to 2010.

* ebrowse.c (version):
* etags.c (print_version):
* rcs2log (Copyright): Set copyright year to 2010.
2010-01-10 23:51:51 -08:00
Chong Yidong
829f35a5bb Bump version to 23.1.91. Regenerate AUTHORS and ldefs-boot.el. 2009-12-30 21:14:46 -05:00
Juanma Barranquero
5ce6e4f452 Fix typos in ChangeLogs. 2009-12-29 02:57:40 +01:00
Chong Yidong
03dcfe0121 * lib-src/makefile.w32-in, doc/lispintro/makefile.w32-in: Use
parenthesis for macros for nmake compatibility.
2009-12-09 20:15:56 +00:00
Chong Yidong
a3ff15d6fc Bump version to 23.1.90. 2009-12-09 02:06:16 +00:00