mirror of
https://git.savannah.gnu.org/git/emacs.git
synced 2025-01-14 16:50:58 +00:00
ccdaf04cfd
* config.bat: * msdos/sedlisp.inp: * msdos/sedlibmk.inp: * msdos/sedleim.inp: * msdos/sedadmin.inp: * msdos/sed6.inp: * msdos/sed3v2.inp: * msdos/sed2v2.inp: * msdos/sed1v2.inp: Adapt to Emacs 25. * src/process.c (remove_slash_colon): Move out of "#ifdef subprocesses" block, as it its called unconditionally. Move ADD_SUBFEATURE calls into "#ifdef subprocesses" block, as they reference variables only defined in that block. * src/msdos.h: Provide prototypes for IT_set_frame_parameters, faccessat, msdos_fatal_signal, syms_of_msdos, pthread_sigmask, dos_keysns, dos_keyread, run_msdos_command, and syms_of_win16select, to avoid compiler warnings. * src/msdos.c (SYS_ENVIRON): Define to either '_environ' or 'environ', depending on the DJGPP version. Remove declarations of externally-visible Lisp objects, like Qbackground_color and Qreverse. (run_msdos_command): First argument is not signed, not unsigned. Use SYS_ENVIRON. (sys_select): Use 'timespec_cmp' instead of 'timespec_sign', as the latter doesn't work when 'time_t' is an unsigned data type. This caused idle timers to behave incorrectly: they only fired after a keyboard input event. * src/frame.c (adjust_frame_size) [MSDOS]: Account for FRAME_TOP_MARGIN that isn't counted in the frame's number of lines, but dos_set_window_size needs it to be added. * src/lread.c (INFINITY, NAN) [DJGPP < 2.05]: Provide definitions. * src/fns.c (sort_vector_copy) [__GNUC__ < 4]: Provide a prototype that works around compilation errors with older GCC versions. * src/w16select.c: Don't declare QCLIPBOARD and QPRIMARY as Lisp Objects. * src/filelock.c [MSDOS]: Ifdef away most of the code. Provide no-op implementations for 'lock_file' and 'unlock_file'. (Ffile_locked_p) [MSDOS]: Always return nil. This avoids multiple ifdefs in all users of filelock.c functionality. * src/conf_post.h (EOVERFLOW, SIZE_MAX) [DJGPP < 2.04]: Define. * src/emacs.c [MSDOS]: Include dosfns.h, to avoid compiler warnings. * src/dosfns.h: Provide prototypes for dos_cleanup, syms_of_dosfns, and init_dosfns. * src/deps.mk (atimer.o): Depend on msdos.h. (emacs.o): Depend on dosfns.h. * src/atimer.c [MSDOS]: Include msdos.h, to avoid compiler warnings. * lisp/window.el (window--adjust-process-windows): Skip the body if 'process-list' is not available. This avoids failure to start up on MS-DOS. * lisp/vc/diff.el (diff-no-select): Test 'make-process', not 'start-process', as the latter is now available on all platforms. * lisp/textmodes/ispell.el (ispell-async-processp): Replace 'start-process' with 'make-process' in a comment. * lisp/term/internal.el (IT-unicode-translations): Modify and add a few translations to display Info files with Unicode markup. Fix an ancient off-by-one mismatch error with Unicode codepoints. * lisp/progmodes/compile.el (compilation-start): Test 'make-process', not 'start-process', as the latter is now available on all platforms. * lisp/man.el (Man-build-man-command, Man-getpage-in-background): Test 'make-process', not 'start-process', as the latter is now available on all platforms. * lisp/international/mule-cmds.el (set-coding-system-map): Test 'make-process', not 'start-process', as the latter is now available on all platforms. * lisp/eshell/esh-cmd.el (eshell-do-pipelines-synchronously): Doc fix. (eshell-execute-pipeline): Test 'make-process', not 'start-process', as the latter is now available on all platforms.
245 lines
8.3 KiB
Plaintext
245 lines
8.3 KiB
Plaintext
# -sed1v2.inp-----------------------------------------------------------
|
|
# Configuration script for src/Makefile under DJGPP v2.x
|
|
# ----------------------------------------------------------------------
|
|
#
|
|
# Copyright (C) 1996-1997, 1999-2016 Free Software Foundation, Inc.
|
|
#
|
|
# This file is part of GNU Emacs.
|
|
#
|
|
# This file is free software; as a special exception, the author gives
|
|
# unlimited permission to copy and/or distribute it, with or without
|
|
# modifications, as long as this notice is preserved.
|
|
#
|
|
# This program is distributed in the hope that it will be useful,
|
|
# but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
|
|
#
|
|
# ----------------------------------------------------------------------
|
|
s/^[ \f\t][ \f\t]*$//
|
|
s/^ / /
|
|
s/\.h\.in/.h-in/
|
|
/^SHELL *=/s/^/# /
|
|
/^srcdir *=/s/@[^@\n]*@/./
|
|
/^top_srcdir *=/s/@[^@\n]*@/../
|
|
/^CC *=/s/@[^@\n]*@/gcc -std=gnu99/
|
|
/^CFLAGS *=/s/@[^@\n]*@/-O2 -gcoff/
|
|
/^ALL_CFLAGS *=/s/@[^@\n]*@//g
|
|
/^ALL_CFLAGS *=/s/ -I\.//g
|
|
/^CPPFLAGS *=/s|@[^@\n]*@|-I../msdos|
|
|
/^LDFLAGS *=/s/@[^@\n]*@//
|
|
/^LIBOBJS *=/s/@[^@\n]*@//
|
|
/^C_SWITCH_MACHINE *=/s/@C_SWITCH_MACHINE@//
|
|
/^C_SWITCH_SYSTEM *=/s/@C_SWITCH_SYSTEM@//
|
|
/^GNUSTEP_CFLAGS *=/s/@GNUSTEP_CFLAGS@//
|
|
/^C_SWITCH_X_SITE *=/s/@C_SWITCH_X_SITE@//
|
|
/^PNG_CFLAGS *=/s/@PNG_CFLAGS@//
|
|
/^WARN_CFLAGS *=/s/@WARN_CFLAGS@//
|
|
/^WERROR_CFLAGS *=/s/@WERROR_CFLAGS@//
|
|
/^PROFILING_CFLAGS *=/s/@PROFILING_CFLAGS@//
|
|
#/^LD_SWITCH_X_SITE *=/s/@LD_SWITCH_X_SITE@//
|
|
/^LD_SWITCH_SYSTEM_TEMACS *=/s/@LD_SWITCH_SYSTEM_TEMACS@//
|
|
/^LD_SWITCH_X_SITE_AUX *=/s/@LD_SWITCH_X_SITE_AUX@//
|
|
/^LD_SWITCH_X_SITE_AUX_RPATH *=/s/@LD_SWITCH_X_SITE_AUX_RPATH@//
|
|
/^LD_SWITCH_X_SITE_RPATH *=/s/@LD_SWITCH_X_SITE_RPATH@//
|
|
/^LD_SWITCH_SYSTEM *=/s/@LD_SWITCH_SYSTEM@//
|
|
/^LIBS_SYSTEM *=/s/@LIBS_SYSTEM@//
|
|
/^LIB_GCC *=/s/@LIB_GCC@//
|
|
/^LIB_STANDARD *=/s/@LIB_STANDARD@//
|
|
/^LIB_MATH *=/s/@LIB_MATH@/-lm/
|
|
/^LIB_PTHREAD *=/s/@LIB_PTHREAD@//
|
|
/^LIB_ACL *=/s/@LIB_ACL@//
|
|
/^LIB_EACCESS *=/s/@LIB_EACCESS@//
|
|
/^LIB_FDATASYNC *=/s/@LIB_FDATASYNC@//
|
|
s/ *@LIBTIFF@//
|
|
s/ *@LIBJPEG@//
|
|
s/ *@LIBPNG@//
|
|
s/ *@LIBGIF@//
|
|
s/ *@LIBXPM@//
|
|
/^XFT_LIBS *=/s/@XFT_LIBS@//
|
|
/^XCB_LIBS *=/s/@XCB_LIBS@//
|
|
/^FONTCONFIG_CFLAGS *=/s/@FONTCONFIG_CFLAGS@//
|
|
/^FONTCONFIG_LIBS *=/s/@FONTCONFIG_LIBS@//
|
|
/^FREETYPE_CFLAGS *=/s/@FREETYPE_CFLAGS@//
|
|
/^FREETYPE_LIBS *=/s/@FREETYPE_LIBS@//
|
|
/^LIBOTF_CFLAGS *=/s/@LIBOTF_CFLAGS@//
|
|
/^LIBOTF_LIBS *=/s/@LIBOTF_LIBS@//
|
|
/^M17N_FLT_CFLAGS *=/s/@M17N_FLT_CFLAGS@//
|
|
/^M17N_FLT_LIBS *=/s/@M17N_FLT_LIBS@//
|
|
/^DBUS_CFLAGS *=/s/@DBUS_CFLAGS@//
|
|
/^DBUS_LIBS *=/s/@DBUS_LIBS@//
|
|
/^DBUS_OBJ *=/s/@DBUS_OBJ@//
|
|
/^NOTIFY_OBJ *=/s/@NOTIFY_OBJ@//
|
|
/^SETTINGS_CFLAGS *=/s/@SETTINGS_CFLAGS@//
|
|
/^SETTINGS_LIBS *=/s/@SETTINGS_LIBS@//
|
|
/^NOTIFY_LIBS *=/s/@NOTIFY_LIBS@//
|
|
/^NOTIFY_CFLAGS *=/s/@NOTIFY_CFLAGS@//
|
|
/^GTK_OBJ *=/s/@GTK_OBJ@//
|
|
/^LIBS_TERMCAP *=/s/@LIBS_TERMCAP@//
|
|
/^TERMCAP_OBJ *=/s/@TERMCAP_OBJ@/termcap.o tparam.o/
|
|
/^LIBXMU *=/s/@LIBXMU@//
|
|
/^LIBXSM *=/s/@LIBXSM@//
|
|
/^LIBXTR6 *=/s/@LIBXTR6@//
|
|
/^LIBXT_OTHER *=/s/@LIBXT_OTHER@//
|
|
/^OLDXMENU_TARGET *=/s/@OLDXMENU_TARGET@//
|
|
/^OLDXMENU_DEPS *=/s/@OLDXMENU_DEPS@//
|
|
/^XOBJ *=/s/@XOBJ@//
|
|
/^XGSELOBJ *=/s/@XGSELOBJ@//
|
|
/^TOOLKIT_LIBW *=/s/@TOOLKIT_LIBW@//
|
|
/^LIBSOUND *=/s/@LIBSOUND@//
|
|
/^LIBS_GNUSTEP *=/s/=.*$/=/
|
|
/^CFLAGS_SOUND *=/s/@CFLAGS_SOUND@//
|
|
/^RSVG_LIBS *=/s/@RSVG_LIBS@//
|
|
/^RSVG_CFLAGS *=/s/@RSVG_CFLAGS@//
|
|
/^IMAGEMAGICK_LIBS *=/s/@IMAGEMAGICK_LIBS@//
|
|
/^IMAGEMAGICK_CFLAGS *=/s/@IMAGEMAGICK_CFLAGS@//
|
|
/^LIBXML2_LIBS *=/s/@LIBXML2_LIBS@//
|
|
/^LIBXML2_CFLAGS *=/s/@LIBXML2_CFLAGS@//
|
|
/^WIDGET_OBJ *=/s/@WIDGET_OBJ@//
|
|
/^XWIDGETS_OBJ *=/s/@XWIDGETS_OBJ@//
|
|
/^WEBKIT_LIBS *=/s/@WEBKIT_LIBS@//
|
|
/^WEBKIT_CFLAGS *=/s/@WEBKIT_CFLAGS@//
|
|
/^CAIRO_LIBS *=/s/@CAIRO_LIBS@//
|
|
/^CAIRO_CFLAGS *=/s/@CAIRO_CFLAGS@//
|
|
/^XFIXES_LIBS *=/s/@XFIXES_LIBS@//
|
|
/^XFIXES_CFLAGS *=/s/@XFIXES_CFLAGS@//
|
|
/^CYGWIN_OBJ *=/s/@CYGWIN_OBJ@//
|
|
/^WINDOW_SYSTEM_OBJ *=/s/@WINDOW_SYSTEM_OBJ@//
|
|
/^MSDOS_OBJ *=/s/= */= dosfns.o msdos.o w16select.o/
|
|
/^NS_OBJ *=/s/@NS_OBJ@//
|
|
/^NS_OBJC_OBJ *=/s/@NS_OBJC_OBJ@//
|
|
/^GNU_OBJC_CFLAGS*=/s/=.*$/=/
|
|
/^LIBRESOLV *=/s/@LIBRESOLV@//
|
|
/^LIBMODULES *=/s/@LIBMODULES@//
|
|
/^MODULES_OBJ *=/s/@MODULES_OBJ@//
|
|
/^LIBSELINUX_LIBS *=/s/@LIBSELINUX_LIBS@//
|
|
/^LIB_CLOCK_GETTIME *=/s/@[^@\n]*@//g
|
|
/^LIB_TIMER_TIME *=/s/@[^@\n]*@//g
|
|
/^LIB_EXECINFO *=/s/@[^@\n]*@//g
|
|
/^LIBGNUTLS_LIBS *=/s/@[^@\n]*@//
|
|
/^LIBGNUTLS_CFLAGS *=/s/@[^@\n]*@//
|
|
/^GETLOADAVG_LIBS *=/s/@[^@\n]*@//
|
|
/^START_FILES *=/s/@START_FILES@//
|
|
/^OTHER_FILES *=/s/@OTHER_FILES@//
|
|
/^XMENU_OBJ *=/s/@XMENU_OBJ@/xmenu.o/
|
|
/^FONT_OBJ *=/s/@FONT_OBJ@//
|
|
/^LIBGPM *=/s/@LIBGPM@//
|
|
/^LIBZ *=/s/@LIBZ@//
|
|
/^EXEEXT *=/s/@EXEEXT@/.exe/
|
|
/^MKDIR_P *=/s/@MKDIR_P@/gmkdir -p/
|
|
/^OLDXMENU *=/s/@OLDXMENU@/nothing/
|
|
/^LIBXMENU *=/s/@LIBXMENU@//
|
|
/^LIBX_OTHER *=/s/@LIBX_OTHER@//
|
|
/^XRANDR_LIBS *=/s/@XRANDR_LIBS@//
|
|
/^XRANDR_CFLAGS *=/s/@XRANDR_CFLAGS@//
|
|
/^XINERAMA_LIBS *=/s/@XINERAMA_LIBS@//
|
|
/^XINERAMA_CFLAGS *=/s/@XINERAMA_CFLAGS@//
|
|
/^GMALLOC_OBJ *=/s/@GMALLOC_OBJ@/gmalloc.o/
|
|
/^VMLIMIT_OBJ *=/s/@VMLIMIT_OBJ@/vm-limit.o/
|
|
/^FIRSTFILE_OBJ *=/s/@FIRSTFILE_OBJ@//
|
|
/^RALLOC_OBJ *=/s/@RALLOC_OBJ@/ralloc.o/
|
|
/^PRE_ALLOC_OBJ *=/s/@PRE_ALLOC_OBJ@/lastfile.o/
|
|
/^POST_ALLOC_OBJ *=/s/@POST_ALLOC_OBJ@/$(vmlimitobj)/
|
|
/^UNEXEC_OBJ *=/s/@UNEXEC_OBJ@/unexcoff.o/
|
|
/^CANNOT_DUMP *=/s/@CANNOT_DUMP@/no/
|
|
/^DEPFLAGS *=/s/@DEPFLAGS@//
|
|
/^MKDEPDIR *=/s/@MKDEPDIR@//
|
|
/^W32_OBJ *=/s/@W32_OBJ@//
|
|
/^W32_LIBS *=/s/@W32_LIBS@//
|
|
/^version *=/s/@[^@\n]*@//
|
|
/^EMACSRES *=/s/@EMACSRES@//
|
|
/^W32_RES_LINK *=/s/@W32_RES_LINK@//
|
|
/^CM_OBJ *=/s/@CM_OBJ@/cm.o/
|
|
/^@SET_MAKE@$/s/@SET_MAKE@//
|
|
/^ADDSECTION *=/s/@ADDSECTION@//
|
|
/^AM_DEFAULT_VERBOSITY *=/s/@AM_DEFAULT_VERBOSITY@/1/
|
|
/^[Aa][Mm]_/s/@AM_V@/$(V)/
|
|
/^[Aa][Mm]_/s/@AM_DEFAULT_V@/$(AM_DEFAULT_VERBOSITY)/
|
|
/^AUTO_DEPEND *=/s/@AUTO_DEPEND@/yes/
|
|
/^PAXCTL_if_present *=/s/=.*$/=@Rem/
|
|
/^lisp\.mk:/,/^$/c\
|
|
lisp.mk: $(lispsource)/loadup.el\
|
|
@rm -f $@\
|
|
${AM_V_GEN}printf 'shortlisp = \\n' > $@\
|
|
${AM_V_GEN}sed -n 's/^[ \t]*(load "\([^"]*\)".*/\1/p' $< | sed -e "s/$/.elc \/" -e "s/\.el\.elc/.el/" >> $@\
|
|
${AM_V_GEN}djecho "" >> $@
|
|
|
|
#"
|
|
|
|
/^ [ ]*\$(AM_V_at)\$(libsrc)\/make-docfile -d/s!make-docfile!make-docfile -o $(etc)/DOC!
|
|
/ > \$(etc)\/DOC *$/s/ >.*$//
|
|
/^ [ ]*\$(AM_V_GLOBALS)\$(libsrc)\/make-docfile.*>.*globals.tmp/s!make-docfile!make-docfile -o globals.tmp!
|
|
/^ [ ]*\$(AM_V_GLOBALS)\$(libsrc)\/make-doc/s!>.*$!!
|
|
/^\$(libsrc)\/make-docfile\$(EXEEXT): /i\
|
|
cd ../src
|
|
/^\$(leimdir)\/leim-list.el: /s/bootstrap-emacs\$(EXEEXT)/b-emacs$(EXEEXT)/
|
|
/^ if test -f/,/^ fi$/c\
|
|
command.com /c if exist .gdbinit rm -f _gdbinit
|
|
/^ *\$(PAXCTL_if_present) -zex/d
|
|
/^ *ln /s/ln /cp /
|
|
/^ *\$(SETFATTR_if_present) -n/d
|
|
/^ fi/d
|
|
/^ *\$(RUN_TEMACS) /i\
|
|
stubedit temacs.exe minstack=1024k
|
|
/^ *LC_ALL=C \$(RUN_TEMACS)/i\
|
|
stubedit temacs.exe minstack=1024k
|
|
/^ *LC_ALL=C.*\$(RUN_TEMACS)/s/LC_ALL=C/set &;/
|
|
/-batch -l loadup/a\
|
|
stubify emacs\
|
|
stubedit emacs.exe minstack=3072k
|
|
s/ @true *$/ @rem/
|
|
s/^ [^ ]*move-if-change / update /
|
|
/^ [^ ]*echo[ ][ ]*timestamp/s/echo /djecho /
|
|
/^ .*djecho timestamp/a\
|
|
@rm -f globals.tmp
|
|
/^ *@\$(MKDEPDIR) *$/d
|
|
/^ mv \.\/\.gdbinit/d
|
|
/^ if test -f/,/^ fi$/c\
|
|
command.com /c if exist .gdbinit rm -f _gdbinit
|
|
/^ #/d
|
|
/^ @: /d
|
|
/^ -\{0,1\} *ln /s/ln /cp /
|
|
/^[ ]touch /s/touch/djecho $@ >/
|
|
s/@YMF_PASS_LDFLAGS@/flags/
|
|
s/@PRE_EDIT_LDFLAGS@//
|
|
s/@POST_EDIT_LDFLAGS@//
|
|
s/bootstrap-emacs/b-emacs/
|
|
s/bootstrap-temacs/b-temacs/
|
|
s/bootstrap-doc/b-doc/
|
|
/rm -f bootstrap-emacs/s/b-emacs/b-emacs b-emacs.exe/
|
|
s/echo.*buildobj.lst/dj&/
|
|
/ --load loadup bootstrap/a\
|
|
stubify emacs
|
|
/^ mv -f emacs/a\
|
|
stubedit b-emacs.exe minstack=3072k\
|
|
djecho bootlisp > bootlisp
|
|
/^ -\{0,1\}rm -f/s/\\#/#/
|
|
/^ echo.* buildobj.h/s|echo |djecho |
|
|
/^buildobj\.h:/,/^ *\$(AM_V_at)mv /{
|
|
/^ *\$(AM_V_GEN)for /,/^ *done /c\
|
|
djecho "$(ALLOBJS)" | sed -e 's/^ */"/' -e 's/ *$$/"/' -e 's/ */", "/g' >>$@.tmp
|
|
}
|
|
# Remove or replace dependencies we cannot have
|
|
/^\.PRECIOUS: /s!\.\./config.status !!
|
|
/^\.\.\/config.status: /d
|
|
/^Makefile: /s!\.\./config.status !!
|
|
/^\$(top_srcdir)\/aclocal\.m4 /,/^doc\.o:/c\
|
|
\
|
|
doc.o: buildobj.h
|
|
# Make the GCC command line fit one screen line
|
|
/^[ ][ ]*\$(GNUSTEP_CFLAGS)/d
|
|
/^[ ][ ]*\$(GCONF_CFLAGS)/d
|
|
/^[ ][ ]*\$(LIBGNUTLS_CFLAGS)/d
|
|
s/\$(LIBOTF_CFLAGS) \$(M17N_FLT_CFLAGS) \$(DEPFLAGS) //
|
|
s/ \$(C_SWITCH_X_SITE)//
|
|
s/ \$(DBUS_CFLAGS)//
|
|
s/ \$(PNG_CFLAGS) //
|
|
s/ \$(XINERAMA_CFLAGS)//
|
|
s/ \$(XFIXES_CFLAGS)//
|
|
s/ \$(FREETYPE_CFLAGS)//
|
|
s/ \$(FONTCONFIG_CFLAGS)//
|
|
s| -I\$(srcdir)/\.\./lib||
|
|
s| -I\$(top_srcdir)/lib||
|
|
# Add our local inttypes.h to prerequisites where needed
|
|
/^lread\.o:/s|lread\.c|& ../msdos/inttypes.h|
|
|
/^ *test "X/d
|