* Makefile.in (AUTOCONF_INPUTS): New macro.
($(srcdir)/configure, $(srcdir)/src/stamp-h.in): Depend on it,
so that these files also depend on m4/getopt.m4.
* configure.in: Configure getopt by including m4/getopt.m4,
and configuring a getopt replacement if necessary.
* make-dist: Add m4 subdirectory. Unlink lib-src/getopt.h.
* m4/getopt.m4: New file.
* lib-src/Makefile.in (mostlyclean): Remove getopt.h, getopt.h-t.
(GETOPT_H): New macro, from gnulib.
(getopt.h): New rule, from gnulib.
(GETOPTOBJS): Now autoconfigured.
(GETOPTDEPS): getopt.h is now autoconfigured.
(getopt.o, getopt1.o): Depend on $(GETOPT_H), not ${srcdir}/getopt.h.
(getopt.o): Depend on ${srcdir}/gettext.h.
(movemail.o): Depend on $(GETOPT_H).
* lib-src/getopt.c, lib-src/getopt1.c: Sync from gnulib.
* lib-src/getopt_.h, lib-src/getopt_int.h, lib-src/gettext.h:
New files, from gnulib.
* lib-src/getopt.h: Removed (now is getopt_.h).
* nt/inc/gettext.h: Remove; no longer needed now that
lib-src/gettext.h exists.
* src/s/cygwin.h (C_SWITCH_SYSTEM): Remove, since gettext.h is
now part of lib-src.
(gc_cons_combined_threshold): Var deleted.
(gc_relative_threshold): New variable.
(Fgarbage_collect, init_alloc_once): Compute gc_relative_threshold
instead of gc_cons_combined_threshold.
(Fdo_applescript, Fmac_file_name_to_posix)
(Fmac_file_name_to_posix): Doc fixes.
[TARGET_API_MAC_CARBON] (Fmac_get_preference)
(Fmac_code_convert_string): Likewise.
[MAC_OSX] (init_mac_osx_environment): Fall back on terminal mode
if the executable is not contained in a bundle.
(XSetFont): Add declaration.
(mac_set_forecolor, mac_set_backcolor, mac_set_colors): Remove
functions.
(GC_FORE_COLOR, GC_BACK_COLOR, GC_FONT, MAC_WINDOW_NORMAL_GC): New
defines.
(XDrawLine, mac_draw_line_to_pixmap, XClearWindow)
(mac_draw_bitmap, XCreatePixmapFromBitmapData, XFillRectangle)
(mac_draw_rectangle, mac_draw_string_common, mac_scroll_area): Use
them.
(mac_erase_rectangle): New function.
(XClearArea, x_draw_fringe_bitmap, x_clear_glyph_string_rect)
(x_draw_stretch_glyph_string): Use it.
(XChangeGC, XCreateGC, XGetGCValues, XSetForeground)
(XSetBackground, XSetFont): Adjust for new GC implementation.
(x_draw_fringe_bitmap, x_draw_box_rect): Use GC to set colors.
(XTset_vertical_scroll_bar): Clear area under scroll bar.
(code_convert_region): Adjusted for the above change.
(set_conversion_work_buffer): If the work buffer is already in
use, generate a new buffer and return it. Otherwise return Qnil.
(run_pre_post_conversion_on_str): Adjusted for the above change.
(run_pre_write_conversin_on_c_str): Likewise.
if current start position is in a string or image.
(move_it_vertically_backward): Be sure to move out of strings and
images when moving it2 forward.
(move_it_by_lines): When moving forward, move to next buffer
position if we end up in a string or image. When moving backward,
count rows moved over when moving to start of current row in case
row starts in middle of a string or image. Also move further
backward if we end up in a string or image.
(try_cursor_movement): if overlay string spans multiple lines,
move backward to set cursor on start of an overlay string.
(cursor_row_p): Row is ok if cursor is at newline from string, but
string starts on this line (so we always position cursor at start
of string).
(x_use_underline_position_properties, last_mouse_press_frame)
(x_noop_count, Qvendor_specific_keysyms): Remove unused variables.
(syms_of_macterm, mac_initialize): Don't initialize them.
(waiting_for_input, initial_argv, initial_argc)
(Vcommand_line_args, Vx_no_window_manager, errno, window_scroll)
(set_frame_menubar, path_from_vol_dir_name): Remove externs.
(extra_keyboard_modifiers): Fix type in extern.
(x_window_to_frame, x_window_to_scroll_bar): Remove declarations.
(x_scroll_bar_report_motion): Add argument types to declaration.
(mac_compute_glyph_string_overhangs): Add declaration.
(disable_mouse_highlight): Remove unused variable.
[USE_TOOLKIT_SCROLL_BARS] (construct_scroll_bar_click)
(x_scroll_bar_handle_press, x_scroll_bar_handle_release)
(x_scroll_bar_handle_drag): Remove argument `timestamp'. All
callers changed.
[USE_TOOLKIT_SCROLL_BARS] (construct_scroll_bar_click): Don't set
timestamp.
[USE_CARBON_EVENTS] (mac_handle_mouse_event): Likewise.
(x_scroll_bar_create, XTset_vertical_scroll_bar): Show scroll bar
only when its width is less than the height.
(XTredeem_scroll_bar): Sync with xterm.c.
(font_name_table, font_name_table_size, font_name_count): Make
static.
(drag_and_drop_file_list): Remove variable. Previous use is now
local to function.
(do_ae_open_documents): Move DRAG_N_DROP event construction part
from XTread_socket.
(XTread_socket): Consolidate setting of event timestamp. Move
DRAG_N_DROP event construction part to do_ae_open_documents.
Support extra_keyboard_modifiers.