GitLab

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

* src/Makefile.in (THIS_IS_MAKEFILE): Remove, unused.
* lib-sc/Makefile.in (THIS_IS_MAKEFILE): Remove, unused.
* admin/CPP-DEFINES (THIS_IS_MAKEFILE): Remove.

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

 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.

 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.

* s/gnu.h (START_FILES): Remove empty definition.

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

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

* Makefile.in (ORDINARY_LINK): Remove setting LIB_STANDARD based
on it, not used anymore.

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

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

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

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

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

* configure.in (OTHER_OBJ): New output variable.
* src/Makefile.in (mallocobj): Remove.
(otherobj): Simplify using @OTHER_OBJ@.

* src/Makefile.in (dispnew.o, frame.o, fringe.o, font.o, fontset.o)
(keyboard.o, window.o, xdisp.o, xfaces.o, menu.o):
Don't bother making nsgui.h dependency platform-specific.

* src/Makefile.in (BASE_WINDOW_SUPPORT, X_WINDOW_SUPPORT): New variables.
(WINDOW_SUPPORT) [HAVE_WINDOW_SYSTEM]: Use them.

* configure.in (CYGWIN_OBJ): New output variable.
* src/Makefile.in (CYGWIN_OBJ): Set 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.

* configure.in (FONT_OBJ): New output variable.
* src/Makefile.in (FONT_OBJ): New, set by configure.
(FONT_DRIVERS): Use $FONT_OBJ.

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

* configure.in (NS_OBJ, NS_SUPPORT): New output variables.
* src/Makefile.in (NS_OBJ, NS_SUPPORT): Set with configure, not cpp.

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

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

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

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

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

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

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

* Makefile.in (LIBS_MACHINE): Remove all uses, unused.
* configure.in (LIBS_MACHINE): Remove, unused.

* s/darwin.h (LIB_MATH): Do not define here, move to configure.
* s/cygwin.h (LIB_MATH): Likewise.
* Makefile.in (LIB_MATH): Do not define with cpp.
(LIBES): Use autoconf for LIB_MATH.

* configure.in (LIB_MATH): New output variable.  Set it for some systems.

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

* Makefile.in (ALL_CFLAGS): Remove C_SWITCH_X_MACHINE, unused.