1. 07 May, 2010 4 commits
    • Eli Zaretskii's avatar
      Fix MS-DOS configuring in lib-src/ and src/, broken by autoconfiscation. · 9fdec8bc
      Eli Zaretskii authored
       src/Makefile.in: Don't use Make-style comments past the "start of
       cpp stuff" line.
       (MSDOS_OBJ): Remove xmenu.o (it is now defined by XMENU_OBJ).
       src/s/msdos.h (UNEXEC): Don't define (@unexec@ in Makefile.in is
       edited directly by msdos/sed1v2.inp).
       msdos/sed3v2.inp (C_SWITCH_MACHINE): Edit to empty.
       msdos/sed1v2.inp (@LIB_MATH@): Edit to -lm.
       (C_SWITCH_MACHINE, C_SWITCH_SYSTEM, LD_SWITCH_SYSTEM_TEMACS)
       (LD_SWITCH_X_SITE_AUX, LD_SWITCH_X_SITE_AUX_RPATH)
       (LD_SWITCH_SYSTEM, LD_SWITCH_SYSTEM_EXTRA, LIBTIFF, LIBJPEG)
       (LIBPNG, LIBGIF, LIBXPM, XFT_LIBS, DBUS_CFLAGS, DBUS_LIBS)
       (DBUS_OBJ, GCONF_CFLAGS, GCONF_LIBS, GTK_OBJ, LIBXMU, LIBXSM)
       (LIBXTR6, XOBJ, TOOLKIT_LIBW, WIDGET_OBJ, CYGWIN_OBJ, NS_OBJ)
       (NS_SUPPORT, LIBSELINUX_LIBS, START_FILES): Edit to empty.
       (XMENU_OBJ): Edit to xmenu.o.
       (FONT_OBJ): Edit to value used for X on Unix.
       (PRE_ALLOC_OBJ): Edit to lastfile.o.
       (POST_ALLOC_OBJ): Edit to $(vmlimitobj).
       (@unexec@): Edit to unexec.o.
      9fdec8bc
    • Eli Zaretskii's avatar
      Fix the "config msdos" step of MS-DOS build (due to removal of some cpp stuff from configury). · f724825e
      Eli Zaretskii authored
       config.bat: Allow for 2 leading `#'s in comments in src/Makefile.in.
       src/Makefile.in: Don't use Make-style comments past the
       "start of cpp stuff" line.
      f724825e
    • Glenn Morris's avatar
      Move LD_SWITCH_SYSTEM from cpp to configure. · 2f86b22b
      Glenn Morris authored
      * configure.in (LD_SWITCH_SYSTEM): Set with configure, not cpp.
      Merges logic from src/s/* and src/Makefile.in.
      (LD_SWITCH_SYSTEM_TEMACS): New output variable.
      
      * src/Makefile.in (LD_SWITCH_SYSTEM): Set with configure, not cpp.
      (LD_SWITCH_SYSTEM_EXTRA): New variable, set by configure.
      (TEMACS_LDFLAGS): Use $LD_SWITCH_SYSTEM and $LD_SWITCH_SYSTEM_EXTRA,
      move out of cpp section.
      * src/s/freebsd.h (LD_SWITCH_SYSTEM):
      * src/s/gnu-linux.h (LD_SWITCH_SYSTEM):
      * src/s/netbsd.h (LD_SWITCH_SYSTEM):
      
      * admin/CPP-DEFINES: Remove LD_SWITCH_SYSTEM.
      2f86b22b
    • Dan Nicolaescu's avatar
      Define LIB_STANDARD and START_FILES using autoconf. · 49ebbd65
      Dan Nicolaescu authored
      * s/usg5-4.h (LIB_STANDARD):
      * s/netbsd.h (START_FILES):
      * s/irix6-5.h (LIB_STANDARD):
      * s/hpux10-20.h (LIB_STANDARD, START_FILES):
      * s/gnu-linux.h (START_FILES, LIB_STANDARD):
      * s/freebsd.h (START_FILES):
      * s/darwin.h (START_FILES):
      * s/cygwin.h (START_FILES):
      * s/aix4-2.h (LIB_STANDARD):
      * m/ibmrs6000.h (START_FILES): Remove, move logic to configure.in.
      * Makefile.in (STARTFILES): Rename to START_FILES, define using
      autoconf, not cpp.
      
      Define START_FILES and LIB_STANDARD using autoconf.
      * configure.in (START_FILES, LIB_STANDARD): New definitions, moved
      here from src/s/*.h.
      (HAVE_CRTIN): Remove, inline logic in the netbsd
      START_FILES/LIB_STANDARD computation.
      49ebbd65
  2. 06 May, 2010 3 commits
  3. 04 May, 2010 4 commits
    • Glenn Morris's avatar
      Move LD_SWITCH_X_SITE_AUX from cpp to autoconf. · 27a2cdfc
      Glenn Morris authored
      * configure.in (LD_SWITCH_X_SITE_AUX): Use AC_SUBST only, not AC_DEFINE as well.
      (LD_SWITCH_X_SITE_AUX_RPATH): New output variable.
      
      * nt/config.nt (LD_SWITCH_X_SITE_AUX): Remove.
      
      * src/s/gnu-linux.h (LD_SWITCH_SYSTEM): Use LD_SWITCH_X_SITE_AUX as a shell
      variable.
      * src/s/netbsd.h (LD_SWITCH_SYSTEM_tmp): Remove.
      (LD_SWITCH_SYSTEM): Use $LD_SWITCH_X_SITE_AUX_RPATH.
      * src/s/openbsd.h (LD_SWITCH_SYSTEM_tmp): Remove.
      (LD_SWITCH_SYSTEM): Use $LD_SWITCH_X_SITE_AUX_RPATH instead of
      LD_SWITCH_SYSTEM_tmp.
      * src/Makefile.in (LD_SWITCH_X_SITE_AUX, LD_SWITCH_X_SITE_AUX_RPATH):
      New variables, set by configure.
      27a2cdfc
    • Glenn Morris's avatar
      Move LD_SWITCH_SYSTEM_TEMACS from cpp to autoconf. · eb21eab5
      Glenn Morris authored
      * configure.in (LD_SWITCH_SYSTEM_TEMACS): New output variable.
      
      * src/s/aix4-2.h (LD_SWITCH_SYSTEM_TEMACS): Move to configure.in.
      * src/s/darwin.h (HEADERPAD_EXTRA, LIBS_NSGUI): Remove.
      (LD_SWITCH_SYSTEM_TEMACS): Move to configure.in.
      * src/Makefile.in (LD_SWITCH_SYSTEM_TEMACS): New variable, set by configure.
      (TEMACS_LDFLAGS): Use $LD_SWITCH_SYSTEM_TEMACS.
      eb21eab5
    • Glenn Morris's avatar
      Move C_SWITCH_MACHINE, C_SWITCH_SYSTEM from cpp to autoconf. · 49628785
      Glenn Morris authored
      * configure.in (C_SWITCH_MACHINE, C_SWITCH_SYSTEM): New output
      variables, replacing c_switch_machine, c_switch_system.
      
      * src/s/aix4-2.h (C_SWITCH_SYSTEM):
      * src/m/alpha.h (C_SWITCH_MACHINE):
      Move to configure.in.
      * src/Makefile.in (C_SWITCH_MACHINE, C_SWITCH_SYSTEM):
      New variables, set by configure.
      (ALL_CFLAGS): Use $C_SWITCH_MACHINE and $C_SWITCH_SYSTEM in place of
      $c_switch_machine and $c_switch_system.
      
      * lib-src/Makefile.in: Use @C_SWITCH_SYSTEM@, @C_SWITCH_MACHINE@
      rather than @c_switch_system@, @c_switch_machine@.
      49628785
    • Dan Nicolaescu's avatar
      * s/hpux10-20.h (LIB_STANDARD): New definition. · 7dff330b
      Dan Nicolaescu authored
      * Makefile.in (ORDINARY_LINK): Remove setting LIB_STANDARD based
      on it, not used anymore.
      7dff330b
  4. 03 May, 2010 1 commit
    • Glenn Morris's avatar
      Replace some X-related cpp with autoconf. · 3dee6fdb
      Glenn Morris authored
      * configure.in (LIBXT_OTHER, LIBX_OTHER): New output variables.
      
      * src/Makefile.in (LIBX_EXTRA, LIBX_BASE): New variables.
      (LIBXT_OTHER, LIBX_OTHER): New, set by configure.
      (LIBXT): Set with configure, not cpp.
      (LIBX): Remove.
      (LIBES): Replace $LIBX with $LIBX_BASE and $LIBX_OTHER.
      3dee6fdb
  5. 01 May, 2010 2 commits
    • Dan Nicolaescu's avatar
      Remove LD_SWITCH_MACHINE. · cd03c74a
      Dan Nicolaescu authored
      * Makefile.in (LD_SWITCH_MACHINE): Remove definition, unused.
      (TEMACS_LDFLAGS): Do not use LD_SWITCH_MACHINE.
      
      * configure.in (LD_SWITCH_MACHINE, ld_switch_machine): Remove, unused.
      (ac_link): Do not use ld_switch_machine.
      cd03c74a
    • Glenn Morris's avatar
      Rework previous autoconf changes, hopefully to make clearer. · 7acac9f4
      Glenn Morris authored
      * configure.in (OTHER_OBJ): Remove.
      (PRE_ALLOC_OBJ, POST_ALLOC_OBJ): New output variables.
      
      * configure: Regenerate.
      
      * src/Makefile.in (gmallocobj, rallocobj, vmlimitobj): Initialize to null,
      for clarity.
      (OTHER_OBJ): Remove.
      (PRE_ALLOC_OBJ, POST_ALLOC_OBJ): New, set by configure.
      (otherobj): Use PRE_ALLOC_OBJ, POST_ALLOC_OBJ rather than OTHER_OBJ.
      7acac9f4
  6. 30 Apr, 2010 5 commits
  7. 28 Apr, 2010 6 commits
  8. 27 Apr, 2010 7 commits
    • Glenn Morris's avatar
      Move LIBXTR6 from cpp to autoconf. · 8fdac2c3
      Glenn Morris authored
      * configure.in (LIBXTR6): New output variable.  Move unixware special
      case here from src/s/unixware.h.
      
      * src/Makefile.in (LIBXTR6): Set with configure, not cpp.
      * src/s/unixware.h (NEED_LIBW): Remove definition.
      
      * admin/CPP-DEFINES: Remove NEED_LIBW.
      8fdac2c3
    • Glenn Morris's avatar
      Replace LUCID_LIBW, MOTIF_LIBW with TOOLKIT_LIBW. · 986fb647
      Glenn Morris authored
      * configure.in (LUCID_LIBW, MOTIF_LIBW): No longer substitute in Makefiles.
      (TOOLKIT_LIBW): New output variable, replacing LUCID_LIBW/MOTIF_LIBW.
      
      * src/Makefile.in (LUCID_LIBW, MOTIF_LIBW): Remove, replacing by...
      (TOOLKIT_LIBW): New, set by configure.
      (@X_TOOLKIT_TYPE@): No longer define it.
      986fb647
    • 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
  9. 26 Apr, 2010 3 commits
  10. 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
  11. 23 Apr, 2010 3 commits
  12. 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