1
0
mirror of https://git.savannah.gnu.org/git/emacs.git synced 2024-12-14 09:39:42 +00:00
Commit Graph

1048 Commits

Author SHA1 Message Date
Glenn Morris
c1d0dcfd12 Set linker-related things with configure.
* configure.in (LINKER, YMF_PASS_LDFLAGS): New output variables.
(ORDINARY_LINK): New AC_DEFINE.
(LIB_GCC): No need to set if ORDINARY_LINK.

* src/Makefile.in (LD, YMF_PASS_LDFLAGS): Set with configure, not cpp.
(GNULIB_VAR): Remove.
(LIBES): Use LIB_GCC instead of GNULIB_VAR.

* src/m/ibms390x.h (LINKER):
* src/m/macppc.h (LINKER) [GNU_LINUX]:
* src/s/aix4-2.h (ORDINARY_LINK):
* src/s/cygwin.h (LINKER):
* src/s/darwin.h (ORDINARY_LINK):
* src/s/gnu.h (ORDINARY_LINK):
* src/s/netbsd.h (LINKER):
* src/s/usg5-4.h (ORDINARY_LINK):
Move to configure.

* msdos/sed1v2.inp (LD): Edit to $(CC).
(YMF_PASS_LDFLAGS): Edit to `flags'.
2010-05-18 19:42:04 -07:00
Glenn Morris
6665f4c540 Since Cygwin does not set SYSTEM_MALLOC, $(VMLIMIT_OBJ) == vm-limit.o.
* configure.in (POST_ALLOC_OBJ) [cygwin]: Omit vm-limit.o.
(POST_ALLOC_OBJ) [!cygwin]: Set to empty.

* src/Makefile.in (otherobj): Include $(VMLIMIT_OBJ) separately from
$(POST_ALLOC_OBJ).
2010-05-17 19:49:28 -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
Stefan Monnier
5b5262f4da * Makefile.in (${lispsource}loaddefs.el): Update loaddefs.el after a pull.
* Makefile.in (src): Provide the name of the VCS file that witnesses a pull.
($(srcdir)/src/config.in): Handle accidental removal of src/config.in.
2010-05-17 17:02:06 -04:00
Glenn Morris
16455a8509 Combine the two stamp-oldxmenu cases.
* configure.in (OLDXMENU_DEPS): New output variable.
* configure: Regenerate.

* src/Makefile.in (OLDXMENU_DEPS): New, set by configure.
(stamp-oldxmenu): Use $OLDXMENU_DEPS.

* msdos/sed1v2.inp (OLDXMENU_DEPS): Edit to empty.
* msdos/sed1x.inp (OLDXMENU_DEPS): Edit to ${OLDXMENU} ../src/${OLDXMENU}.
2010-05-16 22:15:03 -07:00
Glenn Morris
9a436f0c8f * configure.in (ns_appbindir, ns_appresdir): Set using $ns_appdir.
* configure: Regenerate.
2010-05-16 16:38:13 -07:00
Glenn Morris
da53fab922 Tweak ns_app*dir values set by configure.
* configure.in (ns_appdir, ns_appbindir): Add trailing "/" to value.
* Makefile.in (install-arch-dep): Update for above change.

* src/Makefile.in (ns_appdir, ns_appbindir): Now configure adds the
trailing "/".
2010-05-16 16:31:05 -07:00
Glenn Morris
58dfab186f Remove one variable from Makefile.in.
* Makefile.in (ns_appdir): Remove.
(install-arch-dep): Test $ns_appresdir instead of $ns_appdir.
2010-05-16 16:21:06 -07:00
Glenn Morris
b02a664581 Simplify temacs build rule.
* configure.in (TEMACS_LDFLAGS2): New output variable.
* configure: Regenerate.

* msdos/sed1v2.inp (TEMACS_LDFLAGS2): Edit to $(LDFLAGS).

* src/Makefile.in (TEMACS_LDFLAGS2): New, set by configure.
(temacs${EXEEXT}): Combine the NS_IMPL_GNUSTEP case with the default.
2010-05-16 16:01:56 -07:00
Glenn Morris
8877ca0fdc Simplify temacs build rule.
* configure.in (NS_IMPL_GNUSTEP_TEMACS_LDFLAGS): New output variable.
(START_FILES): Set to empty if NS_IMPL_GNUSTEP.
(GNUSTEP_SYSTEM_HEADERS, GNUSTEP_SYSTEM_LIBRARIES): Do not output,
nothing uses.

* configure: Regenerate.

* src/Makefile.in (GNUSTEP_SYSTEM_LIBRARIES): Remove, unused.
(NS_IMPL_GNUSTEP_TEMACS_LDFLAGS): New, set by configure.
(LD) [NS_IMPL_GNUSTEP]: Set to $(CC) -rdynamic.
(temacs${EXEEXT}): Remove $LOCALCPP, never defined or referenced.
Make most of the NS_IMPL_GNUSTEP case the same as the default case.

* msdos/sed1v2.inp (GNUSTEP_SYSTEM_LIBRARIES): Remove.
(NS_IMPL_GNUSTEP_TEMACS_LDFLAGS): Edit to empty.
2010-05-16 10:58:27 -07:00
Dan Nicolaescu
35a20d6ca3 * configure.in: Remove references to usg5-4 and bsd-common, $opsys
does not use them.
(X11R5_INHIBIT_I18N): Remove, unused.
2010-05-15 22:58:55 -07:00
Glenn Morris
4235ca472b Always define LIBXMENU in src/Makefile.in.
* configure.in (LIBXMENU): Set to empty if !HAVE_X_WINDOWS.

* src/Makefile.in (LIBXMENU): Always define.

* msdos/sed1v2.inp (LIBXMENU): Edit to empty.
* msdos/sed1x.inp (LIBXMENU): Expect empty initial value.
2010-05-15 15:33:24 -07:00
Glenn Morris
6e546d181b Always define FONT_OBJ; to empty in the non-X case.
* configure.in (FONT_OBJ): Set to empty if !HAVE_X_WINDOWS.

* src/Makefile.in (FONT_DRIVERS): Remove, replace with $FONT_OBJ.
(obj, SOME_MACHINE_OBJECTS): Use $FONT_OBJ.

* msdos/sed1v2.inp (FONT_OBJ): Edit to empty for non-X case.
* msdos/sed1x.inp (FONT_OBJ): Edit to xfont.o for X case.
2010-05-15 14:31:19 -07:00
Ken Raeburn
8c5ff6dd24 Handle --version reasonably in CANNOT_DUMP configuration.
* src/emacs.c (emacs_version, emacs_copyright): New string
variables.
(Vemacs_version, Vemacs_copyright): New Lisp_Object variables.
(syms_of_emacs): Defvar them, and initialize them from the C
string variables.
(main): If initialization hasn't been done, print initial version
info from the C strings, instead of starting an interactive session.
* lisp/version.el (emacs-copyright, emacs-version): Don't define
here.
* configure.in: Look for version string in its new place.
2010-05-15 17:11:37 -04:00
Eli Zaretskii
78248b76e3 config.bat: Remove support for DJGPP v1.x. 2010-05-15 10:51:52 +03:00
Glenn Morris
1a82cca9ba Choose dependency of oldxmenu using configure.
* configure.in (OLDXMENU_TARGET): New output variable.

* src/Makefile.in (OLDXMENU_TARGET): New, set by configure.
(really-lwlib, really-oldXMenu): Always define.
($OLDXMENU): Depend on $OLDXMENU_TARGET.

* msdos/sed1v2.inp (OLDXMENU_TARGET): Edit to empty.
* msdos/sed1x.inp (OLDXMENU_TARGET): Edit to really-oldxmenu.
2010-05-14 18:55:24 -07:00
Glenn Morris
2b5f541b4f Minor NS build fixes.
* Makefile.in (install-arch-dep): Update odd NS rule for Emacs version.

* src/Makefile.in (${ns_appdir}): Simplify using umask.
2010-05-14 17:48:53 -07:00
Glenn Morris
02be533b2a Remove references to CVS directories etc in Makefiles.
* Makefile.in (install-arch-indep): Remove references to RCS, CVS,
and other files that no longer exist.

* leim/Makefile.in (install): Remove references to CVS-related files.

* lisp/Makefile.in (setwins, setwins_almost, setwins_for_subdirs):
Remove references to CVS, RCS and Old directories.

* src/Makefile.in (${ns_appdir}): Remove references to CVS-related files.
2010-05-14 17:42:22 -07:00
Glenn Morris
fbc0089011 Move some undefs from src/Makefile.in to configure.
* configure.in (cpp_undefs): Add mktime, register, X11.

* src/Makefile.in (mktime, X11, register): Move undefs to configure.

* admin/CPP-DEFINES: Remove X11.
2010-05-13 20:36:40 -07:00
Glenn Morris
11842bd8ae Define MOUSE_, TOOLTIP_, WINDOW_SUPPORT with configure.
* configure.in (GPM_MOUSE_SUPPORT): Remove.
(MOUSE_SUPPORT, TOOLTIP_SUPPORT, WINDOW_SUPPORT): New output variables.
(HAVE_WINDOW_SYSTEM, HAVE_MOUSE): Move out of AC_BOTTOM.

* src/Makefile.in (REAL_MOUSE_SUPPORT): New constant.
(GPM_MOUSE_SUPPORT): Now it's a constant.
(MOUSE_SUPPORT, TOOLTIP_SUPPORT, WINDOW_SUPPORT): Set with configure, not cpp.

* msdos/sed2x.inp (HAVE_WINDOW_SYSTEM): Define.
* msdos/sed1x.inp (TOOLTIP_SUPPORT): Edit to ${lispsource}tooltip.elc.
(WINDOW_SUPPORT): Edit to $(BASE_WINDOW_SUPPORT) $(X_WINDOW_SUPPORT).
* msdos/sed1v2.inp (MOUSE_SUPPORT): Edit to $(REAL_MOUSE_SUPPORT).
(TOOLTIP_SUPPORT, WINDOW_SUPPORT): Edit to empty.
2010-05-13 20:05:00 -07:00
Glenn Morris
489d31a455 Minor build simplification for NS.
* configure.in (NS_IMPL_GNUSTEP_INC): New output variable.
(GNUSTEP_MAKEFILES): Do not output.

* src/Makefile.in (@NS_IMPL_GNUSTEP_INC@): Use in place of #ifdef.

* msdos/sed1v2.inp (@NS_IMPL_GNUSTEP_INC@): Edit to nil.
2010-05-13 19:46:09 -07:00
Glenn Morris
3536f99349 * configure.in: Fix some paren typos. 2010-05-13 00:26:50 -07:00
Glenn Morris
472c5d6b44 Let configure set OLDXMENU, LIBXMENU if !HAVE_MENUS.
* configure.in (OLDXMENU, LIBXMENU): Set to empty if !HAVE_MENUS.

* src/Makefile.in (OLDXMENU, LIBXMENU) [!HAVE_MENUS]:
Let configure set these variables (to empty) in this case as well.
2010-05-12 20:52:07 -07:00
Glenn Morris
0116466b56 Remove some unused #define's, previously replaced by variables.
* configure.in (LD_SWITCH_X_SITE, C_SWITCH_X_SITE): Do not define.

* src/Makefile.in (LD_SWITCH_X_SITE): Define as a variable, not via cpp.
(LIBX_BASE): Use $LD_SWITCH_X_SITE.

* nt/config.nt (LD_SWITCH_X_SITE, C_SWITCH_X_SITE): Remove undefs.

* msdos/sed1v2.inp: Comment.
2010-05-12 20:18:04 -07:00
Glenn Morris
44b031a6b0 Remove unused output variable LIB_SRC_EXTRA_INSTALLABLES.
* configure.in (LIB_SRC_EXTRA_INSTALLABLES): Remove, unused.

* lib-src/Makefile.in (INSTALLABLES): Remove @LIB_SRC_EXTRA_INSTALLABLES@.

* msdos/sed3v2.inp (INSTALLABLES): No more @LIB_SRC_EXTRA_INSTALLABLES@.
2010-05-11 20:06:50 -07:00
Glenn Morris
1a0d7c0688 Move LIB_GCC from cpp to configure.
* configure.in (LIB_GCC): New output variable.

* src/Makefile.in (LIB_GCC): Set using configure, not cpp.
(GNULIB_VAR) [!ORDINARY_LINK]: Always set to $LIB_GCC.
* src/m/arm.h (LIB_GCC) [GNU_LINUX]:
* src/s/cygwin.h (LIB_GCC):
* src/s/freebsd.h (LIB_GCC):
* src/s/gnu-linux.h (LIB_GCC):
* src/s/msdos.h (LIB_GCC):
* src/s/netbsd.h (LIB_GCC):
Move to configure.

* msdos/sed1v2.inp (LIB_GCC): Edit to -Lgcc.
2010-05-11 20:01:16 -07:00
Glenn Morris
edf77e4e3b * make-dist (msdos): No more mainmake. 2010-05-10 20:10:36 -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
Juanma Barranquero
4e2af7825f Fix typos and whitespace in ChangeLogs. 2010-05-11 04:04:13 +02: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
Miles Bader
8290c6b9e6 Backport from trunk: close bug#5857.
* configure.in: Get rid of "unix" pre-defined macro when
preprocessing Makefile.  (Bug#5857)  [Backport from trunk]
2010-05-09 17:37:59 -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
Vincent Belaïche
15e12598e1 * floatfns.c (Fisnan, Fcopysign, Ffrexp, Fldexp): New functions.
* configure.in: Add tests for `isnan' and `copysign'.
2010-05-07 14:55:18 -04: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
Glenn Morris
2f86b22b05 Move LD_SWITCH_SYSTEM from cpp to configure.
* configure.in (LD_SWITCH_SYSTEM): Set with configure, not cpp.
Merges logic from src/s/* and src/Makefile.in.
(LD_SWITCH_SYSTEM_TEMACS): New output variable.

* src/Makefile.in (LD_SWITCH_SYSTEM): Set with configure, not cpp.
(LD_SWITCH_SYSTEM_EXTRA): New variable, set by configure.
(TEMACS_LDFLAGS): Use $LD_SWITCH_SYSTEM and $LD_SWITCH_SYSTEM_EXTRA,
move out of cpp section.
* src/s/freebsd.h (LD_SWITCH_SYSTEM):
* src/s/gnu-linux.h (LD_SWITCH_SYSTEM):
* src/s/netbsd.h (LD_SWITCH_SYSTEM):

* admin/CPP-DEFINES: Remove LD_SWITCH_SYSTEM.
2010-05-06 19:55:47 -07:00
Dan Nicolaescu
49ebbd6507 Define LIB_STANDARD and START_FILES using autoconf.
* s/usg5-4.h (LIB_STANDARD):
* s/netbsd.h (START_FILES):
* s/irix6-5.h (LIB_STANDARD):
* s/hpux10-20.h (LIB_STANDARD, START_FILES):
* s/gnu-linux.h (START_FILES, LIB_STANDARD):
* s/freebsd.h (START_FILES):
* s/darwin.h (START_FILES):
* s/cygwin.h (START_FILES):
* s/aix4-2.h (LIB_STANDARD):
* m/ibmrs6000.h (START_FILES): Remove, move logic to configure.in.
* Makefile.in (STARTFILES): Rename to START_FILES, define using
autoconf, not cpp.

Define START_FILES and LIB_STANDARD using autoconf.
* configure.in (START_FILES, LIB_STANDARD): New definitions, moved
here from src/s/*.h.
(HAVE_CRTIN): Remove, inline logic in the netbsd
START_FILES/LIB_STANDARD computation.
2010-05-06 17:30:56 -07: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
Glenn Morris
fa5e317ac0 Yet another missing piece of C_SWITCH commit.
* Makefile.in (C_SWITCH_SYSTEM): Use @C_SWITCH_SYSTEM@ rather than
@c_switch_system@.

* oldXMenu/Makefile.in (C_SWITCH_SYSTEM, C_SWITCH_MACHINE): Use
@C_SWITCH_SYSTEM@, @C_SWITCH_MACHINE@ rather than
@c_switch_system@, @c_switch_machine@.
2010-05-03 20:26:38 -07:00
Glenn Morris
27a2cdfc50 Move LD_SWITCH_X_SITE_AUX from cpp to autoconf.
* configure.in (LD_SWITCH_X_SITE_AUX): Use AC_SUBST only, not AC_DEFINE as well.
(LD_SWITCH_X_SITE_AUX_RPATH): New output variable.

* nt/config.nt (LD_SWITCH_X_SITE_AUX): Remove.

* src/s/gnu-linux.h (LD_SWITCH_SYSTEM): Use LD_SWITCH_X_SITE_AUX as a shell
variable.
* src/s/netbsd.h (LD_SWITCH_SYSTEM_tmp): Remove.
(LD_SWITCH_SYSTEM): Use $LD_SWITCH_X_SITE_AUX_RPATH.
* src/s/openbsd.h (LD_SWITCH_SYSTEM_tmp): Remove.
(LD_SWITCH_SYSTEM): Use $LD_SWITCH_X_SITE_AUX_RPATH instead of
LD_SWITCH_SYSTEM_tmp.
* src/Makefile.in (LD_SWITCH_X_SITE_AUX, LD_SWITCH_X_SITE_AUX_RPATH):
New variables, set by configure.
2010-05-03 20:13:35 -07:00
Glenn Morris
eb21eab59b Move LD_SWITCH_SYSTEM_TEMACS from cpp to autoconf.
* configure.in (LD_SWITCH_SYSTEM_TEMACS): New output variable.

* src/s/aix4-2.h (LD_SWITCH_SYSTEM_TEMACS): Move to configure.in.
* src/s/darwin.h (HEADERPAD_EXTRA, LIBS_NSGUI): Remove.
(LD_SWITCH_SYSTEM_TEMACS): Move to configure.in.
* src/Makefile.in (LD_SWITCH_SYSTEM_TEMACS): New variable, set by configure.
(TEMACS_LDFLAGS): Use $LD_SWITCH_SYSTEM_TEMACS.
2010-05-03 20:06:27 -07: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
da0bbbc4e3 Fix typos (Bug#6094). From Štěpán Němec. 2010-05-03 18:01:23 -04:00
Glenn Morris
3dee6fdb96 Replace some X-related cpp with autoconf.
* configure.in (LIBXT_OTHER, LIBX_OTHER): New output variables.

* src/Makefile.in (LIBX_EXTRA, LIBX_BASE): New variables.
(LIBXT_OTHER, LIBX_OTHER): New, set by configure.
(LIBXT): Set with configure, not cpp.
(LIBX): Remove.
(LIBES): Replace $LIBX with $LIBX_BASE and $LIBX_OTHER.
2010-05-02 19:10:43 -07:00
Glenn Morris
521ee9b37b * make-dist: There are no more src/m/*.inp files. 2010-05-02 18:53:58 -07:00
Chong Yidong
9978c06c88 Add check for buggy version of GCC (Bug#6031).
* configure.in: Add check for buggy version of GCC (Bug#6031).
* configure: Regenerate
* etc/NEWS: Minor tweak to problem description.
2010-05-02 21:42:50 -04:00
Dan Nicolaescu
cd03c74a9a Remove LD_SWITCH_MACHINE.
* Makefile.in (LD_SWITCH_MACHINE): Remove definition, unused.
(TEMACS_LDFLAGS): Do not use LD_SWITCH_MACHINE.

* configure.in (LD_SWITCH_MACHINE, ld_switch_machine): Remove, unused.
(ac_link): Do not use ld_switch_machine.
2010-05-01 14:38:59 -07:00
Glenn Morris
7acac9f4ce Rework previous autoconf changes, hopefully to make clearer.
* configure.in (OTHER_OBJ): Remove.
(PRE_ALLOC_OBJ, POST_ALLOC_OBJ): New output variables.

* configure: Regenerate.

* src/Makefile.in (gmallocobj, rallocobj, vmlimitobj): Initialize to null,
for clarity.
(OTHER_OBJ): Remove.
(PRE_ALLOC_OBJ, POST_ALLOC_OBJ): New, set by configure.
(otherobj): Use PRE_ALLOC_OBJ, POST_ALLOC_OBJ rather than OTHER_OBJ.
2010-04-30 20:04:51 -07:00
Glenn Morris
5a1bb006a3 Hopefully fix bug#6065.
* configure.in (OTHER_OBJ): Always include vm-limit.o on Cygwin.
Elsewhere, maybe include it.
* src/Makefile.in (vmlimitobj) [!SYSTEM_MALLOC]: New variable.
(OTHER_OBJ): Define as a separate variable, for clarity.

* configure: Regenerate.
2010-04-30 09:37:01 -07:00
Glenn Morris
d5096f16c6 Replace some xmenu cpp with autoconf.
* configure.in (TOOLKIT_LIBW) [HAVE_GTK]: Set to $GTK_LIBS.
(OLDXMENU, LIBXMENU): New output variables.
* src/Makefile.in (OLDXMENU, LIBXMENU) [HAVE_MENUS]:
Set with configure, not cpp.
(LIBW): Remove, replace with $TOOLKIT_LIBW.
2010-04-29 18:50:17 -07:00
Glenn Morris
7eb1ac33ed Replace some cpp with autoconf.
* configure.in (OTHER_OBJ): New output variable.
* src/Makefile.in (mallocobj): Remove.
(otherobj): Simplify using @OTHER_OBJ@.
2010-04-29 18:36:42 -07:00
Glenn Morris
c40f944923 Define CYGWIN_OBJ with configure, not cpp.
* configure.in (CYGWIN_OBJ): New output variable.
* src/Makefile.in (CYGWIN_OBJ): Set with configure, not cpp.
2010-04-28 00:20:39 -07:00
Glenn Morris
658f86ca32 Set GPM part of MOUSE_SUPPORT with configure, not cpp.
* configure.in (GPM_MOUSE_SUPPORT): New output variable.
* src/Makefile.in (GPM_MOUSE_SUPPORT): New, set by configure.
(MOUSE_SUPPORT) [!HAVE_MOUSE]: Use $GPM_MOUSE_SUPPORT.
2010-04-28 00:15:10 -07:00
Glenn Morris
bc0b5f6185 Set FONT_DRIVERS with configure rather than cpp.
* configure.in (FONT_OBJ): New output variable.
* src/Makefile.in (FONT_OBJ): New, set by configure.
(FONT_DRIVERS): Use $FONT_OBJ.
2010-04-28 00:08:53 -07:00
Glenn Morris
294c50a065 Move LIBXMU from cpp to configure.
* configure.in (LIBXMU): New output variable.

* src/Makefile.in (LIBXMU): Set with configure, not cpp.
* src/s/aix4-2.h (LIBXMU):
* src/s/hpux10-20.h (LIBXMU):
Remove definition, now set in configure.
2010-04-28 00:01:43 -07:00
Glenn Morris
e6ec4e9921 Move NS_OBJ, NS_SUPPORT from cpp to configure.
* configure.in (NS_OBJ, NS_SUPPORT): New output variables.
* src/Makefile.in (NS_OBJ, NS_SUPPORT): Set with configure, not cpp.
2010-04-27 23:54:25 -07:00
Glenn Morris
44e3d510df Move test for 64-bit kernel with 32-bit userland to configure.
See discussion in bug#5655.

* configure.in (machine, canonical): On amdx86-64, check for a 32-bit
userland and maybe change values to i386 (move test from s/amdx86-64.h).

* src/m/amdx86-64.h [i386]: Move this test to configure.in.
2010-04-27 23:43:38 -07:00
Glenn Morris
8fdac2c337 Move LIBXTR6 from cpp to autoconf.
* configure.in (LIBXTR6): New output variable.  Move unixware special
case here from src/s/unixware.h.

* src/Makefile.in (LIBXTR6): Set with configure, not cpp.
* src/s/unixware.h (NEED_LIBW): Remove definition.

* admin/CPP-DEFINES: Remove NEED_LIBW.
2010-04-27 01:09:01 -07:00
Glenn Morris
986fb647cc Replace LUCID_LIBW, MOTIF_LIBW with TOOLKIT_LIBW.
* configure.in (LUCID_LIBW, MOTIF_LIBW): No longer substitute in Makefiles.
(TOOLKIT_LIBW): New output variable, replacing LUCID_LIBW/MOTIF_LIBW.

* src/Makefile.in (LUCID_LIBW, MOTIF_LIBW): Remove, replacing by...
(TOOLKIT_LIBW): New, set by configure.
(@X_TOOLKIT_TYPE@): No longer define it.
2010-04-27 00:33:35 -07:00
Glenn Morris
c6ea2936cc Move MOTIF_LIBW to autoconf.
* configure.in (HAVE_MOTIF_2_1): Remove unused variable.
(LIBXP): No longer substitute in Makefiles.
(MOTIF_LIBW): New output variable.  Move system-specific settings here
from src/s files.

* src/Makefile.in (LIBXP): Remove, since included in MOTIF_LIBW.
(MOTIF_LIBW): Set with configure, not cpp.
* s/aix4-2.h (LIB_MOTIF):
* s/gnu-linux.h (LIB_MOTIF):
* s/unixware.h (LIB_MOTIF): Move to configure.in.

* admin/CPP-DEFINES: Remove LIB_MOTIF.
2010-04-27 00:02:12 -07:00
Dan Nicolaescu
ed6281b066 Reduce CPP usage.
* Makefile.in (C_SWITCH_SYSTEM, C_SWITCH_MACHINE, C_SWITCH_X_SITE): Remove
definitions and undefs.  Inline definitions in the only user.
(ALL_CFLAGS): Substitute C_SWITCH_X_SYSTEM using autoconf.

* Makefile.in (C_SWITCH_X_SYSTEM): Define using autoconf.

* Makefile.in (C_SWITCH_X_SYSTEM): Define using autoconf.

* configure.in (C_SWITCH_X_SYSTEM): Define using autoconf, not cpp.
2010-04-26 22:24:53 -07:00
Dan Nicolaescu
aaa36002be Reduce CPP usage.
* Makefile.in (LIB_X11_LIB): Remove, inline in the only user.
(obj): Use autoconf for unexec instead of cpp.

* configure.in (LIB_X11_LIB): Remove, inline in the only user.
(unexec): Define unconditionally, all platforms define
UNEXEC.  AC_SUBST it.
(UNEXEC_SRC): Remove, unused.
2010-04-26 20:47:47 -07:00
Glenn Morris
8ea5f2d92f Remove some AC_DEFINEs that are now unused.
* configure.in (HAVE_MOTIF_2_1, HAVE_LIBXP): Remove unused AC_DEFINEs,
replaced by LIBXP.

* configure, src/config.in: Regenerate.
2010-04-26 20:32:39 -07:00
Glenn Morris
76cda504fb Use $CRT_DIR in more places.
* configure.in (--with-crt-dir): Doc fix (now valid for all platforms).
(CRT_DIR): On (powerpc64|sparc64)-*-linux-gnu*, default to /usr/lib64.
On hpux10-20, default to /lib.

* src/m/amdx86-64.h (START_FILES, LIB_STANDARD): Change the logic around,
since the defaults (set by the system file) are fine in most cases.
[GNU_LINUX, __OpenBSD__, __NetBSD__, __APPLE__]: Remove sections.
* src/m/ibms390x.h (START_FILES, LIB_STANDARD):
* src/m/macppc.h (START_FILES, LIB_STANDARD) [GNU_LINUX]:
* src/m/sparc.h (START_FILES, LIB_STANDARD) [__linux__]:
Remove definitions, since they are set correctly in s/gnu-linux.h.
* src/s/freebsd.h (START_FILES, LIB_STANDARD):
* src/s/gnu-linux.h (START_FILES, LIB_STANDARD):
* src/s/hpux10-20.h (START_FILES):
* src/s/netbsd.h (START_FILES, LIB_STANDARD, START_FILES_1, END_FILES_1):
Use $CRT_DIR in place of fixed /usr/lib, /lib directories.

* src/Makefile.in: Comment.
2010-04-26 20:14:14 -07:00
Glenn Morris
b678dd8b8e Replace some more cpp with autoconf.
* configure.in (LUCID_LIBW, LIBXP, WIDGET_OBJ): New output variables.

* src/Makefile.in (LIBXP, LUCID_LIBW, WIDGET_OBJ): Set via configure.
(MOTIF_LIBW): Use $LIBXP.
(otherobj): Use $WIDGET_OBJ.
2010-04-26 19:36:20 -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
Glenn Morris
70eab5c182 Close bug#5655.
* 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-04-23 19:23:22 -07:00
Glenn Morris
e5d1fb104b ChangeLog fixes. 2010-04-22 22:40:33 -07:00
Dan Nicolaescu
4e7f249cba * configure.in (REAL_CFLAGS, CFLAGS): Restore -g for gcc. 2010-04-22 09:37:58 -07:00
Miles Bader
cdbce48ee4 Update ChangeLog 2010-04-22 09:15:20 +09:00
Andreas Schwab
bf3126f629 Avoid non-portable shell command negation
* configure.in: Revert last change.
2010-04-21 23:44:48 +02:00
Jan Djärv
e765bf582c configure.in: Change "if test ! -f" to "if ! test -f".
Regenerate configure.
2010-04-21 18:41:29 +02:00
Glenn Morris
10efe30244 Remove some more cpp in favor of autoconf.
* configure.in (LIBSELINUX_LIBS): Always substitute in Makefiles.
(GTK_OBJ, DBUS_OBJ, LIBXSM, XMENU_OBJ, XOBJ): New output variables.

* src/Makefile.in (DBUS_OBJ, GTK_OBJ, XMENU_OBJ, XOBJ):
Define using autoconf, not cpp.
(LIBXSM): New variable, set by autoconf.
(LIBXT): Use $LIBXSM.
2010-04-20 23:35:35 -07:00
Glenn Morris
2807228d2c Remove LIBSELINUX_LIBS need for cpp in Makefiles.
* configure.in (LIBSELINUX_LIBS): Always substitute in Makefiles.
* src/Makefile.in (LIBSELINUX_LIBS): Remove containing #ifdef.
2010-04-20 20:33:04 -07:00
Karel Klíc
574c05e219 Add SELinux support.
* configure.in: New option: --with(out)-selinux, on by default.
Set HAVE_LIBSELINUX if we find libselinux, and substitute
LIBSELINUX_LIBS in Makefiles.

* src/Makefile.in (LIBSELINUX_LIBS): New.
(LIBES): Add $LIBSELINUX_LIBS.
* src/eval.c, lisp.h (call7): New function.
* src/fileio.c [HAVE_LIBSELINUX]: Include selinux headers.
(Ffile_selinux_context, Fset_file_selinux_context):
New functions.
(Fcopy_file): New parameter preserve-selinux-context.
(Frename_file): Preserve selinux context when renaming by copy-file.

* lisp/files.el (backup-buffer): Handle SELinux context, and return it
if a backup was made by renaming.
(backup-buffer-copy): Set SELinux context to the target file.
(basic-save-buffer): Set SELinux context of the newly written file.
(basic-save-buffer-1): Now it also returns any SELinux context.
(basic-save-buffer-2): Set SELinux context of the newly created file,
and return it.
* lisp/net/tramp.el (tramp-file-name-for-operation):
Add file-selinux-context.
2010-04-20 20:02:58 -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
Dan Nicolaescu
8224f93d18 Remove all uses of LIBX11_SYSTEM.
* Makefile.in (LIBX11_SYSTEM): Remove.
* s/msdos.h (LIBX11_SYSTEM): Do not define, define LIBS_SYSTEM
instead.

* configure.in: Remove all references to LIBX11_SYSTEM.
2010-04-01 16:08:14 -07:00
Dan Nicolaescu
32a8894e5b Remove all uses of C_DEBUG_SWITCH and LIBS_DEBUG.
* s/usg5-4.h (LIBS_DEBUG):
* s/irix6-5.h (C_DEBUG_SWITCH):
* s/gnu-linux.h (LIBS_DEBUG):
* s/darwin.h (LIBS_DEBUG):
* s/bsd-common.h (LIBS_DEBUG):
* s/aix4-2.h (LIBS_DEBUG, C_DEBUG_SWITCH):
* m/iris4d.h (LIBS_DEBUG):
* m/hp800.h (LIBS_DEBUG): Remove definitions.

* Makefile.in (LIBES): Remove reference to LIBS_DEBUG.
(LIBS_DEBUG): Remove definition.

* configure.in: Remove all references to C_DEBUG_SWITCH.
2010-03-29 19:47:23 -07:00
Nick Roberts
146b8b16f3 *** empty log message *** 2010-03-30 13:22:34 +13:00
Nick Roberts
691cf4a0a2 Restore GDB/MI fuctionality removed by 2009-12-29T07:15:34Z!nickrob@snap.net.nz:
added:
  lisp/progmodes/gdb-mi.el
removed:
  lisp/progmodes/gdb-ui.el
modified:
  doc/emacs/building.texi
  doc/emacs/emacs.texi
  etc/NEWS
  lisp/Makefile.in
  lisp/progmodes/gud.el
2010-03-28 02:27:43 +13: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
Dan Nicolaescu
15d25dc050 Remove support for old UNIX System V systems.
* s/unixware.h: Add the contents of s/usg-5-4-2.h.
* s/usg-5-4-2.h: Remove.

* configure.in: Remove support for old UNIX System V systems and
for Unixware on non-x86 machines.
2010-03-19 23:48:13 -07:00
Dan Nicolaescu
07e339e488 Remove support for Solaris on PPC and for old versions.
* s/sol2-6.h: Add the contents of s/sol-2.3.h, s/sol-2.4.h, s/sol-2.5.h.
(LD_SWITCH_SYSTEM, USE_MMAP_FOR_BUFFERS): Remove #defines/#undef
that cancel each other.
* s/sol2-3.h:
* s/sol2-4.h:
* s/sol2-5.h: Remove.
* m/ibmrs6000.h: Remove code for USG5_4, this file is only used on AIX.
(NO_REMAP): Remove, unused.
(UNEXEC): Move definition ...
* s/aix4-2.h (UNEXEC): ... here.

* configure.in:	Remove support for Solaris on PPC and for old versions.
2010-03-19 22:52:55 -07:00
Dan Nicolaescu
605f35cdaa Remove non-working support for lynxos 3.0.
* s/lynxos.h: Remove file.

* unexec.c (unexec, adjust_lnnoptrs): Do not depend on
COFF_BSD_SYMBOLS, nothing defines it anymore.

* os.texi (System Environment): Do not mention lynxos.

* configure.in: Remove non-working lynxos port.
2010-03-19 18:03:39 -07:00
Dan Nicolaescu
a3ab37b334 * .dir-locals.el (c-mode): Turn on whitespace-mode for diff-mode. 2010-03-19 02:46:08 -07:00
Glenn Morris
866b0a7bf7 * configure.in (HAVE_LIBNCURSES): Add a description to make autoheader happy. 2010-03-18 19:42:32 -07:00
Glenn Morris
eef223cc9b Doc fix.
* configure.in (--with-x-toolkit): In the help text, say which options
are synonyms.
2010-03-17 22:54:09 -07: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
Eli Zaretskii
a96f6398e1 Spell out in ChangeLog the purpose of 2010-03-12T16:34:27Z!eliz@gnu.org. 2010-03-13 03:52:05 -05:00
Eli Zaretskii
6da23aaa4f Don't use termcap.c on Posix platforms, only on MS-DOS.
configure.in <AC_CHECK_HEADERS>: Remove termcap.h.
 configure: Regenerated.
 src/Makefilie.in (termcapobj): Move termcap.o from here...
 (MSDOS_OBJ): ...to here.
 (termcapobj) [!LIBS_TERMCAP]: Remove specialized value, as it is
 now identical to when LIBS_TERMCAP is defined.
 src/term.c: Remove (ifdef'ed away) inclusion of termcap.h.
 src/cm.c: Remove (ifdef'ed away) inclusion of termcap.h.
 src/config.in: Regenerated.
2010-03-12 11:34:27 -05:00
Chong Yidong
288f9fc069 Bump version to 24.0.50. 2010-03-10 10:17:13 -05:00
Juri Linkov
5bcc99317e * .bzrignore: Add TAGS-LISP. 2010-01-31 23:28:22 +02:00
Chong Yidong
c6d09b8da9 Account for utmp.h availability.
* configure.in: Check for utmp.h availability (FreeBSD 9.x lacks
this header file).

* filelock.c: Include utmp.h only when HAVE_UTMP_H (FreeBSD 9.x
lacks this header file).
2010-01-23 17:15:22 -05:00
Glenn Morris
114f9c9679 Add 2010 to copyright years. 2010-01-13 00:35:10 -08:00
Juanma Barranquero
ca22a44072 * .bzrignore: Ignore all .exe, instead of individual files. 2010-01-13 00:55:23 +01:00