GitLab

* Makefile.in (ns_appdir): Remove.
(install-arch-dep): Test $ns_appresdir instead of $ns_appdir.

* 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.

* 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.

does not use them.
(X11R5_INHIBIT_I18N): Remove, unused.

* 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.

* 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.

* 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.

* 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.

* Makefile.in (install-arch-dep): Update odd NS rule for Emacs version.

* src/Makefile.in (${ns_appdir}): Simplify using umask.

* 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.

* configure.in (cpp_undefs): Add mktime, register, X11.

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

* admin/CPP-DEFINES: Remove X11.

* 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.

* 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.

* 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.

* 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.

* 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@.

* 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.

* 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.

* 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.

* configure.in: Get rid of "unix" pre-defined macro when
preprocessing Makefile.  (Bug#5857)  [Backport from trunk]

* 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.

* 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.

* configure.in: Add tests for `isnan' and `copysign'.

 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.

* 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.

* 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.

* 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.

* 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@.

* 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.

* 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.

* 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@.

* 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.

* configure.in: Add check for buggy version of GCC (Bug#6031).
* configure: Regenerate
* etc/NEWS: Minor tweak to problem description.