1. 07 May, 2010 3 commits
    • 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 1 commit
    • Glenn Morris's avatar
      Remove some unused Makefile.in variables. · e3cf0cde
      Glenn Morris authored
      * configure.in (AC_PROG_LN_S): Remove test, nothing uses @LN_S@.
      
      * Makefile.in (CPP, C_SWITCH_SYSTEM, ALLOCA, LN_S, C_SWITCH_X_SITE)
      (LD_SWITCH_X_SITE): Remove unused variables.
      
      * lwlib/Makefile.in (CPP, LN_S, TOP, LN): Remove unused variables.
      
      * oldXMenu/Makefile.in (CPP, LN_S, AS, LD, MV, LS, LINTOPTS, LINTLIBFLAG, MAKE)
      (STD_DEFINES, CDEBUGFLAGS, RM_CMD): Remove unused variables.
      
      * src/Makefile.in (CPP, LN_S): Remove unused variables.
      
      * msdos/sed1v2.inp, msdos/sed5x.inp: Remove LN_S, unused.
      e3cf0cde
  3. 04 May, 2010 4 commits
    • Glenn Morris's avatar
      Yet another missing piece of C_SWITCH commit. · fa5e317a
      Glenn Morris authored
      * Makefile.in (C_SWITCH_SYSTEM): Use @C_SWITCH_SYSTEM@ rather than
      @c_switch_system@.
      
      * oldXMenu/Makefile.in (C_SWITCH_SYSTEM, C_SWITCH_MACHINE): Use
      @C_SWITCH_SYSTEM@, @C_SWITCH_MACHINE@ rather than
      @c_switch_system@, @c_switch_machine@.
      fa5e317a
    • 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
  4. 03 May, 2010 2 commits
  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 3 commits
    • Glenn Morris's avatar
      Hopefully fix bug#6065. · 5a1bb006
      Glenn Morris authored
      * configure.in (OTHER_OBJ): Always include vm-limit.o on Cygwin.
      Elsewhere, maybe include it.
      * src/Makefile.in (vmlimitobj) [!SYSTEM_MALLOC]: New variable.
      (OTHER_OBJ): Define as a separate variable, for clarity.
      
      * configure: Regenerate.
      5a1bb006
    • Glenn Morris's avatar
      Replace some xmenu cpp with autoconf. · d5096f16
      Glenn Morris authored
      * configure.in (TOOLKIT_LIBW) [HAVE_GTK]: Set to $GTK_LIBS.
      (OLDXMENU, LIBXMENU): New output variables.
      * src/Makefile.in (OLDXMENU, LIBXMENU) [HAVE_MENUS]:
      Set with configure, not cpp.
      (LIBW): Remove, replace with $TOOLKIT_LIBW.
      d5096f16
    • Glenn Morris's avatar
      Replace some cpp with autoconf. · 7eb1ac33
      Glenn Morris authored
      * configure.in (OTHER_OBJ): New output variable.
      * src/Makefile.in (mallocobj): Remove.
      (otherobj): Simplify using @OTHER_OBJ@.
      7eb1ac33
  7. 28 Apr, 2010 6 commits
  8. 27 Apr, 2010 8 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
      Remove some AC_DEFINEs that are now unused. · 8ea5f2d9
      Glenn Morris authored
      * configure.in (HAVE_MOTIF_2_1, HAVE_LIBXP): Remove unused AC_DEFINEs,
      replaced by LIBXP.
      
      * configure, src/config.in: Regenerate.
      8ea5f2d9
    • 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 1 commit
  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 1 commit
  12. 22 Apr, 2010 2 commits
  13. 21 Apr, 2010 5 commits
    • Andreas Schwab's avatar
      Avoid non-portable shell command negation · bf3126f6
      Andreas Schwab authored
      * configure.in: Revert last change.
      bf3126f6
    • Jan Djärv's avatar
      configure.in: Change "if test ! -f" to "if ! test -f". · e765bf58
      Jan Djärv authored
      Regenerate configure.
      e765bf58
    • 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
  14. 02 Apr, 2010 1 commit