1. 28 Jul, 2012 1 commit
    • Paul Eggert's avatar
      Use Gnulib stdalign and environ modules (Bug#9772, Bug#9960). · e32a5799
      Paul Eggert authored
      * .bzrignore: Add lib/stdalign.h.
      * config.bat: Do not set NO_DECL_ALIGN; no longer needed.
      Copy lib/stdalign.in.h to lib/stdalign.in-h as needed.
      * configure.ac (HAVE_ATTRIBUTE_ALIGNED): Remove the code that
      fiddles with this, as gnulib now does this for us.
      * admin/merge-gnulib: Add environ, stdalign.
      * m4/environ.m4: New file, from gnulib.
      * lib/gnulib.mk, m4/gnulib-comp.m4: Regenerate.
      * lib/stdalign.in.h, m4/stdalign.m4: New files, from gnulib.
      * sed2v2.inp (HAVE_ATTRIBUTE_ALIGNED): Remove edit.
      * sedlibmk.inp (STDALIGN_H, @GL_GENERATE_STDALIGN_H_TRUE@)
      (GL_GENERATE_STDALIGN_H_FALSE): New edits.
      * nt/config.nt (HAVE_ATTRIBUTE_ALIGNED): Remove.
      * src/alloc.c (XMALLOC_BASE_ALIGNMENT, GC_POINTER_ALIGNMENT, pure_alloc):
      Simplify by using alignof.
      (pure_alloc) [! USE_LSB_TAG]: Don't over-align EMACS_INT values.
      * src/lisp.h: Include <stdalign.h>.
      (GCALIGNMENT): New macro and constant.
      (DECL_ALIGN): Remove.  All uses replaced by alignas (GCALIGNMENT).
      (USE_LSB_TAG): ifdef on alignas, not on DECL_ALIGN.
      (stdalign): New macro, if not already defined.
      e32a5799
  2. 27 May, 2012 1 commit
    • Eli Zaretskii's avatar
      Fix the MSDOS build following gnulib update. · 42a53d84
      Eli Zaretskii authored
       config.bat (lib): Create/update lib/stdalign.in-h and
       lib/sys_types.in-h.
       msods/sedlibmk.inp (GNULIB_GL_UNISTD_H_GETOPT, GNULIB_POSIX_OPENPT)
       (GNULIB_ISATTY, GNULIB_PTSNAME_R, GNULIB_RANDOM)
       (GNULIB_SETHOSTNAME, HAVE_POSIX_OPENPT, HAVE_PTSNAME_R)
       (HAVE_RANDOM, HAVE_SETHOSTNAME, NEXT_SYS_TYPES_H)
       (NEXT_AS_FIRST_DIRECTIVE_SYS_TYPES_H, REPLACE_FTRUNCATE)
       (REPLACE_ISATTY, REPLACE_PTSNAME_R, REPLACE_RANDOM_R)
       (REPLACE_STRTOIMAX, STDALIGN_H, WINDOWS_64_BIT_OFF_T)
       (WINDOWS_64_BIT_ST_SIZE, GL_GENERATE_STDALIGN_H_TRUE)
       (GL_GENERATE_STDALIGN_H_FALSE): Edit as appropriate for DJGPP.
       (cat FOO): Edit into "sed -e '' FOO >>".
      42a53d84
  3. 11 Jan, 2012 1 commit
  4. 05 Jan, 2012 1 commit
  5. 31 Oct, 2011 1 commit
    • Eli Zaretskii's avatar
      Fix previous commit. · 07f3add9
      Eli Zaretskii authored
       config.bat: Use config.in and Makefile.in from src/ and lib/, if
       they exist there, else from autogen/.
       make-dist: Don't add `autogen'.
      07f3add9
  6. 29 Sep, 2011 2 commits
    • Eli Zaretskii's avatar
      7cc013b5
    • Eli Zaretskii's avatar
      Fix the MSDOS build. · 31bed486
      Eli Zaretskii authored
       msdos/mainmake.v2 (boot): Condition the value on the existence of
       autogen/README, not admin/admin.el, since the latter is now part
       of the release tarball.
       (install): Don't copy lib-src/fns.el, as that file is no longer
       generated in that directory.
       msdos/sed1v2.inp (LIB_PTHREAD, LIB_PTHREAD_SIGMASK): Edit to empty.
       (SETTINGS_CFLAGS, SETTINGS_LIBS): Edit these instead of
       GCONF_CFLAGS and GCONF_LIBS.
       msdos/sedlibmk.inp (ALLOCA_H, AR, ARFLAGS, GNULIB_CHDIR, GNULIB_DUP)
       (GNULIB_FDATASYNC, GNULIB_FDOPEN, GNULIB_FSTAT, GNULIB_PCLOSE)
       (GNULIB_PTHREAD_SIGMASK, GNULIB_RAISE, GNULIB_SIGACTION)
       (GNULIB_SIGPROCMASK, GNULIB_SIGNAL_H_SIGPIPE, HAVE_FDATASYNC)
       (HAVE_PCLOSE, HAVE_POPEN, HAVE_POSIX_SIGNALBLOCKING)
       (HAVE_PTHREAD_SIGMASK, HAVE_RAISE, HAVE_SIGACTION)
       (HAVE_SIGHANDLER_T, HAVE_SIGINFO_T, HAVE_SIGSET_T)
       (HAVE_STRUCT_SIGACTION_SA_SIGACTION)
       (HAVE_TYPE_VOLATILE_SIG_ATOMIC_T, LIB_PTHREAD)
       (LIB_PTHREAD_SIGMASK, NEXT_AS_FIRST_DIRECTIVE_SIGNAL_H)
       (NEXT_SIGNAL_H, REPLACE_FDOPEN, REPLACE_PTHREAD_SIGMASK)
       (REPLACE_RAISE): New edits.
       (gl_LIBOBJS): Remove md5.o, filemode.o, and sha1.o.  Add
       pthread_sigmask.o.
       (@GL_GENERATE_ALLOCA_H_TRUE@, @GL_GENERATE_ALLOCA_H_FALSE@): Edit
       to comment out unneeded lines.
       (warn-on-use.h): Edit the recipe commands to work with DJGPP
       without requiring a Unixy shell.
       msdos/inttypes.h (strtoimax) [DJGPP < 2.04]: New macro.
       msdos/sed2v2.inp (HAVE_ALLOCA, HAVE_DECL_STRTOLL, HAVE_DECL_STRTOIMAX)
       (HAVE_STRTOLL, HAVE_SIGSET_T, HAVE_SNPRINTF): New edits.
      
       .bzrignore: Add ./GNUMakefile.unix.
       config.bat: Rename GNUMakefile, so it is not run on MS-DOS.
       Rename signal.in.h and alloca.in.h.
      
       src/sysdep.c (snprintf) [EOVERFLOW]: If EOVERFLOW is not defined,
       use EDOM.
      31bed486
  7. 25 Jul, 2011 1 commit
  8. 24 Jul, 2011 1 commit
    • Paul Eggert's avatar
      Merge from gnulib, using build-aux to remove clutter. · 24e0f6b1
      Paul Eggert authored
      * m4/largefile.m4: New file, so that Emacs does not mess up when
      accessing files with large inode numbers in MacOS X 10.5 and later.
      * m4/nocrash.m4: New file, to avoid triggering background debugger
      and/or create core dumps during 'configure'.
      * build-aux/move-if-change: Renamed from move-if-change.
      * build-aux/snippet/arg-nonnull.h: Renamed from arg-nonnull.h.
      * build-aux/snippet/c++defs.h: Renamed from c++defs.h.
      * build-aux/snippet/warn-on-use.h: Renamed from warn-on-use.h.
      * build-aux/snippet/_Noreturn.h: New file, for draft C1X _Noreturn.
      * .bzrignore: The autogenerated files compile, config.guess,
      config.sub, depcomp, install-sh, and missing are now in build-aux.
      * Makefile.in (epaths-force, sync-from-gnulib):
      move-if-change is now in build-aux.
      (GNULIB_TOOL_FLAGS): Avoid threadlib; this is now a prerequisite
      of gnulib's pthread_sigmask module, but Emacs doesn't need it.
      (mkdir): install-sh is now in build-aux.
      * config.bat: c++defs.h is now in build-aux/snippets.
      * configure.in: Specify AC_CONFIG_AUX_DIR with build-aux (the
      usual parameter).
      * lib/gnulib.mk, m4/gl-comp.m4: Regenerate.
      * lib/makefile.w32-in (ARG_NONNULL_H): arg-nonnull.h moved
      to build-aux/snippet.
      * lib/pthread_sigmask.c, lib/stdlib.in.h, m4/extensions.m4:
      * m4/getopt.m4, m4/gnulib-common.m4, m4/pthread_sigmask.m4:
      Merge from gnuilib.  This fixes porting bugs on Cygwin, Irix, and
      Solaris, enables MacOS extensions, and enables nocrash during
      'configure'.
      * make-dist: Adjust to new build-aux and build-aux/snippit dirs.
      * admin/notes/copyright: The files compile, config.guess, config.sub,
      depcomp, install-sh, missing, and move-if-change are now in the
      new build-aux subdirectory.  The files arg-nonnull.h, c++defs.h,
      and warn-on-use.h are now in build-aux/snippets.  New file
      build-aux/snippets/_Noreturn.h.
      * leim/Makefile.in (install): install-sh is now in build-aux.
      * lib-src/Makefile.in ($(DESTDIR)${archlibdir}): install-sh moved
      to build-aux.
      * msdos/sedlibmk.inp (CONFIG_CLEAN_VPATH_FILES): Adjust to snippet moves
      from top level to build-aux/snippet.
      * src/Makefile.in (gl-stamp): move-if-change is now in build-aux.
      24e0f6b1
  9. 20 May, 2011 1 commit
    • Eli Zaretskii's avatar
      Fix the MSDOS build as follows from 2011-05-19T06:04:16Z!rgm@gnu.org,... · 7285dc67
      Eli Zaretskii authored
      Fix the MSDOS build as follows from 2011-05-19T06:04:16Z!rgm@gnu.org, 2011-05-20T00:41:03Z!rgm@gnu.org.
      
       config.bat: Concatenate lisp.mk onto the end of src/Makefile.
       msdos/sed1v2.inp (make-docfile commands): Recognize only if the line
       begins with a TAB.  Use $(etc) rather than a literal "../etc".
       (`sed SED-COMMAND $(srcdir)/lisp.mk`): Edit to replace with "$(lisp).
       (@lisp_frag@): Edit out.
       msdos/sedlibmk.inp (GNULIB_GROUP_MEMBER, HAVE_GROUP_MEMBER): Edit to
       zero.
       src/callproc.c (Fcall_process) [MSDOS]: Fix arguments to
       report_file_error introduced by the change from 2011-05-07.
      7285dc67
  10. 25 Mar, 2011 2 commits
    • Eli Zaretskii's avatar
      Fix previous commit. · f4d87671
      Eli Zaretskii authored
       config.bat: Use autogen/config.in in one more place.
       msdos/sedlibmk.inp (GNULIB_PRINTF, GNULIB_PRINTF_POSIX): Add missing
       variables.
       (MKDIR_P): Fix replacement command.
       (NEXT_AS_FIRST_DIRECTIVE_STDIO_H, NEXT_STDIO_H): Edit to
       "<stdio.h>", as lib/stdio.h cannot be left unused.
      f4d87671
    • Eli Zaretskii's avatar
      Adapt config.bat and msdos/sedlibmk.inp to autogen and addition of stdio. · 07da4b3c
      Eli Zaretskii authored
       msdos/sedlibmk.inp: Adapt to addition of the gnulib stdio module.
       config.bat: Generate src/config.h and lib/Makefile from
       autogen/config.in and autogen/Makefile.in.
      07da4b3c
  11. 26 Feb, 2011 1 commit
    • Eli Zaretskii's avatar
      Fix the MS-DOS configury due to new gnulib modules. · 945d8b44
      Eli Zaretskii authored
       config.bat: Rename stdint.in.h and sys_stat.in.h.  Call
       depfiles.bat even if lib/deps already exist.
       msdos/depfiles.bat: Create a dummy .Po file only if a file by the same
       name does not already exist in the deps/ subdirectory.
      945d8b44
  12. 19 Feb, 2011 2 commits
    • Eli Zaretskii's avatar
      Fix generation of auto-dependency files in lib/. · 219463da
      Eli Zaretskii authored
       .bzrignore: Add lib/deps/.
       config.bat: Generate *.Po files in lib/deps.
       msdos/sedlibmk.inp (CONFIG_CLEAN_VPATH_FILES): Fix editing of *-clean
       rules.
       msdos/depfiles.bat: New file.
      219463da
    • Eli Zaretskii's avatar
      Initial version of fix for the MS-DOS build, not yet tested. · 9d9d12cd
      Eli Zaretskii authored
       config.bat: Configure in `lib'.
       msdos/sedlibmk.inp: New file.
       msdos/sedlibcf.inp: New file.
       msdos/sed1v2.inp (NS_OBJC_OBJ): Edit to empty.
       (@true): Edit to "@rem".
       (move-if-change): Edit to "update".
       (echo): Edit to "djecho".
       (cd $(lib) && ...): Edit to "$(MAKE) -C ...".
       msdos/mainmake.v2 (version): Remove, no longer needed (config.in
       defines VERSION).
       (all): Add lib.
       (lib): New target and recipe.
       (lib-src): Depend on lib.
       (src): Depend on lib and lib-src.
       (clean, mostlyclean, distclean, maintainer-clean, extraclean)
       (bootstrap-clean): Recurse into lib.
       msdos/sed2v2.inp: Remove workaround for the "#if ! HAVE_MKTIME ||
       BROKEN_MKTIME" stuff -- it's no longer in src/config.in.
       (HAVE_ATTRIBUTE_ALIGNED, HAVE_C99_STRTOLD, HAVE_DECL_GETENV)
       (HAVE__BOOL): Edit to 1.
       (VERSION, inline, restrict): Edit for DJGPP.
       src/s/msdos.h (strtold): Define to _strtold.
       admin/admin.el (set-version): Add msdos/sed2v2.inp.
      9d9d12cd
  13. 15 Jan, 2011 1 commit
  14. 02 Jan, 2011 1 commit
  15. 03 Dec, 2010 2 commits
  16. 18 Sep, 2010 1 commit
  17. 04 Sep, 2010 1 commit
  18. 26 Jun, 2010 1 commit
    • Eli Zaretskii's avatar
      Fix the MS-DOS build due to changes in configury. · 394f2386
      Eli Zaretskii authored
       config.bat: Remove white space around "+" in COPY commands.
       msods/mainmake.v2 (version): Use emacs_version[] in src/emacs.c
       instead of lisp/version.el (see 2010-05-15T21:11:37Z!raeburn@raeburn.org).
       msdos/sed1v2.inp (MKDEPDIR): Edit to empty.
       Delete lines in rules that invoke $(MKDEPDIR).
       Fix editing rules that begin with "cd ../lisp".
       Edit out sh if-then-else-fi constructs that test ${CANNOT_DUMP}.
       Edit out "|| exit ;\" constructs in emacs${EXEEXT} rule.
      394f2386
  19. 27 May, 2010 1 commit
    • Glenn Morris's avatar
      Do not preprocess src/Makefile.in. · 81ac4f35
      Glenn Morris authored
      * configure.in: Do not preprocess src/Makefile.in.
      (cpp_undefs, CPP_NEED_TRADITIONAL): Remove.
      (AC_EGREP_CPP): Test no longer needed.
      * configure: Regenerate.
      
      * config.bat: Do not preprocess src/Makefile.in.
      
      * make-dist: No more Makefile.c files.
      
      * INSTALL, src/README: Makefiles are not preprocessed.
      
      * src/Makefile.in, src/autodeps.mk, src/deps.mk, src/ns.mk:
      Convert comments to Makefile format.
      
      * lib-src/Makefile.in (distclean): No more Makefile.c.
      * src/Makefile.in (bootstrap-clean): No more Makefile.c.
      
      * admin/notes/cpp: Remove file.
      
      * admin/quick-install-emacs (AVOID): No more Makefile.c files.
      
      * etc/PROBLEMS, etc/MACHINES: Remove details of cpp problems which can
      no longer occur.
      81ac4f35
  20. 20 May, 2010 2 commits
    • Glenn Morris's avatar
    • 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
  21. 18 May, 2010 2 commits
    • 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
  22. 15 May, 2010 1 commit
  23. 11 May, 2010 2 commits
    • Glenn Morris's avatar
      Do not preprocess lib-src/Makefile.in · d3b23034
      Glenn Morris authored
      * 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.
      d3b23034
    • Glenn Morris's avatar
      On msdos, set LIBS_SYSTEM with config.bat, not cpp. · acddf8ae
      Glenn Morris authored
      * 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.
      acddf8ae
  24. 07 May, 2010 1 commit
  25. 27 Mar, 2010 1 commit
    • Eli Zaretskii's avatar
      Fix the MSDOS build as fallout from the latest Makefile.in changes. · 2201e7e2
      Eli Zaretskii authored
       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".
      2201e7e2
  26. 13 Jan, 2010 1 commit
  27. 28 Feb, 2009 1 commit
  28. 08 Jan, 2009 1 commit
  29. 26 Dec, 2008 1 commit
  30. 19 Dec, 2008 1 commit
  31. 31 Oct, 2008 1 commit
  32. 07 May, 2008 2 commits