aboutsummaryrefslogtreecommitdiffstats
path: root/msdos
Commit message (Collapse)AuthorAgeFilesLines
* Fix typos in ChangeLogs.Juanma Barranquero2010-07-241-2/+2
|
* Fix the MS-DOS build (fallout from ↵Eli Zaretskii2010-07-123-0/+14
| | | | | | | | | | | | | | 2010-07-12T14:16:[email protected], 2010-07-12T17:04:[email protected], 2010-07-12T17:21:[email protected]). msdos/sed1v2.inp (C_WARNINGS_SWITCH, PROFILING_CFLAGS, PROFILING_LDFLAGS): Edit to empty. msdos/sed3v2.inp(C_WARNINGS_SWITCH, PROFILING_CFLAGS, PROFILING_LDFLAGS): Edit to empty. src/process.c (setup_process_coding_systems): Move to the part shared by non-subprocesses systems, and make its body empty when subprocesses is not defined. (close_process_descs): Move to the part shared by non-subprocesses systems.
* Remove redundant definitions of HAVE_STRCHR and HAVE_STRRCHR for MS-DOS.Eli Zaretskii2010-07-112-2/+5
| | | | | sed2v2.inp (HAVE_STRCHR, HAVE_STRRCHR): Don't edit, already defined on <sys/config.h>.
* Use strchr, strrchr instead of index, rindexAndreas Schwab2010-07-112-2/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * callint.c (Fcall_interactively): Use strchr, strrchr instead of index, rindex. * doc.c (get_doc_string, Fsnarf_documentation): Likewise. * editfns.c (Fuser_full_name, Fformat): Likewise. * emacs.c (argmatch, sort_args, decode_env_path): Likewise. * fileio.c (Ffile_symlink_p): Likewise. * filelock.c (current_lock_owner): Likewise. * font.c (font_parse_name, font_parse_family_registry): Likewise. * fontset.c (fontset_pattern_regexp): Likewise. * lread.c (read1): Likewise. * sysdep.c (init_system_name): Likewise. * xfns.c (select_visual): Likewise. * s/hpux10-20.h (index, rindex): Don't define. * s/ms-w32.h (index): Likewise. * s/usg5-4.h: Likewise. * sed2v2.inp (HAVE_INDEX, HAVE_RINDEX): Don't edit. (HAVE_STRCHR, HAVE_STRRCHR): Edit to 1. * emacsclient.c (set_local_socket): Use strchr, strrchr instead of index, rindex. * movemail.c (mail_spool_name, popmail): Likewise. * pop.c (pop_list): Likewise. * CPP-DEFINES (HAVE_INDEX, HAVE_RINDEX): Remove. * configure.in: Don't check for index and rindex, check for strchr and strrchr. Define strchr and strrchr as index and rindex, resp., in src/config.h if not available.
* Fix MS-DOS configury.Eli Zaretskii2010-07-083-2/+7
| | | | | | sed1v2.inp (stamp-oldxmenu): Don't edit out in `temacs:' target, which doesn't exist. sed2v2.inp (HAVE_MEMCPY): Don't edit, already defined on <sys/config.h>.
* Remove src/prefix-args.c.Dan Nicolaescu2010-07-072-1/+4
| | | | | | | | | | | | | * configure.in (PRE_EDIT_LDFLAGS, POST_EDIT_LDFLAGS): Remove. * msdos/sed1v2.inp: Remove reference to prefix-args. * prefix-args.c: Remove file. * src/autodeps.mk (ALLOBJS): Remove reference to prefix-args. * src/Makefile.in (temacs${EXEEXT}): Remove references to PRE_EDIT_LDFLAGS and POST_EDIT_LDFLAGS. (mostlyclean): Remove reference to prefix-args. (prefix-args): Remove.
* Replace bcopy, bzero, bcmp by memcpy, memmove, memset, memcmpAndreas Schwab2010-07-082-8/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * alloc.c (overrun_check_malloc, overrun_check_realloc) (overrun_check_free, xstrdup, allocate_string) (allocate_string_data, compact_small_strings, Fmake_string) (make_unibyte_string, make_multibyte_string) (make_string_from_bytes, make_specified_string, make_float) (Fcons, allocate_terminal, allocate_frame, make_pure_string) (Fgarbage_collect): Replace bcopy, safe_bcopy, bzero, bcmp by memcpy, memmove, memset, memcmp. * atimer.c (start_atimer, set_alarm): Likewise. * buffer.c (clone_per_buffer_values, report_overlay_modification) (mmap_realloc, init_buffer_once): Likewise. * callint.c (Fcall_interactively): Likewise. * callproc.c (Fcall_process, Fcall_process_region, child_setup) (getenv_internal_1): Likewise. * casefiddle.c (casify_object): Likewise. * ccl.c (ccl_driver): Likewise. * character.c (str_as_multibyte, str_to_multibyte): Likewise. * charset.c (load_charset_map_from_file) (load_charset_map_from_file, load_charset_map_from_vector) (Fdefine_charset_internal): Likewise. * cm.c (Wcm_clear): Likewise. * coding.c (decode_eol, decode_coding_object) (Fset_coding_system_priority, make_subsidiaries): Likewise. * data.c (Faset): Likewise. * dired.c (directory_files_internal, file_name_completion_stat): Likewise. * dispnew.c (new_glyph_matrix, adjust_glyph_matrix) (clear_glyph_row, copy_row_except_pointers) (copy_glyph_row_contents, new_glyph_pool, realloc_glyph_pool) (save_current_matrix, restore_current_matrix) (build_frame_matrix_from_leaf_window, mirrored_line_dance) (mirror_line_dance, scrolling_window): Likewise. * doc.c (Fsnarf_documentation, Fsubstitute_command_keys): Likewise. * doprnt.c (doprnt): Likewise. * editfns.c (Fuser_full_name, make_buffer_string_both) (Fmessage_box, Fformat, Ftranspose_regions): Likewise. * emacs.c (sort_args): Likewise. * eval.c (Fapply, Ffuncall): Likewise. * fileio.c (Ffile_name_directory, make_temp_name) (Fexpand_file_name, search_embedded_absfilename) (Fsubstitute_in_file_name, Ffile_symlink_p, Finsert_file_contents) (auto_save_error): Likewise. * fns.c (Fstring_equal, Fcopy_sequence, concat) (string_to_multibyte, Fstring_as_unibyte, Fstring_as_multibyte) (internal_equal, Fclear_string, larger_vector, copy_hash_table) (Fmake_hash_table): Likewise. * fringe.c (Fdefine_fringe_bitmap): Likewise. * ftfont.c (ftfont_text_extents): Likewise. * getloadavg.c (getloadavg): Likewise. * image.c (define_image_type, make_image, make_image_cache) (x_create_x_image_and_pixmap, xbm_image_p) (w32_create_pixmap_from_bitmap_data, xbm_load, xpm_lookup_color) (xpm_image_p, x_create_bitmap_from_xpm_data, xpm_load) (init_color_table, x_build_heuristic_mask, pbm_image_p, pbm_load) (png_image_p, png_read_from_memory, png_load, jpeg_image_p) (tiff_image_p, tiff_read_from_memory, gif_image_p) (gif_read_from_memory, gif_load, svg_image_p, gs_image_p): Likewise. * indent.c (scan_for_column, compute_motion): Likewise. * insdel.c (gap_left, gap_right, make_gap_smaller, copy_text) (insert_1_both, insert_from_gap, replace_range_2): Likewise. * intervals.c (reproduce_tree, reproduce_tree_obj): Likewise. * keyboard.c (echo_char, save_getcjmp, restore_getcjmp) (kbd_buffer_store_event_hold, apply_modifiers_uncached) (store_user_signal_events, menu_bar_items, tool_bar_items) (process_tool_bar_item, append_tool_bar_item) (read_char_minibuf_menu_prompt, read_key_sequence) (Fread_key_sequence, Fread_key_sequence_vector, Frecent_keys): Likewise. * keymap.c (current_minor_maps, Fdescribe_buffer_bindings): Likewise. * lisp.h (STRING_COPYIN): Likewise. * lread.c (Fload, read1, oblookup): Likewise. * msdos.c (Frecent_doskeys): Likewise. * nsfns.m (Fx_create_frame): Likewise. * nsfont.m (nsfont_open, nsfont_text_extents, ns_glyph_metrics): Likewise. * nsimage.m (EmacsImage-initFromSkipXBM:width:height:) (EmacsImage-initForXPMWithDepth:width:height:flip:length:): Likewise. * nsmenu.m (ns_update_menubar): Likewise. * nsterm.m (ns_draw_fringe_bitmap, ns_term_init): Likewise. * print.c (print_unwind, printchar, strout, print_string) (print_error_message): Likewise. * process.c (conv_lisp_to_sockaddr, set_socket_option) (Fmake_network_process, Fnetwork_interface_list) (Fnetwork_interface_info, read_process_output, Fprocess_send_eof) (init_process): Likewise. * ralloc.c (resize_bloc, r_alloc_sbrk, r_alloc_init): Likewise. * regex.c (init_syntax_once, regex_compile, re_compile_fastmap): Likewise. * scroll.c (do_scrolling, do_direct_scrolling) (scrolling_max_lines_saved): Likewise. * search.c (search_buffer, wordify, Freplace_match): Likewise. * sound.c (wav_init, au_init, Fplay_sound_internal): Likewise. * syntax.c (skip_chars, skip_syntaxes): Likewise. * sysdep.c (child_setup_tty, sys_subshell, emacs_get_tty) (emacs_set_tty): Likewise. * term.c (encode_terminal_code, calculate_costs) (produce_special_glyphs, create_tty_output, init_tty, delete_tty): Likewise. * termcap.c (tgetst1, gobble_line): Likewise. * termhooks.h (EVENT_INIT): Likewise. * tparam.c (tparam1): Likewise. * unexalpha.c (unexec): Likewise. * unexec.c (write_segment): Likewise. * unexmacosx.c (unexec_write_zero): Likewise. * w32fns.c (w32_wnd_proc, Fx_create_frame, x_create_tip_frame) (Fx_file_dialog, Fsystem_move_file_to_trash): Likewise. * w32font.c (w32font_list_family, w32font_text_extents) (w32font_list_internal, w32font_match_internal) (w32font_open_internal, compute_metrics, Fx_select_font): Likewise. * w32menu.c (set_frame_menubar, add_menu_item) (w32_menu_display_help, w32_free_submenu_strings): Likewise. * w32term.c (XCreateGC, w32_initialize_display_info): Likewise. * w32uniscribe.c (uniscribe_list_family): Likewise. * w32xfns.c (get_next_msg, post_msg, prepend_msg): Likewise. * window.c (make_window, replace_window, set_window_buffer) (Fsplit_window): Likewise. * xdisp.c (init_iterator, RECORD_OVERLAY_STRING, reseat_to_string) (add_to_log, message3, x_consider_frame_title) (append_space_for_newline, extend_face_to_end_of_line) (decode_mode_spec_coding, init_glyph_string): Likewise. * xfaces.c (x_create_gc, get_lface_attributes_no_remap) (Finternal_copy_lisp_face, Finternal_merge_in_global_face) (face_attr_equal_p, make_realized_face, make_face_cache) (free_realized_faces, lookup_named_face, smaller_face) (face_with_height, lookup_derived_face) (x_supports_face_attributes_p, Finternal_set_font_selection_order) (Finternal_set_font_selection_order, realize_default_face) (compute_char_face, face_at_buffer_position) (face_for_overlay_string, face_at_string_position, merge_faces): Likewise. * xfns.c (xic_create_fontsetname, Fx_create_frame) (Fx_window_property, x_create_tip_frame) (Fx_backspace_delete_keys_p): Likewise. * xfont.c (xfont_list, xfont_match, xfont_list_family) (xfont_text_extents): Likewise. * xmenu.c (set_frame_menubar, xmenu_show): Likewise. * xrdb.c (magic_file_p, x_get_resource): Likewise. * xselect.c (x_queue_event, x_get_window_property) (receive_incremental_selection): Likewise. * xsmfns.c (x_session_check_input): Likewise. * xterm.c (x_send_scroll_bar_event, SET_SAVED_MENU_EVENT) (handle_one_xevent, x_check_errors, xim_initialize, x_term_init): Likewise. * character.h (BCOPY_SHORT): Removed. * config.in: Regenerate. * dispnew.c (safe_bcopy): Only define as dummy if PROFILING. * emacs.c (main) [PROFILING]: Don't declare dump_opcode_frequencies. * lisp.h (safe_bcopy): Remove declaration. (memset) [!HAVE_MEMSET]: Declare. (memcpy) [!HAVE_MEMCPY]: Likewise. (memmove) [!HAVE_MEMMOVE]: Likewise. (memcmp) [!HAVE_MEMCMP]: Likewise. * s/ms-w32.h (bzero, bcopy, bcmp, GAP_USE_BCOPY) (BCOPY_UPWARD_SAFE, BCOPY_DOWNWARD_SAFE, HAVE_BCOPY, HAVE_BCMP): Don't define. (HAVE_MEMCMP, HAVE_MEMCPY, HAVE_MEMMOVE, HAVE_MEMSET): Define. * s/msdos.h (GAP_USE_BCOPY, BCOPY_UPWARD_SAFE) (BCOPY_DOWNWARD_SAFE): Don't define. * sysdep.c (memset) [!HAVE_MEMSET]: Define. (memcpy) [!HAVE_MEMCPY]: Define. (memmove) [!HAVE_MEMMOVE]: Define. (memcmp) [!HAVE_MEMCMP]: Define. * config.nt (HAVE_BCOPY, HAVE_BCMP): Remove undefs. (HAVE_MEMCPY, HAVE_MEMMOVE, HAVE_MEMSET, HAVE_MEMCMP): Add undefs. * sed2v2.inp (HAVE_MEMCPY, HAVE_MEMSET): Edit to 1. (HAVE_BZERO): Don't edit. * lwlib.c (lwlib_memset, lwlib_bcopy): Remove. (malloc_widget_value, free_widget_info, allocate_widget_instance) (lw_separator_p): Replace lwlib_memset, lwlib_bcopy, bzero, bcmp by memset, memcpy, memcmp. * lwlib-utils.c (XtApplyToWidgets): Likewise. * xlwmenu.c (XlwMenuInitialize): Likewise. * lwlib.h (lwlib_bcopy): Remove declaration. * ebrowse.c (add_sym, make_namespace): Replace bcopy, bzero by memcpy, memmove, memset. * pop.c (pop_retrieve, socket_connection, pop_getline): Likewise. * CPP-DEFINES (BCOPY_DOWNWARD_SAFE, BCOPY_UPWARD_SAFE) (GAP_USE_BCOPY, HAVE_BCMP, HAVE_BCOPY, bcmp, bcopy, bzero): Remove. * configure.in: Don't check for bcopy, bcmp, bzero. Don't include <strings.h> and don't define bcopy, bzero, BCMP in config.h.
* Fix MS-DOS configury.Eli Zaretskii2010-07-022-1/+7
| | | | | sed1v2.inp (LIB_GCC): Edit to empty. Chdir back to ../src after compiling each .el file.
* Remove some cpp that is internal to configure.in.Glenn Morris2010-06-292-1/+5
| | | | | | | | | | | | | | | | | | | | | | | | | * configure.in (C_OPTIMIZE_SWITCH, CANNOT_DUMP, SYSTEM_MALLOC): (USE_MMAP_FOR_BUFFERS, C_WARNING_SWITCH): Set with shell, not cpp. (LIBX): Remove, just use -lX11 in the one place this was used. (cannot_dump): Replace with CANNOT_DUMP. * src/Makefile.in (CANNOT_DUMP): Update for configure name change. * src/s/freebsd.h (USE_MMAP_FOR_BUFFERS): * src/s/irix6-5.h (USE_MMAP_FOR_BUFFERS): * src/s/darwin.h (SYSTEM_MALLOC): * src/s/sol2-10.h (SYSTEM_MALLOC): Move to configure. * src/m/alpha.h: Remove old comment. * src/s/aix4-2.h: Update comment. * src/s/template.h: Remove USE_MMAP_FOR_BUFFERS. * msdos/sed1v2.inp (CANNOT_DUMP): Update for configure name change. * admin/CPP-DEFINES: Remove USE_MMAP_FOR_BUFFERS, CANNOT_DUMP. * etc/DEBUG: Update SYSTEM_MALLOC and CANNOT_DUMP references. Some re-filling.
* Fix the MS-DOS build due to changes in configury.Eli Zaretskii2010-06-263-12/+29
| | | | | | | | | | | 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:[email protected]). 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.
* Move UNEXEC definition to autoconf.Dan Nicolaescu2010-06-032-1/+5
| | | | | | | | | | | | | | | | | | | * configure.in (unxec): Do not define and substitute. (UNEXEC_OBJ): New output variable, replaces cpp UNEXEC. * msdos/sed1v2.inp (UNEXEC_OBJ): Use UNEXEC_OBJ instead of unexec. * src/s/usg5-4.h (UNEXEC): Remove, move to configure.in. * src/s/sol2-10.h (UNEXEC): * src/s/irix6-5.h (UNEXEC): * src/s/hpux10-20.h (UNEXEC): * src/s/gnu-linux.h (UNEXEC): * src/s/darwin.h (UNEXEC): * src/s/cygwin.h (UNEXEC): * src/s/bsd-common.h (UNEXEC): * src/s/aix4-2.h (UNEXEC): * src/m/alpha.h (UNEXEC): Likewise. * src/Makefile.in (UNEXEC_OBJ): Define using @UNEXEC_OBJ@.
* HAVE_ALLOCA not needed since alloca.s was removed.Glenn Morris2010-06-022-1/+4
| | | | | | | | | * src/m/hp800.h (HAVE_ALLOCA): * src/m/ibms390x.h (HAVE_ALLOCA): Do not define, no longer needed. * msdos/sed2v2.inp: Do not edit HAVE_ALLOCA. * admin/CPP-DEFINES: Remove HAVE_ALLOCA.
* Replace YMF_PASS_LDFLAGS with autoconf.Glenn Morris2010-05-252-1/+5
| | | | | | | | | | | * configure.in (YMF_PASS_LDFLAGS): Remove. (PRE_EDIT_LDFLAGS, POST_EDIT_LDFLAGS): New output variables. * configure: Regenerate. * src/Makefile.in (YMF_PASS_LDFLAGS): Remove. (temacs${EXEEXT}): Use PRE_EDIT_LDFLAGS, POST_EDIT_LDFLAGS. * msdos/sed1v2.inp (@PRE_EDIT_LDFLAGS@, @POST_EDIT_LDFLAGS@): Edit to nothing.
* Remove some NS_IMPL_GNUSTEP build dead code.Glenn Morris2010-05-252-2/+5
| | | | | | | | | | | | | | | | | | | | | | * configure.in (NS_IMPL_GNUSTEP_INC, NS_IMPL_GNUSTEP_TEMACS_LDFLAGS) (GNUSTEP_MAKEFILES): Remove. (LD_SWITCH_SYSTEM_TEMACS): Move NS_IMPL_GNUSTEP_TEMACS_LDFLAGS stuff to here. * src/Makefile.in (NS_IMPL_GNUSTEP_INC, NS_IMPL_GNUSTEP_TEMACS_LDFLAGS): Remove. (TEMACS_LDFLAGS): Do not use NS_IMPL_GNUSTEP_TEMACS_LDFLAGS. * msdos/sed1v2.inp (NS_IMPL_GNUSTEP_INC, NS_IMPL_GNUSTEP_TEMACS_LDFLAGS): No longer present. Comments: See http://lists.gnu.org/archive/html/emacs-devel/2010-05/msg00846.html. Nothing from gui.make was used at all in src/Makefile.in. The only thing used from base.make was $CONFIG_SYSTEM_LIBS, but because we only set shared _after_ sourcing base.make, it was always empty. We can move the remaining flags, set in configure, to the standard variable LD_SWITCH_SYSTEM_TEMACS.
* Remove LD_SWITCH_SYSTEM_EXTRA.Glenn Morris2010-05-242-1/+4
| | | | | | | | | | | * 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.
* Handle some HAVE_NS Makefile conditionals with configure.Glenn Morris2010-05-202-0/+3
| | | | | | | | | | * 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.
* Build simplifications for oldxmenu.Glenn Morris2010-05-203-2/+5
| | | | | | | | | | * 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".
* * msdos/mainmake.v2: Comment fix.Glenn Morris2010-05-201-4/+4
|
* Handle CANNOT_DUMP (partially) with configure.Glenn Morris2010-05-202-0/+5
| | | | | | | | | * 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.
* Handle auto-depend with configure.Glenn Morris2010-05-192-0/+8
| | | | | | | | | | | | | | | | | | | | * 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 ':'.
* Minor msdos build change.Glenn Morris2010-05-182-0/+3
| | | | | * msdos/sed2v2.inp (ORDINARY_LINK): Set here rather than in s/msdos.h. * src/s/msdos.h (ORDINARY_LINK): Move to sed2v2.inp.
* Set linker-related things with configure.Glenn Morris2010-05-182-0/+7
| | | | | | | | | | | | | | | | | | | | | | | * 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'.
* msdos/sed1x.inp: Add copyright notice.Eli Zaretskii2010-05-182-0/+19
|
* Set rallocobj with configure, not cpp.Glenn Morris2010-05-172-0/+3
| | | | | | | | | | | | | | | * 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.
* Define some malloc objects with configure, not cpp.Glenn Morris2010-05-172-0/+7
| | | | | | | | | | | | * 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.
* Combine the two stamp-oldxmenu cases.Glenn Morris2010-05-163-0/+7
| | | | | | | | | | | * 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}.
* Simplify temacs build rule.Glenn Morris2010-05-162-0/+3
| | | | | | | | | | * 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.
* Simplify temacs build rule.Glenn Morris2010-05-162-1/+6
| | | | | | | | | | | | | | | | | | * 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.
* Always define LIBXMENU in src/Makefile.in.Glenn Morris2010-05-153-1/+5
| | | | | | | | | * 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.
* Always define OLDXMENU in src/Makefile.in.Glenn Morris2010-05-153-1/+5
| | | | | | | * src/Makefile.in (OLDXMENU): Always define. * msdos/sed1v2.inp (OLDXMENU): Edit to empty. * msdos/sed1x.inp (OLDXMENU): Expect empty initial value.
* msdos/ChangeLog missing from previous commit.Glenn Morris2010-05-151-0/+3
|
* Always define LIBX_OTHER in src/Makefile.in.Glenn Morris2010-05-152-1/+2
| | | | | | | * src/Makefile.in (LIBX_OTHER): Always define. * msdos/sed1v2.inp (LIBX_OTHER): Edit to empty. * msdos/sed1x.inp (LIBX_OTHER): Expect empty initial value.
* Always define FONT_OBJ; to empty in the non-X case.Glenn Morris2010-05-153-1/+7
| | | | | | | | | | * 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.
* Fix "config msdos" step.Eli Zaretskii2010-05-153-7/+15
| | | | | | | | src/Makefile.in: Fix MSDOS-related comments. msdos/sed3v2.inp (INSTALLABLES): Edit out extra ${EXEEXT} after "emacsclient". (emacsserver, timer, wakeup): Remove edit-out commands. msdos/sed1v2.inp (MSDOS_OBJ): Add w16select.o. (TERMCAP_OBJ): Add termcap.o.
* Fix a typo in msdos/ChangeLog.Eli Zaretskii2010-05-151-1/+1
|
* Choose dependency of oldxmenu using configure.Glenn Morris2010-05-143-0/+5
| | | | | | | | | | | * 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.
* * msdos/sed1v2.inp (LIBXT_OTHER): Exit to empty.Glenn Morris2010-05-142-0/+5
|
* No harm in always defining some ns_ Makefile variables.Glenn Morris2010-05-132-0/+5
| | | | | | * src/Makefile.in (ns_appdir, ns_appbindir, ns_appsrc): Always define. * msdos/sed1v2.inp (ns_appdir, ns_appbindir, ns_appsrc): Edit to empty.
* Replace some msdos cpp.Glenn Morris2010-05-133-0/+7
| | | | | | | | | | | | | * src/Makefile.in (MSDOS_OBJ): Default to empty, let msdos scripts set it. (MSDOS_X_OBJ): New variable. (MSDOS_SUPPORT_REAL): New constant. (MSDOS_SUPPORT): Set as a variable, not with cpp. (obj): Use MSDOS_X_OBJ. (lisp): Use MSDOS_SUPPORT as a variable. * msdos/sed1v2.inp (MSDOS_OBJ): Edit to dosfns.o msdos.o. (MSDOS_SUPPORT): Edit to $(MSDOS_SUPPORT_REAL). * msdos/sed1x.inp (MSDOS_X_OBJ): Edit to w16select.o termcap.o.
* Define MOUSE_, TOOLTIP_, WINDOW_SUPPORT with configure.Glenn Morris2010-05-134-2/+14
| | | | | | | | | | | | | | | | * 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.
* * msdos/sed1v2.inp (FONT_OBJ): Use the plain X version (no XFT, Freetype).Glenn Morris2010-05-132-1/+3
| | | | Hopefully this is the right thing for msdos with X.
* Minor build simplification for NS.Glenn Morris2010-05-132-0/+5
| | | | | | | | | * 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.
* Some msdos build fixes (hopefully, possibly, ...)Glenn Morris2010-05-122-1/+7
| | | | | | * msdos/sed1x.inp (OLDXMENU): Edit to ${oldXMenudir}libXMenu11.a. (LIBXMENU): Edit to ${OLDXMENU}. (LIBX_OTHER): Edit to ${LIBXT} ${LIBX_EXTRA}.
* Remove some unused #define's, previously replaced by variables.Glenn Morris2010-05-121-0/+1
| | | | | | | | | | | * 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.
* Define some variables to hold configure's output, for clarity.Glenn Morris2010-05-122-2/+27
| | | | | | | | | | | | | | | | | | * src/Makefile.in (C_SWITCH_X_SYSTEM, C_SWITCH_X_SITE, LIB_STANDARD) (LIB_MATH, FONTCONFIG_CFLAGS, FONTCONFIG_LIBS, FREETYPE_CFLAGS) (FREETYPE_LIBS, LIBOTF_CFLAGS, LIBOTF_LIBS, M17N_FLT_CFLAGS) (M17N_FLT_LIBS, GNU_OBJC_CFLAGS, GNUSTEP_SYSTEM_LIBRARIES, LIBGPM) (LIBRESOLV, UNEXEC_OBJ): For clarity, define variables to hold the values output be configure. (ALL_CFLAGS, obj, LIBES, temacs${EXEEXT}): Use the above variables. * msdos/sed1v2.inp (C_SWITCH_X_SYSTEM, C_SWITCH_X_SITE, LIB_STANDARD) (FONTCONFIG_CFLAGS, FONTCONFIG_LIBS, FREETYPE_CFLAGS, FREETYPE_LIBS) (LIBOTF_CFLAGS, LIBOTF_LIBS, M17N_FLT_CFLAGS, M17N_FLT_LIBS) (GNU_OBJC_CFLAGS, GNUSTEP_SYSTEM_LIBRARIES, LIBRESOLV, LIBGPM): Edit to empty, (LIB_MATH): Edit to -lm. (UNEXEC_OBJ): Edit to unexec.o.
* Remove unused output variable LIB_SRC_EXTRA_INSTALLABLES.Glenn Morris2010-05-112-1/+2
| | | | | | | | * 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@.
* Move LIB_GCC from cpp to configure.Glenn Morris2010-05-112-0/+5
| | | | | | | | | | | | | | | | * 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.
* On msdos, set LIBS_SYSTEM with config.bat, not cpp.Glenn Morris2010-05-103-0/+11
| | | | | | | | | | | | | * 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.
* Move LIBS_SYSTEM from cpp to configure.Glenn Morris2010-05-093-0/+4
| | | | | | | | | | | | | | | | | | | | | | | * 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.
* Move MAIL_USE_FLOCK, MAIL_USE_LOCKF, BLESSMAIL_TARGET from cpp to configure.Glenn Morris2010-05-092-0/+5
| | | | | | | | | | | | | | | | | | | * 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.