1. 27 Apr, 2010 5 commits
    • Glenn Morris's avatar
      Move MOTIF_LIBW to autoconf. · c6ea2936
      Glenn Morris authored
      * 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.
      c6ea2936
    • Dan Nicolaescu's avatar
      Reduce CPP usage. · ed6281b0
      Dan Nicolaescu authored
      * 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.
      ed6281b0
    • Dan Nicolaescu's avatar
      Reduce CPP usage. · aaa36002
      Dan Nicolaescu authored
      * 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.
      aaa36002
    • Glenn Morris's avatar
      Use $CRT_DIR in more places. · 76cda504
      Glenn Morris authored
      * 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.
      76cda504
    • Glenn Morris's avatar
      Replace some more cpp with autoconf. · b678dd8b
      Glenn Morris authored
      * 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.
      b678dd8b
  2. 26 Apr, 2010 3 commits
  3. 24 Apr, 2010 1 commit
    • Glenn Morris's avatar
      Close bug#5655. · 70eab5c1
      Glenn Morris authored
      * 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)
      70eab5c1
  4. 23 Apr, 2010 3 commits
  5. 20 Apr, 2010 1 commit
    • Jan Djärv's avatar
      Gtk tool bars can be text, icons with text or just icons. · f904c0f9
      Jan Djärv authored
      * xsettings.c: Qmonospace_font_name, Qtool_bar_style and
      current_tool_bar_style are new.
      (store_config_changed_event): Rename from store_font_changed_event.
      (XSETTINGS_TOOL_BAR_STYLE): New define.
      (SEEN_FONT, SEEN_TB_STYLE): New enum values.
      (struct xsettings): Add font and tb_style, set xft stuff inside #ifdef
      HAVE_XFT.
      (something_changedCB): store_font_changed_event is now
      store_config_changed_event
      (parse_settings): Rename from parse_xft_settings.  Read
      non-xft xsettings outside #ifdef HAVE_XFT.
      (read_settings): Renamed from read_xft_settings.
      (apply_xft_settings): Take current settings as parameter.  Do not
      call read_(xft)_settings.
      (read_and_apply_settings): New function.
      (xft_settings_event): Do non-xft stuff out of HAVE_XFT.  Call
      read_and_apply_settings if there are settings to be read.
      (init_xsettings): Renamed from init_xfd_settings.
      Call read_and_apply_settings unconditionally.
      (xsettings_initialize): Call init_xsettings.
      (Ftool_bar_get_system_style): New function.
      (syms_of_xsettings): Define Qmonospace_font_name and
      Qtool_bar_style.  Initialize current_tool_bar_style to nil.
      defsubr Stool_bar_get_system_style. Fprovide on
      dynamic-setting.
      
      * xsettings.h (Ftool_bar_get_system_style): Declare.
      
      * xdisp.c: Vtool_bar_style, tool_bar_max_label_size,
      Qtext, Qboth, Qboth_horiz are new.
      (syms_of_xdisp): Intern Qtext, Qboth, Qboth_horiz, DEFVAR
      Vtool_bar_style, tool_bar_max_label_size.
      
      * lisp.h: Extern declare Qtext, Qboth, Qboth_horiz.
      
      * keyboard.c: QClabel is new.
      (parse_tool_bar_item): Take out QClabel from tool bar items.
      Try to construct a label if ther is no QClabel.
      (syms_of_keyboard): Intern :label as QClabel.
      
      * dispextern.h (tool_bar_item_idx): TOOL_BAR_ITEM_LABEL is new.
      (Vtool_bar_style, tool_bar_max_label_size, DEFAULT_TOOL_BAR_LABEL_SIZE):
      New.
      
      * Makefile.in (SOME_MACHINE_LISP): font-setting.el renamed to
      dynamic-setting.el.
      
      * gtkutil.c (xg_tool_bar_menu_proxy): Handle label in tool bar item.
      (xg_make_tool_item, xg_show_toolbar_item): New function.
      (update_frame_tool_bar): Take label from TOOL_BAR_ITEM_LABEL.
      Call xg_make_tool_item to make a tool bar item.
      Call xg_show_toolbar_item.  Use wtoolbar instead of x->toolbar_widget.
      
      * xterm.c (x_draw_image_relief): Take Vtool_bar_button_margin
      into account for toolbars.
      
      * vc-dir.el (vc-dir-tool-bar-map): Add :label on some tool bar items.
      
      * tool-bar.el (tool-bar-setup): Add :label on some tool bar items.
      
      * loadup.el: Load dynamic-setting.el if feature dynamic-setting
      is present.
      
      * info.el (info-tool-bar-map): Add labels.
      
      * cus-start.el (all): Add tool-bar-style and tool-bar-max-label-size.
      
      * cus-edit.el (custom-commands): Add labels for tool bar.
      (custom-buffer-create-internal, Custom-mode): Adjust for
      labels in custom-commands.
      
      * dynamic-setting.el: Renamed from font-setting.el.
      f904c0f9
  6. 21 Apr, 2010 3 commits
    • Glenn Morris's avatar
      Remove some more cpp in favor of autoconf. · 10efe302
      Glenn Morris authored
      * configure.in (LIBSELINUX_LIBS): Always substitute in Makefiles.
      (GTK_OBJ, DBUS_OBJ, LIBXSM, XMENU_OBJ, XOBJ): New output variables.
      
      * src/Makefile.in (DBUS_OBJ, GTK_OBJ, XMENU_OBJ, XOBJ):
      Define using autoconf, not cpp.
      (LIBXSM): New variable, set by autoconf.
      (LIBXT): Use $LIBXSM.
      10efe302
    • Glenn Morris's avatar
      Remove LIBSELINUX_LIBS need for cpp in Makefiles. · 2807228d
      Glenn Morris authored
      * configure.in (LIBSELINUX_LIBS): Always substitute in Makefiles.
      * src/Makefile.in (LIBSELINUX_LIBS): Remove containing #ifdef.
      2807228d
    • Karel Klíc's avatar
      Add SELinux support. · 574c05e2
      Karel Klíc authored
      * configure.in: New option: --with(out)-selinux, on by default.
      Set HAVE_LIBSELINUX if we find libselinux, and substitute
      LIBSELINUX_LIBS in Makefiles.
      
      * src/Makefile.in (LIBSELINUX_LIBS): New.
      (LIBES): Add $LIBSELINUX_LIBS.
      * src/eval.c, lisp.h (call7): New function.
      * src/fileio.c [HAVE_LIBSELINUX]: Include selinux headers.
      (Ffile_selinux_context, Fset_file_selinux_context):
      New functions.
      (Fcopy_file): New parameter preserve-selinux-context.
      (Frename_file): Preserve selinux context when renaming by copy-file.
      
      * lisp/files.el (backup-buffer): Handle SELinux context, and return it
      if a backup was made by renaming.
      (backup-buffer-copy): Set SELinux context to the target file.
      (basic-save-buffer): Set SELinux context of the newly written file.
      (basic-save-buffer-1): Now it also returns any SELinux context.
      (basic-save-buffer-2): Set SELinux context of the newly created file,
      and return it.
      * lisp/net/tramp.el (tramp-file-name-for-operation):
      Add file-selinux-context.
      574c05e2
  7. 14 Apr, 2010 1 commit
    • Dan Nicolaescu's avatar
      Reduce cpp use in Makefile.in. · 19d4c244
      Dan Nicolaescu authored
      * Makefile.in (DBUS_CFLAGS, DBUS_LIBS, GCONF_CFLAGS, GCONF_LIBS)
      (LIBSOUND, CFLAGS_SOUND, RSVG_LIBS, RSVG_CFLAGS, INTERVALS_H)
      (GETLOADAVG_LIBS, RUN_TEMACS): Move to the autoconf section.
      (ORDINARY_LINK): Remove, defined in src/s/gnu.h.
      (CRT0_COMPILE): Remove, inline it in the only user.
      19d4c244
  8. 12 Apr, 2010 3 commits
  9. 11 Apr, 2010 2 commits
    • Dan Nicolaescu's avatar
      Remove C_SWITCH_SYSTEM_TEMACS. · b1f52161
      Dan Nicolaescu authored
      * s/darwin.h (C_SWITCH_SYSTEM_TEMACS): Remove.
      (malloc, realloc, free): Use emacs, not temacs for conditional
      definition.
      
      * Makefile.in (C_SWITCH_SYSTEM_TEMACS): Remove.
      (ALL_CFLAGS): Do not use C_SWITCH_SYSTEM_TEMACS.
      b1f52161
    • Dan Nicolaescu's avatar
      Use autoconf, not cpp for some variables. · 8d9c8ece
      Dan Nicolaescu authored
      * Makefile.in (C_SWITCH_SYSTEM, C_SWITCH_MACHINE)
      (C_SWITCH_X_SITE): Define using autoconf, not cpp.
      (ALL_CFLAGS): Use them as make variables.
      (really-lwlib, really-oldXMenu): Do not pass them.
      8d9c8ece
  10. 01 Apr, 2010 2 commits
    • Dan Nicolaescu's avatar
      Remove all uses of LIBX11_SYSTEM. · 8224f93d
      Dan Nicolaescu authored
      * Makefile.in (LIBX11_SYSTEM): Remove.
      * s/msdos.h (LIBX11_SYSTEM): Do not define, define LIBS_SYSTEM
      instead.
      
      * configure.in: Remove all references to LIBX11_SYSTEM.
      8224f93d
    • Glenn Morris's avatar
      Cosmetic change to src/Makefile.in. · 0dc2e11d
      Glenn Morris authored
      * Makefile.in (LIBTIFF, LIBJPEG, LIBPNG, LIBGIF, LIBXPM, XFT_LIBS):
      Define as Makefile variables.
      (LIBX): Use above variables rather than directly using autoconf.
      0dc2e11d
  11. 30 Mar, 2010 1 commit
    • Dan Nicolaescu's avatar
      Remove all uses of C_DEBUG_SWITCH and LIBS_DEBUG. · 32a8894e
      Dan Nicolaescu authored
      * s/usg5-4.h (LIBS_DEBUG):
      * s/irix6-5.h (C_DEBUG_SWITCH):
      * s/gnu-linux.h (LIBS_DEBUG):
      * s/darwin.h (LIBS_DEBUG):
      * s/bsd-common.h (LIBS_DEBUG):
      * s/aix4-2.h (LIBS_DEBUG, C_DEBUG_SWITCH):
      * m/iris4d.h (LIBS_DEBUG):
      * m/hp800.h (LIBS_DEBUG): Remove definitions.
      
      * Makefile.in (LIBES): Remove reference to LIBS_DEBUG.
      (LIBS_DEBUG): Remove definition.
      
      * configure.in: Remove all references to C_DEBUG_SWITCH.
      32a8894e
  12. 28 Mar, 2010 1 commit
    • Glenn Morris's avatar
      Close bug#5336. · 25c72475
      Glenn Morris authored
      * Makefile.in (SOME_MACHINE_OBJECTS): Ensure dbus stuff is always
      in the DOC file.
      25c72475
  13. 21 Mar, 2010 2 commits
    • Andreas Schwab's avatar
      Use absolute directory names substituted by configure · 82c3d67a
      Andreas Schwab authored
      * lisp/Makefile.in (top_srcdir): Define.
      (abs_top_builddir): Define.
      (srcdir): Don't append `/..'.
      (EMACS): Use ${abs_top_builddir}.
      (all, compile, compile-always, compile-last): Don't set emacswd.
      (update-subdirs, update-authors): Use $(top_srcdir) instead of
      $(srcdir).
      (lisp): Use $(srcdir) instead of @srcdir@.
      * src/Makefile.in (abs_builddir): Define.
      (bootstrap_exe): Use it.
      (VPATH): Use $(srcdir) instead of @srcdir@.
      82c3d67a
    • Andreas Schwab's avatar
      Expand ${bootstrap_exe} before chdir · c0282183
      Andreas Schwab authored
      c0282183
  14. 20 Mar, 2010 2 commits
    • Stefan Monnier's avatar
      Use more relative file and directory names in `lisp' make rules. · 3613edce
      Stefan Monnier authored
      * lisp/Makefile.in (EMACS): Arrange for it to work when we chdir.
      (setwins, setwins_almost, setwins_for_subdirs):
      Don't `cd'; output relative names.
      (all, compile, compile-always, compile-last): Set emacswd.
      (custom-deps, finder-data, autoloads, update-subdirs, compile-last):
      Just cd to the lisp source dir so we can use relative file names.
      * src/Makefile.in (bootstrap_exe): Use an absolute name.
      3613edce
    • Dan Nicolaescu's avatar
      Remove obsolete uses of HAVE_SHM. · aed71cf4
      Dan Nicolaescu authored
      * emacs.c (standard_args):
      (Fdump_emacs):
      (syms_of_emacs): Remove code depending on HAVE_SHM.
      
      * alloc.c: Remove HAVE_SHM dependent definition.
      
      * Makefile.in (RUN_TEMACS): Do not depend on HAVE_SHM.
      aed71cf4
  15. 18 Mar, 2010 1 commit
    • Glenn Morris's avatar
      Replace some cpp with autoconf. · aded53ff
      Glenn Morris authored
      * configure.in (--with-mmdf, --with-mail-unlink):
      New options, off by default.
      (--with-mailhost): New option to set default POP host.
      (LIBXPM, LIBJPEG, LIBPNG, LIBTIFF, LIBGIF, LIBGPM, LIBS_MAIL)
      (LIBHESIOD, LIBRESOLV, COM_ERRLIB, CRYPTOLIB, KRB5LIB, DESLIB, KRB4LIB):
      New variables, substituted in Makefiles.
      (try_libungif, ac_gif_lib_name): Replace with HAVE_GIF=maybe, LIBGIF.
      (LIBGIF): Use AC_SUBST rather than AC_DEFINE.
      (HAVE_LIBMAIL, HAVE_LIBLOCKFILE, HAVE_LIBCOM_ERR, HAVE_LIBCRYPTO)
      (HAVE_LIBK5CRYPTO, HAVE_LIBKRB5, HAVE_LIBDES425, HAVE_LIBDES)
      (HAVE_LIBKRB4, HAVE_LIBKRB): New AC_DEFINEs.
      
      * lib-src/Makefile.in (KRB4LIB, DESLIB, KRB5LIB, CRYPTOLIB, COM_ERRLIB)
      (HESIODLIB, LIBS_MAIL): Set using autoconf rather than cpp.
      (BASE_CFLAGS): Remove (identical to CPP_CFLAGS).
      
      * src/Makefile.in (XFT_LIBS, LIBXPM, LIBJPEG, LIBPNG, LIBTIFF, LIBGIF)
      (LIBGPM, LIBRESOLV): Set using autoconf rather than cpp.
      aded53ff
  16. 13 Mar, 2010 1 commit
  17. 16 Jan, 2010 1 commit
  18. 13 Jan, 2010 1 commit
  19. 01 Jan, 2010 1 commit
  20. 31 Dec, 2009 2 commits
    • Eli Zaretskii's avatar
      Retrospective commit from 2009-08-15. · f44e260c
      Eli Zaretskii authored
      Start of work on bidi Emacs 23/24.
      
       bidi.c (bidi_initialize): Fix initialization of bidi_type_table.
      
       xdisp.c (set_iterator_to_next): Fix position setting after call
       to bidi_get_next_char_visually.
      
       bidi.c: Include stdio.h unconditionally.  Fix and elaborate
       commentary.  Add Copyright blurb.
      f44e260c
    • Eli Zaretskii's avatar
      Retrospective commit. · b7b65b15
      Eli Zaretskii authored
      These are the original changes made by Kenichi Handa on the old
      pre Emacs 22 emacs-bidi branch.
      b7b65b15
  21. 19 Dec, 2009 2 commits
    • Eli Zaretskii's avatar
      (alloc.o): Fix last change. · 49105cd0
      Eli Zaretskii authored
      49105cd0
    • Eli Zaretskii's avatar
      Update dependencies in Makefile.in. · 3f670e9a
      Eli Zaretskii authored
      (alloc.o): Depend on termhooks.h.
      (atimer.o): Depend on blockinput.h.
      (buffer.o): Depend on indent.h, keyboard.h, coding.h, keymap.h, and frame.h.
      (callint.o): Depend on systime.h, coding.h, and composite.h.
      (callproc.o): Depend on buffer.h.
      (casefiddle.o): Don't depend on charset.h.
      (casetab.o): Depend on character.h.
      (ccl.o): Depend on composite.h.
      (chartab.o): Depend on ccl.h.
      (cm.o): Depend on dispextern.h.
      (cmds.o): Depend on systime.h, coding.h, frame.h, and composite.h.
      (coding.o): Don't depend on $(INTERVALS_H).
      (composite.o): Don't depend on dispextern.h explicitly (it's in
      $(INTERVALS_H)).  Depend on ccl.h.
      (data.o): Depend on systime.h, coding.h, composite.h, dispextern.h, font.h,
      and ccl.h.
      (dired.o): Depend on composite.h.
      (dispnew.o): Depend on coding.h.  Don't depend explicitly on
      composite.h (it's in $(INTERVALS_H)).
      (doc.o): Depend on systime.h, coding.h, and composite.h.
      (editfns.o): Don't depend explicitly on dispextern.h.
      (emacs.o): Depend on frame.h and coding.h.
      (eval.o): Depend on coding.h, composite.h, and xterm.h.
      (fileio.o): Depend on frame.h and commands.h.  Don't depend
      explicitly on dispextern.h.
      (filelock.o): Don't depend on epaths.h and charset.h.  Depend on composite.h.
      (fns.o): Don't depend on termhooks.h.
      (font.o): Depend on buffer.h, composite.h, fontset.h, and xterm.h.
      (fontset.o): Depend on blockinput.h, atimer.h, systime.h, coding.h,
      $(INTERVALS_H), window.h, xterm.h.
      (frame.o): Depend on coding.h, composite.h, termhooks.h, and ccl.h.
      (fringe.o): Depend on blockinput.h, atimer.h, and systime.h.
      (ftfont.o): Depend on blockinput.h, atimer.h, systime.h, coding.h,
      fontset.h, ccl.h, and ftfont.h.
      (ftxfont.o): Depend on atimer.h, systime.h, fontset.h, and ccl.h.
      (gtkutil.o): Depend on dispextern.h and composite.h.
      (image.o): Depend on epaths.h, character.h, coding.h, composite.h,
      termhooks.h, and ccl.h.
      (indent.o): Depend on systime.h, coding.h, and $(INTERVALS_H).
      (intervals.o): Depend on systime.h and coding.h.
      (keyboard.o): Depend on composite.h and coding.h.
      (keymap.o): Depend on coding.h and frame.h.
      (lread.o): Depend on systime.h, frame.h, blockinput.h, and atimer.h.
      (macros.o): Depend on systime.h, coding.h, and composite.h.
      (menu.o): Depend on systime.h, coding.h, composite.h, window.h, and atimer.h.
      (minibuf.o): Depend on systime.h and coding.h.  Don't depend on
      dispextern.h explicitly.
      (print.o): Depend on termhooks.h, coding.h, and ccl.h.  Don't
      depend explicitly on dispextern.h and composite.h.
      (process.o): Depend on character.h, xgselect.h, and sysselect.h.
      (regex.o): Don't depend on charset.h.
      (scroll.o): Depend on systime.h, coding.h, composite.h, and window.h.
      (search.o): Don't depend explicitly on composite.h.
      (sound.o): Depend on atimer.h and systime.h.
      (syntax.o): Don't depend explicitly on composite.h.
      (sysdep.o): Depend on coding.h and composite.h.
      (term.o): Depend on xterm.h and buffer.h.
      (terminal.o): Depend on dispextern.h, composite.h, and systime.h.
      (textprop.o): Don't depend on dispextern.h explicitly.
      (undo.o): Depend on dispextern.h.
      (window.o): Depend on coding.h and termhooks.h.  Don't depend on
      dispextern.h and composite.h explicitly.
      (xdisp.o): Depend on ccl.h.
      (xfaces.o): Depend on coding.h and ccl.h.
      (xfns.o): Depend on $(INTERVALS_H) and ccl.h.
      (xfont.o): Depend on atimer.h, systime.h, fontset.h, and ccl.h.
      (xftfont.o): Depend on atimer.h, systime.h, fontset.h, ccl.h, and ftfont.h.
      (xgselect.o): New dependency.
      (xmenu.o): Depend on composite.h, keymap.h, and sysselect.h.
      (xselect.o): Depend on keyboard.h, coding.h, and composite.h.
      (xsettings.o): Depend on dispextern.h, keyboard.h, systime.h,
      coding.h, composite.h, blockinput.h, atimer.h, and termopts.h.
      (xsmfns.o): Depend on frame.h and dispextern.h.
      (xterm.o): Depend on intervals.h, keymap.h, xgselect.h, and sysselect.h.
      3f670e9a
  22. 17 Dec, 2009 1 commit