1. 25 May, 2010 2 commits
    • Glenn Morris's avatar
      Move some stuff from LD_SWITCH_SYSTEM to LD_SWITCH_SYSTEM_TEMACS. · 8009a5e8
      Glenn Morris authored
      * configure.in (LD_SWITCH_SYSTEM): Move some gnu-linux stuff...
      (LD_SWITCH_SYSTEM_TEMACS): ... to here.
      
      * src/Makefile.in (LD_SWITCH_SYSTEM_TEMACS): Move definition after some
      variables it may reference.
      8009a5e8
    • Glenn Morris's avatar
      Remove LD_SWITCH_SYSTEM_EXTRA. · e5458003
      Glenn Morris authored
      * configure.in (LD_SWITCH_SYSTEM_EXTRA): Remove.
      (LD_SWITCH_SYSTEM_TEMACS): Put darwin stuff from LD_SWITCH_SYSTEM_EXTRA
      here instead.
      
      * src/Makefile.in (LD_SWITCH_SYSTEM_EXTRA): Remove.
      (TEMACS_LDFLAGS): Remove LD_SWITCH_SYSTEM_EXTRA.
      
      * msdos/sed1v2.inp (LD_SWITCH_SYSTEM_EXTRA): No longer present.
      e5458003
  2. 24 May, 2010 1 commit
  3. 21 May, 2010 4 commits
    • Glenn Morris's avatar
      * configure.in (MKDEPDIR): Parallel build tweak. · 6a6dbace
      Glenn Morris authored
      * src/Makefile.in: Comment.
      6a6dbace
    • Glenn Morris's avatar
      Handle some HAVE_NS Makefile conditionals with configure. · 66dbf213
      Glenn Morris authored
      * configure.in (ns_frag): New output file.
      
      * src/Makefile.in (${ns_appdir}, ${ns_appbindir}Emacs, ns-app):
      Move these rules to ns.mk.
      * ns.mk: New file.  Copyright years based on date of nextstep merge.
      
      * msdos/sed1v2.inp(@ns_frag@): Edit to nothing.
      66dbf213
    • Glenn Morris's avatar
      Build simplifications for oldxmenu. · 04384b2d
      Glenn Morris authored
      * configure.in (OLDXMENU): Set to "nothing" if !HAVE_X11 || USE_GTK.
      (OLDXMENU_TARGET): Set to empty if USE_GTK.
      
      * src/Makefile.in (../src/$(OLDXMENU), $(OLDXMENU)): Always define rules.
      
      * msdos/sed1x.inp (OLDXMENU): Replace any initial value.
      * msdos/sed1v2.inp (OLDXMENU): Edit to "nothing".
      04384b2d
    • Glenn Morris's avatar
      Handle CANNOT_DUMP (partially) with configure. · e8752c66
      Glenn Morris authored
      * configure.in (cannot_dump): New output variable.
      
      * src/Makefile.in (CANNOT_DUMP): New, set by configure.
      (emacs${EXEEXT}, bootstrap-emacs${EXEEXT}): Use $CANNOT_DUMP.
      
      * msdos/sed1v2.inp (CANNOT_DUMP): Edit to no.
      e8752c66
  4. 20 May, 2010 3 commits
    • enami tsugutomo's avatar
      Use terminfo rather than termcap on recent NetBSD. · 0a5a0089
      enami tsugutomo authored
      * configure.in: On NetBSD, if terminfo is found, use it in preference
      to termcap.  (Bug#6190)
      0a5a0089
    • Glenn Morris's avatar
      Handle auto-depend with configure. · 9d5cf9b6
      Glenn Morris authored
      * make-dist (src): Include *.mk.
      * config.bat: Concatenate deps.mk onto the end of src/Makefile.
      * configure.in (DEPFLAGS, MKDEPDIR): New output variables.
      (deps_frag): New output file.
      (AUTO_DEPEND): Remove this definition.
      
      * src/Makefile.in (DEPDIR): New constant.
      (DEPFLAGS): Set with configure, not cpp.
      (MKDEPDIR): New, set by configure.
      (.c.o, .m.o, ecrt0.o): Use $MKDEPDIR.
      (clean): Use $DEPDIR.
      (deps_frag): Include from configure.
      Move static/dynamic dependency stuff to deps.mk/autodeps.mk.
      * src/deps.mk, src/autodeps.mk: New files, extracted from Makefile.in.
      
      * msdos/sed1v2.inp (DEPFLAGS, deps_frag): Edit to empty.
      (MKDEPDIR): Edit to ':'.
      9d5cf9b6
    • Glenn Morris's avatar
  5. 19 May, 2010 1 commit
    • Glenn Morris's avatar
      Set linker-related things with configure. · c1d0dcfd
      Glenn Morris authored
      * 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'.
      c1d0dcfd
  6. 18 May, 2010 3 commits
    • Glenn Morris's avatar
      Since Cygwin does not set SYSTEM_MALLOC, $(VMLIMIT_OBJ) == vm-limit.o. · 6665f4c5
      Glenn Morris authored
      * 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).
      6665f4c5
    • Glenn Morris's avatar
      Set rallocobj with configure, not cpp. · 40dc6bf4
      Glenn Morris authored
      * 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.
      40dc6bf4
    • Glenn Morris's avatar
      Define some malloc objects with configure, not cpp. · be4ff9da
      Glenn Morris authored
      * 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.
      be4ff9da
  7. 17 May, 2010 2 commits
  8. 16 May, 2010 6 commits
    • Glenn Morris's avatar
      * configure.in (ns_appbindir, ns_appresdir): Set using $ns_appdir. · 9a436f0c
      Glenn Morris authored
      * configure: Regenerate.
      9a436f0c
    • Glenn Morris's avatar
      Tweak ns_app*dir values set by configure. · da53fab9
      Glenn Morris authored
      * 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 "/".
      da53fab9
    • Glenn Morris's avatar
      Remove one variable from Makefile.in. · 58dfab18
      Glenn Morris authored
      * Makefile.in (ns_appdir): Remove.
      (install-arch-dep): Test $ns_appresdir instead of $ns_appdir.
      58dfab18
    • Glenn Morris's avatar
      Simplify temacs build rule. · b02a6645
      Glenn Morris authored
      * 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.
      b02a6645
    • Glenn Morris's avatar
      Simplify temacs build rule. · 8877ca0f
      Glenn Morris authored
      * 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.
      8877ca0f
    • Dan Nicolaescu's avatar
      * configure.in: Remove references to usg5-4 and bsd-common, $opsys · 35a20d6c
      Dan Nicolaescu authored
      does not use them.
      (X11R5_INHIBIT_I18N): Remove, unused.
      35a20d6c
  9. 15 May, 2010 7 commits
    • Glenn Morris's avatar
      Always define LIBXMENU in src/Makefile.in. · 4235ca47
      Glenn Morris authored
      * 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.
      4235ca47
    • Glenn Morris's avatar
      Always define FONT_OBJ; to empty in the non-X case. · 6e546d18
      Glenn Morris authored
      * 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.
      6e546d18
    • Ken Raeburn's avatar
      Handle --version reasonably in CANNOT_DUMP configuration. · 8c5ff6dd
      Ken Raeburn authored
      * 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.
      8c5ff6dd
    • Eli Zaretskii's avatar
      config.bat: Remove support for DJGPP v1.x. · 78248b76
      Eli Zaretskii authored
      78248b76
    • Glenn Morris's avatar
      Choose dependency of oldxmenu using configure. · 1a82cca9
      Glenn Morris authored
      * 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.
      1a82cca9
    • Glenn Morris's avatar
      Minor NS build fixes. · 2b5f541b
      Glenn Morris authored
      * Makefile.in (install-arch-dep): Update odd NS rule for Emacs version.
      
      * src/Makefile.in (${ns_appdir}): Simplify using umask.
      2b5f541b
    • Glenn Morris's avatar
      Remove references to CVS directories etc in Makefiles. · 02be533b
      Glenn Morris authored
      * 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.
      02be533b
  10. 14 May, 2010 3 commits
    • Glenn Morris's avatar
      Move some undefs from src/Makefile.in to configure. · fbc00890
      Glenn Morris authored
      * configure.in (cpp_undefs): Add mktime, register, X11.
      
      * src/Makefile.in (mktime, X11, register): Move undefs to configure.
      
      * admin/CPP-DEFINES: Remove X11.
      fbc00890
    • Glenn Morris's avatar
      Define MOUSE_, TOOLTIP_, WINDOW_SUPPORT with configure. · 11842bd8
      Glenn Morris authored
      * 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.
      11842bd8
    • Glenn Morris's avatar
      Minor build simplification for NS. · 489d31a4
      Glenn Morris authored
      * 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.
      489d31a4
  11. 13 May, 2010 3 commits
  12. 12 May, 2010 2 commits
    • Glenn Morris's avatar
      Remove unused output variable LIB_SRC_EXTRA_INSTALLABLES. · 44b031a6
      Glenn Morris authored
      * 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@.
      44b031a6
    • Glenn Morris's avatar
      Move LIB_GCC from cpp to configure. · 1a0d7c06
      Glenn Morris authored
      * 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.
      1a0d7c06
  13. 11 May, 2010 3 commits