1996-04-10 00:53:52 +00:00
|
|
|
|
# -sed1v2.inp-----------------------------------------------------------
|
2000-07-09 09:31:58 +00:00
|
|
|
|
# Configuration script for src/Makefile under DJGPP v2.x
|
1996-04-10 00:53:52 +00:00
|
|
|
|
# ----------------------------------------------------------------------
|
2001-03-01 17:19:33 +00:00
|
|
|
|
#
|
2012-01-05 01:46:05 -08:00
|
|
|
|
# Copyright (C) 1996-1997, 1999-2012 Free Software Foundation, Inc.
|
2001-03-01 17:19:33 +00:00
|
|
|
|
#
|
|
|
|
|
# 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.
|
|
|
|
|
#
|
|
|
|
|
# ----------------------------------------------------------------------
|
1996-04-10 00:53:52 +00:00
|
|
|
|
s/^#.*//
|
|
|
|
|
s/^[ \f\t][ \f\t]*$//
|
|
|
|
|
s/^ / /
|
|
|
|
|
s/\.h\.in/.h-in/
|
|
|
|
|
/^MAKE *=/s/^/# /
|
|
|
|
|
/^SHELL *=/s/^/# /
|
|
|
|
|
/^srcdir *=/s/@[^@\n]*@/./
|
Fix the MSDOS build as fallout from the latest Makefile.in changes.
config.bat <lib-src>: Edit out lines that begin with several #
characters.
msdos/sedlisp.inp (VPATH): Don't edit, no longer needed.
(lisp, srcdir): Adapt to lisp/Makefile.in changes.
(abs_top_builddir): New edit.
msdos/sed3v2.inp (KRB4LIB, DESLIB, KRB5LIB, CRYPTOLIB, COM_ERRLIB)
(LIBHESIOD, LIBRESOLV, LIBS_MAIL): Edit to empty values.
msdos/sed3.inp (KRB4LIB, DESLIB, KRB5LIB, CRYPTOLIB, COM_ERRLIB)
(LIBHESIOD, LIBRESOLV, LIBS_MAIL): Edit to empty values.
msdos/sed1v2.inp (abs_builddir): Edit into "../src".
2010-03-27 13:49:18 +03:00
|
|
|
|
/^abs_builddir *=/s|@abs_builddir@|../src|
|
1996-04-10 00:53:52 +00:00
|
|
|
|
/^VPATH *=/s/@[^@\n]*@/./
|
|
|
|
|
/^CC *=/s/@[^@\n]*@/gcc/
|
|
|
|
|
/^CPP *=/s/@[^@\n]*@/gcc -e/
|
1999-05-19 10:24:54 +00:00
|
|
|
|
/^CFLAGS *=/s/@[^@\n]*@/-O2 -gcoff/
|
2008-08-23 17:04:11 +00:00
|
|
|
|
/^ALL_CFLAGS *=/s/@[^@\n]*@//g
|
2011-04-30 13:31:17 +03:00
|
|
|
|
/^ALL_CFLAGS *=/s/ -I\.//g
|
|
|
|
|
/^CPPFLAGS *=/s|@[^@\n]*@|-I../msdos|
|
1997-08-11 00:18:52 +00:00
|
|
|
|
/^LDFLAGS *=/s/@[^@\n]*@//
|
2010-09-22 11:45:26 +02:00
|
|
|
|
/^LD_FIRSTFLAG *=/s/@[^@\n]*@//
|
2000-04-14 12:43:52 +00:00
|
|
|
|
/^LIBS *=/s/@[^@\n]*@//
|
2008-08-23 17:04:11 +00:00
|
|
|
|
/^LIBES *=/,/^ *$/ {
|
|
|
|
|
s/@[^@\n]*@//g
|
|
|
|
|
}
|
2011-02-19 21:41:00 +02:00
|
|
|
|
/^LIBOBJS *=/s/@[^@\n]*@//
|
Fix MS-DOS configuring in lib-src/ and src/, broken by autoconfiscation.
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.
2010-05-07 15:57:24 +03:00
|
|
|
|
/^C_SWITCH_MACHINE *=/s/@C_SWITCH_MACHINE@//
|
|
|
|
|
/^C_SWITCH_SYSTEM *=/s/@C_SWITCH_SYSTEM@//
|
Define some variables to hold configure's output, for clarity.
* src/Makefile.in (C_SWITCH_X_SYSTEM, C_SWITCH_X_SITE, LIB_STANDARD)
(LIB_MATH, FONTCONFIG_CFLAGS, FONTCONFIG_LIBS, FREETYPE_CFLAGS)
(FREETYPE_LIBS, LIBOTF_CFLAGS, LIBOTF_LIBS, M17N_FLT_CFLAGS)
(M17N_FLT_LIBS, GNU_OBJC_CFLAGS, GNUSTEP_SYSTEM_LIBRARIES, LIBGPM)
(LIBRESOLV, UNEXEC_OBJ): For clarity, define variables to hold
the values output be configure.
(ALL_CFLAGS, obj, LIBES, temacs${EXEEXT}): Use the above variables.
* msdos/sed1v2.inp (C_SWITCH_X_SYSTEM, C_SWITCH_X_SITE, LIB_STANDARD)
(FONTCONFIG_CFLAGS, FONTCONFIG_LIBS, FREETYPE_CFLAGS, FREETYPE_LIBS)
(LIBOTF_CFLAGS, LIBOTF_LIBS, M17N_FLT_CFLAGS, M17N_FLT_LIBS)
(GNU_OBJC_CFLAGS, GNUSTEP_SYSTEM_LIBRARIES, LIBRESOLV, LIBGPM):
Edit to empty,
(LIB_MATH): Edit to -lm.
(UNEXEC_OBJ): Edit to unexec.o.
2010-05-12 19:50:20 -07:00
|
|
|
|
/^C_SWITCH_X_SYSTEM *=/s/@C_SWITCH_X_SYSTEM@//
|
|
|
|
|
/^C_SWITCH_X_SITE *=/s/@C_SWITCH_X_SITE@//
|
2010-07-12 21:23:00 +03:00
|
|
|
|
/^C_WARNINGS_SWITCH *=/s/@C_WARNINGS_SWITCH@//
|
|
|
|
|
/^PROFILING_CFLAGS *=/s/@PROFILING_CFLAGS@//
|
2010-05-12 20:18:04 -07:00
|
|
|
|
#/^LD_SWITCH_X_SITE *=/s/@LD_SWITCH_X_SITE@//
|
Fix MS-DOS configuring in lib-src/ and src/, broken by autoconfiscation.
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.
2010-05-07 15:57:24 +03:00
|
|
|
|
/^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_SYSTEM *=/s/@LD_SWITCH_SYSTEM@//
|
2010-05-16 16:01:56 -07:00
|
|
|
|
/^TEMACS_LDFLAGS2 *=/s/@TEMACS_LDFLAGS2@/$(LDFLAGS)/
|
2010-05-09 19:16:09 -07:00
|
|
|
|
/^LIBS_SYSTEM *=/s/@LIBS_SYSTEM@//
|
2010-07-02 15:47:02 +03:00
|
|
|
|
/^LIB_GCC *=/s/@LIB_GCC@//
|
Define some variables to hold configure's output, for clarity.
* src/Makefile.in (C_SWITCH_X_SYSTEM, C_SWITCH_X_SITE, LIB_STANDARD)
(LIB_MATH, FONTCONFIG_CFLAGS, FONTCONFIG_LIBS, FREETYPE_CFLAGS)
(FREETYPE_LIBS, LIBOTF_CFLAGS, LIBOTF_LIBS, M17N_FLT_CFLAGS)
(M17N_FLT_LIBS, GNU_OBJC_CFLAGS, GNUSTEP_SYSTEM_LIBRARIES, LIBGPM)
(LIBRESOLV, UNEXEC_OBJ): For clarity, define variables to hold
the values output be configure.
(ALL_CFLAGS, obj, LIBES, temacs${EXEEXT}): Use the above variables.
* msdos/sed1v2.inp (C_SWITCH_X_SYSTEM, C_SWITCH_X_SITE, LIB_STANDARD)
(FONTCONFIG_CFLAGS, FONTCONFIG_LIBS, FREETYPE_CFLAGS, FREETYPE_LIBS)
(LIBOTF_CFLAGS, LIBOTF_LIBS, M17N_FLT_CFLAGS, M17N_FLT_LIBS)
(GNU_OBJC_CFLAGS, GNUSTEP_SYSTEM_LIBRARIES, LIBRESOLV, LIBGPM):
Edit to empty,
(LIB_MATH): Edit to -lm.
(UNEXEC_OBJ): Edit to unexec.o.
2010-05-12 19:50:20 -07:00
|
|
|
|
/^LIB_STANDARD *=/s/@LIB_STANDARD@//
|
|
|
|
|
/^LIB_MATH *=/s/@LIB_MATH@/-lm/
|
Fix the MSDOS build.
msdos/mainmake.v2 (boot): Condition the value on the existence of
autogen/README, not admin/admin.el, since the latter is now part
of the release tarball.
(install): Don't copy lib-src/fns.el, as that file is no longer
generated in that directory.
msdos/sed1v2.inp (LIB_PTHREAD, LIB_PTHREAD_SIGMASK): Edit to empty.
(SETTINGS_CFLAGS, SETTINGS_LIBS): Edit these instead of
GCONF_CFLAGS and GCONF_LIBS.
msdos/sedlibmk.inp (ALLOCA_H, AR, ARFLAGS, GNULIB_CHDIR, GNULIB_DUP)
(GNULIB_FDATASYNC, GNULIB_FDOPEN, GNULIB_FSTAT, GNULIB_PCLOSE)
(GNULIB_PTHREAD_SIGMASK, GNULIB_RAISE, GNULIB_SIGACTION)
(GNULIB_SIGPROCMASK, GNULIB_SIGNAL_H_SIGPIPE, HAVE_FDATASYNC)
(HAVE_PCLOSE, HAVE_POPEN, HAVE_POSIX_SIGNALBLOCKING)
(HAVE_PTHREAD_SIGMASK, HAVE_RAISE, HAVE_SIGACTION)
(HAVE_SIGHANDLER_T, HAVE_SIGINFO_T, HAVE_SIGSET_T)
(HAVE_STRUCT_SIGACTION_SA_SIGACTION)
(HAVE_TYPE_VOLATILE_SIG_ATOMIC_T, LIB_PTHREAD)
(LIB_PTHREAD_SIGMASK, NEXT_AS_FIRST_DIRECTIVE_SIGNAL_H)
(NEXT_SIGNAL_H, REPLACE_FDOPEN, REPLACE_PTHREAD_SIGMASK)
(REPLACE_RAISE): New edits.
(gl_LIBOBJS): Remove md5.o, filemode.o, and sha1.o. Add
pthread_sigmask.o.
(@GL_GENERATE_ALLOCA_H_TRUE@, @GL_GENERATE_ALLOCA_H_FALSE@): Edit
to comment out unneeded lines.
(warn-on-use.h): Edit the recipe commands to work with DJGPP
without requiring a Unixy shell.
msdos/inttypes.h (strtoimax) [DJGPP < 2.04]: New macro.
msdos/sed2v2.inp (HAVE_ALLOCA, HAVE_DECL_STRTOLL, HAVE_DECL_STRTOIMAX)
(HAVE_STRTOLL, HAVE_SIGSET_T, HAVE_SNPRINTF): New edits.
.bzrignore: Add ./GNUMakefile.unix.
config.bat: Rename GNUMakefile, so it is not run on MS-DOS.
Rename signal.in.h and alloca.in.h.
src/sysdep.c (snprintf) [EOVERFLOW]: If EOVERFLOW is not defined,
use EDOM.
2011-09-29 15:00:18 +03:00
|
|
|
|
/^LIB_PTHREAD *=/s/@LIB_PTHREAD@//
|
Fix MS-DOS configuring in lib-src/ and src/, broken by autoconfiscation.
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.
2010-05-07 15:57:24 +03:00
|
|
|
|
/^LIBTIFF *=/s/@LIBTIFF@//
|
|
|
|
|
/^LIBJPEG *=/s/@LIBJPEG@//
|
|
|
|
|
/^LIBPNG *=/s/@LIBPNG@//
|
|
|
|
|
/^LIBGIF *=/s/@LIBGIF@//
|
|
|
|
|
/^LIBXPM *=/s/@LIBXPM@//
|
|
|
|
|
/^XFT_LIBS *=/s/@XFT_LIBS@//
|
Define some variables to hold configure's output, for clarity.
* src/Makefile.in (C_SWITCH_X_SYSTEM, C_SWITCH_X_SITE, LIB_STANDARD)
(LIB_MATH, FONTCONFIG_CFLAGS, FONTCONFIG_LIBS, FREETYPE_CFLAGS)
(FREETYPE_LIBS, LIBOTF_CFLAGS, LIBOTF_LIBS, M17N_FLT_CFLAGS)
(M17N_FLT_LIBS, GNU_OBJC_CFLAGS, GNUSTEP_SYSTEM_LIBRARIES, LIBGPM)
(LIBRESOLV, UNEXEC_OBJ): For clarity, define variables to hold
the values output be configure.
(ALL_CFLAGS, obj, LIBES, temacs${EXEEXT}): Use the above variables.
* msdos/sed1v2.inp (C_SWITCH_X_SYSTEM, C_SWITCH_X_SITE, LIB_STANDARD)
(FONTCONFIG_CFLAGS, FONTCONFIG_LIBS, FREETYPE_CFLAGS, FREETYPE_LIBS)
(LIBOTF_CFLAGS, LIBOTF_LIBS, M17N_FLT_CFLAGS, M17N_FLT_LIBS)
(GNU_OBJC_CFLAGS, GNUSTEP_SYSTEM_LIBRARIES, LIBRESOLV, LIBGPM):
Edit to empty,
(LIB_MATH): Edit to -lm.
(UNEXEC_OBJ): Edit to unexec.o.
2010-05-12 19:50:20 -07:00
|
|
|
|
/^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@//
|
Fix MS-DOS configuring in lib-src/ and src/, broken by autoconfiscation.
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.
2010-05-07 15:57:24 +03:00
|
|
|
|
/^DBUS_CFLAGS *=/s/@DBUS_CFLAGS@//
|
|
|
|
|
/^DBUS_LIBS *=/s/@DBUS_LIBS@//
|
|
|
|
|
/^DBUS_OBJ *=/s/@DBUS_OBJ@//
|
Fix the MSDOS build.
msdos/mainmake.v2 (boot): Condition the value on the existence of
autogen/README, not admin/admin.el, since the latter is now part
of the release tarball.
(install): Don't copy lib-src/fns.el, as that file is no longer
generated in that directory.
msdos/sed1v2.inp (LIB_PTHREAD, LIB_PTHREAD_SIGMASK): Edit to empty.
(SETTINGS_CFLAGS, SETTINGS_LIBS): Edit these instead of
GCONF_CFLAGS and GCONF_LIBS.
msdos/sedlibmk.inp (ALLOCA_H, AR, ARFLAGS, GNULIB_CHDIR, GNULIB_DUP)
(GNULIB_FDATASYNC, GNULIB_FDOPEN, GNULIB_FSTAT, GNULIB_PCLOSE)
(GNULIB_PTHREAD_SIGMASK, GNULIB_RAISE, GNULIB_SIGACTION)
(GNULIB_SIGPROCMASK, GNULIB_SIGNAL_H_SIGPIPE, HAVE_FDATASYNC)
(HAVE_PCLOSE, HAVE_POPEN, HAVE_POSIX_SIGNALBLOCKING)
(HAVE_PTHREAD_SIGMASK, HAVE_RAISE, HAVE_SIGACTION)
(HAVE_SIGHANDLER_T, HAVE_SIGINFO_T, HAVE_SIGSET_T)
(HAVE_STRUCT_SIGACTION_SA_SIGACTION)
(HAVE_TYPE_VOLATILE_SIG_ATOMIC_T, LIB_PTHREAD)
(LIB_PTHREAD_SIGMASK, NEXT_AS_FIRST_DIRECTIVE_SIGNAL_H)
(NEXT_SIGNAL_H, REPLACE_FDOPEN, REPLACE_PTHREAD_SIGMASK)
(REPLACE_RAISE): New edits.
(gl_LIBOBJS): Remove md5.o, filemode.o, and sha1.o. Add
pthread_sigmask.o.
(@GL_GENERATE_ALLOCA_H_TRUE@, @GL_GENERATE_ALLOCA_H_FALSE@): Edit
to comment out unneeded lines.
(warn-on-use.h): Edit the recipe commands to work with DJGPP
without requiring a Unixy shell.
msdos/inttypes.h (strtoimax) [DJGPP < 2.04]: New macro.
msdos/sed2v2.inp (HAVE_ALLOCA, HAVE_DECL_STRTOLL, HAVE_DECL_STRTOIMAX)
(HAVE_STRTOLL, HAVE_SIGSET_T, HAVE_SNPRINTF): New edits.
.bzrignore: Add ./GNUMakefile.unix.
config.bat: Rename GNUMakefile, so it is not run on MS-DOS.
Rename signal.in.h and alloca.in.h.
src/sysdep.c (snprintf) [EOVERFLOW]: If EOVERFLOW is not defined,
use EDOM.
2011-09-29 15:00:18 +03:00
|
|
|
|
/^SETTINGS_CFLAGS *=/s/@SETTINGS_CFLAGS@//
|
|
|
|
|
/^SETTINGS_LIBS *=/s/@SETTINGS_LIBS@//
|
Fix MS-DOS configuring in lib-src/ and src/, broken by autoconfiscation.
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.
2010-05-07 15:57:24 +03:00
|
|
|
|
/^GTK_OBJ *=/s/@GTK_OBJ@//
|
Move TERMINFO, LIBS_TERMCAP from cpp to configure.
* configure.in (HAVE_LIBNCURSES): New local variable.
(TERMINFO, LIBS_TERMCAP, TERMCAP_OBJ): New output variables,
replacing cpp in src/s/*.h and src/Makefile.in.
* src/Makefile.in (LIBS_TERMCAP): Set with configure, not cpp.
(TERMCAP_OBJ): New, set by configure, replacing termcapobj.
(termcapobj): Replace with TERMCAP_OBJ.
(otherobj): Use $TERMCAP_OBJ instead of $termcapobj.
(LIBES): Use LIBS_TERMCAP as a variable.
* src/s/freebsd.h (osreldate.h): No longer include, since this file
does not use __FreeBSD_version any more.
* srs/s/aix4-2.h (TERMINFO):
* srs/s/cygwin.h (TERMINFO):
* srs/s/darwin.h (TERMINFO, LIBS_TERMCAP) [HAVE_LIBNCURSES]:
* srs/s/freebsd.h (TERMINFO, LIBS_TERMCAP):
* srs/s/gnu-linux.h (TERMINFO, LIBS_TERMCAP) [HAVE_LIBNCURSES]:
* srs/s/gnu.h (TERMINFO, LIBS_TERMCAP) [HAVE_LIBNCURSES]:
* srs/s/hpux10-20.h (TERMINFO, LIBS_TERMCAP):
* srs/s/irix6-5.h (TERMINFO):
* srs/s/netbsd.h (LIBS_TERMCAP):
* srs/s/openbsd.h (TERMINFO, LIBS_TERMCAP):
* srs/s/sol2-6.h (LIBS_TERMCAP) [!TERMINFO]:
* srs/s/usg5-4.h (TERMINFO):
Move to configure.
* msdos/sed1v2.inp (LIBS_TERMCAP): Edit to empty.
(TERMCAP_OBJ): Edit to tparam.o.
* admin/CPP-DEFINES (LIBS_TERMCAP, TERMINFO): Remove.
2010-05-07 19:05:24 -07:00
|
|
|
|
/^LIBS_TERMCAP *=/s/@LIBS_TERMCAP@//
|
2010-05-15 10:19:59 +03:00
|
|
|
|
/^TERMCAP_OBJ *=/s/@TERMCAP_OBJ@/termcap.o tparam.o/
|
Fix MS-DOS configuring in lib-src/ and src/, broken by autoconfiscation.
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.
2010-05-07 15:57:24 +03:00
|
|
|
|
/^LIBXMU *=/s/@LIBXMU@//
|
|
|
|
|
/^LIBXSM *=/s/@LIBXSM@//
|
|
|
|
|
/^LIBXTR6 *=/s/@LIBXTR6@//
|
2010-05-14 18:45:18 -07:00
|
|
|
|
/^LIBXT_OTHER *=/s/@LIBXT_OTHER@//
|
2010-05-14 18:55:24 -07:00
|
|
|
|
/^OLDXMENU_TARGET *=/s/@OLDXMENU_TARGET@//
|
2010-05-16 22:15:03 -07:00
|
|
|
|
/^OLDXMENU_DEPS *=/s/@OLDXMENU_DEPS@//
|
Fix MS-DOS configuring in lib-src/ and src/, broken by autoconfiscation.
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.
2010-05-07 15:57:24 +03:00
|
|
|
|
/^XOBJ *=/s/@XOBJ@//
|
|
|
|
|
/^TOOLKIT_LIBW *=/s/@TOOLKIT_LIBW@//
|
2000-07-09 09:31:58 +00:00
|
|
|
|
/^LIBSOUND *=/s/@LIBSOUND@//
|
2006-11-25 14:32:48 +00:00
|
|
|
|
/^CFLAGS_SOUND *=/s/@CFLAGS_SOUND@//
|
2007-10-05 09:34:24 +00:00
|
|
|
|
/^RSVG_LIBS *=/s/@RSVG_LIBS@//
|
|
|
|
|
/^RSVG_CFLAGS *=/s/@RSVG_CFLAGS@//
|
2010-08-20 23:26:12 +03:00
|
|
|
|
/^IMAGEMAGICK_LIBS *=/s/@IMAGEMAGICK_LIBS@//
|
|
|
|
|
/^IMAGEMAGICK_CFLAGS *=/s/@IMAGEMAGICK_CFLAGS@//
|
2010-09-17 14:44:56 +02:00
|
|
|
|
/^LIBXML2_LIBS *=/s/@LIBXML2_LIBS@//
|
|
|
|
|
/^LIBXML2_CFLAGS *=/s/@LIBXML2_CFLAGS@//
|
Fix MS-DOS configuring in lib-src/ and src/, broken by autoconfiscation.
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.
2010-05-07 15:57:24 +03:00
|
|
|
|
/^WIDGET_OBJ *=/s/@WIDGET_OBJ@//
|
|
|
|
|
/^CYGWIN_OBJ *=/s/@CYGWIN_OBJ@//
|
2010-05-15 10:19:59 +03:00
|
|
|
|
/^MSDOS_OBJ *=/s/= */= dosfns.o msdos.o w16select.o/
|
2010-05-13 21:23:23 -07:00
|
|
|
|
/^ns_appdir *=/s/@ns_appdir@//
|
|
|
|
|
/^ns_appbindir *=/s/@ns_appbindir@//
|
|
|
|
|
/^ns_appsrc *=/s/@ns_appsrc@//
|
Fix MS-DOS configuring in lib-src/ and src/, broken by autoconfiscation.
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.
2010-05-07 15:57:24 +03:00
|
|
|
|
/^NS_OBJ *=/s/@NS_OBJ@//
|
Initial version of fix for the MS-DOS build, not yet tested.
config.bat: Configure in `lib'.
msdos/sedlibmk.inp: New file.
msdos/sedlibcf.inp: New file.
msdos/sed1v2.inp (NS_OBJC_OBJ): Edit to empty.
(@true): Edit to "@rem".
(move-if-change): Edit to "update".
(echo): Edit to "djecho".
(cd $(lib) && ...): Edit to "$(MAKE) -C ...".
msdos/mainmake.v2 (version): Remove, no longer needed (config.in
defines VERSION).
(all): Add lib.
(lib): New target and recipe.
(lib-src): Depend on lib.
(src): Depend on lib and lib-src.
(clean, mostlyclean, distclean, maintainer-clean, extraclean)
(bootstrap-clean): Recurse into lib.
msdos/sed2v2.inp: Remove workaround for the "#if ! HAVE_MKTIME ||
BROKEN_MKTIME" stuff -- it's no longer in src/config.in.
(HAVE_ATTRIBUTE_ALIGNED, HAVE_C99_STRTOLD, HAVE_DECL_GETENV)
(HAVE__BOOL): Edit to 1.
(VERSION, inline, restrict): Edit for DJGPP.
src/s/msdos.h (strtold): Define to _strtold.
admin/admin.el (set-version): Add msdos/sed2v2.inp.
2011-02-19 17:57:35 +02:00
|
|
|
|
/^NS_OBJC_OBJ *=/s/@NS_OBJC_OBJ@//
|
Define some variables to hold configure's output, for clarity.
* src/Makefile.in (C_SWITCH_X_SYSTEM, C_SWITCH_X_SITE, LIB_STANDARD)
(LIB_MATH, FONTCONFIG_CFLAGS, FONTCONFIG_LIBS, FREETYPE_CFLAGS)
(FREETYPE_LIBS, LIBOTF_CFLAGS, LIBOTF_LIBS, M17N_FLT_CFLAGS)
(M17N_FLT_LIBS, GNU_OBJC_CFLAGS, GNUSTEP_SYSTEM_LIBRARIES, LIBGPM)
(LIBRESOLV, UNEXEC_OBJ): For clarity, define variables to hold
the values output be configure.
(ALL_CFLAGS, obj, LIBES, temacs${EXEEXT}): Use the above variables.
* msdos/sed1v2.inp (C_SWITCH_X_SYSTEM, C_SWITCH_X_SITE, LIB_STANDARD)
(FONTCONFIG_CFLAGS, FONTCONFIG_LIBS, FREETYPE_CFLAGS, FREETYPE_LIBS)
(LIBOTF_CFLAGS, LIBOTF_LIBS, M17N_FLT_CFLAGS, M17N_FLT_LIBS)
(GNU_OBJC_CFLAGS, GNUSTEP_SYSTEM_LIBRARIES, LIBRESOLV, LIBGPM):
Edit to empty,
(LIB_MATH): Edit to -lm.
(UNEXEC_OBJ): Edit to unexec.o.
2010-05-12 19:50:20 -07:00
|
|
|
|
/^GNU_OBJC_CFLAGS*=/s/@GNU_OBJC_CFLAGS@//
|
|
|
|
|
/^LIBRESOLV *=/s/@LIBRESOLV@//
|
Fix MS-DOS configuring in lib-src/ and src/, broken by autoconfiscation.
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.
2010-05-07 15:57:24 +03:00
|
|
|
|
/^LIBSELINUX_LIBS *=/s/@LIBSELINUX_LIBS@//
|
Fix the MSDOS build.
msdos/mainmake.v2 (boot): Condition the value on the existence of
autogen/README, not admin/admin.el, since the latter is now part
of the release tarball.
(install): Don't copy lib-src/fns.el, as that file is no longer
generated in that directory.
msdos/sed1v2.inp (LIB_PTHREAD, LIB_PTHREAD_SIGMASK): Edit to empty.
(SETTINGS_CFLAGS, SETTINGS_LIBS): Edit these instead of
GCONF_CFLAGS and GCONF_LIBS.
msdos/sedlibmk.inp (ALLOCA_H, AR, ARFLAGS, GNULIB_CHDIR, GNULIB_DUP)
(GNULIB_FDATASYNC, GNULIB_FDOPEN, GNULIB_FSTAT, GNULIB_PCLOSE)
(GNULIB_PTHREAD_SIGMASK, GNULIB_RAISE, GNULIB_SIGACTION)
(GNULIB_SIGPROCMASK, GNULIB_SIGNAL_H_SIGPIPE, HAVE_FDATASYNC)
(HAVE_PCLOSE, HAVE_POPEN, HAVE_POSIX_SIGNALBLOCKING)
(HAVE_PTHREAD_SIGMASK, HAVE_RAISE, HAVE_SIGACTION)
(HAVE_SIGHANDLER_T, HAVE_SIGINFO_T, HAVE_SIGSET_T)
(HAVE_STRUCT_SIGACTION_SA_SIGACTION)
(HAVE_TYPE_VOLATILE_SIG_ATOMIC_T, LIB_PTHREAD)
(LIB_PTHREAD_SIGMASK, NEXT_AS_FIRST_DIRECTIVE_SIGNAL_H)
(NEXT_SIGNAL_H, REPLACE_FDOPEN, REPLACE_PTHREAD_SIGMASK)
(REPLACE_RAISE): New edits.
(gl_LIBOBJS): Remove md5.o, filemode.o, and sha1.o. Add
pthread_sigmask.o.
(@GL_GENERATE_ALLOCA_H_TRUE@, @GL_GENERATE_ALLOCA_H_FALSE@): Edit
to comment out unneeded lines.
(warn-on-use.h): Edit the recipe commands to work with DJGPP
without requiring a Unixy shell.
msdos/inttypes.h (strtoimax) [DJGPP < 2.04]: New macro.
msdos/sed2v2.inp (HAVE_ALLOCA, HAVE_DECL_STRTOLL, HAVE_DECL_STRTOIMAX)
(HAVE_STRTOLL, HAVE_SIGSET_T, HAVE_SNPRINTF): New edits.
.bzrignore: Add ./GNUMakefile.unix.
config.bat: Rename GNUMakefile, so it is not run on MS-DOS.
Rename signal.in.h and alloca.in.h.
src/sysdep.c (snprintf) [EOVERFLOW]: If EOVERFLOW is not defined,
use EDOM.
2011-09-29 15:00:18 +03:00
|
|
|
|
/^LIB_PTHREAD_SIGMASK *=/s/@[^@\n]*@//
|
2010-10-01 21:20:29 +02:00
|
|
|
|
/^LIBGNUTLS_LIBS *=/s/@[^@\n]*@//
|
|
|
|
|
/^LIBGNUTLS_CFLAGS *=/s/@[^@\n]*@//
|
Fix MS-DOS configuring in lib-src/ and src/, broken by autoconfiscation.
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.
2010-05-07 15:57:24 +03:00
|
|
|
|
/^GETLOADAVG_LIBS *=/s/@[^@\n]*@//
|
|
|
|
|
/^START_FILES *=/s/@START_FILES@//
|
2009-09-17 18:02:58 +00:00
|
|
|
|
/^OTHER_FILES *=/s/@OTHER_FILES@//
|
Fix MS-DOS configuring in lib-src/ and src/, broken by autoconfiscation.
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.
2010-05-07 15:57:24 +03:00
|
|
|
|
/^XMENU_OBJ *=/s/@XMENU_OBJ@/xmenu.o/
|
2010-05-15 14:31:19 -07:00
|
|
|
|
/^FONT_OBJ *=/s/@FONT_OBJ@//
|
Define some variables to hold configure's output, for clarity.
* src/Makefile.in (C_SWITCH_X_SYSTEM, C_SWITCH_X_SITE, LIB_STANDARD)
(LIB_MATH, FONTCONFIG_CFLAGS, FONTCONFIG_LIBS, FREETYPE_CFLAGS)
(FREETYPE_LIBS, LIBOTF_CFLAGS, LIBOTF_LIBS, M17N_FLT_CFLAGS)
(M17N_FLT_LIBS, GNU_OBJC_CFLAGS, GNUSTEP_SYSTEM_LIBRARIES, LIBGPM)
(LIBRESOLV, UNEXEC_OBJ): For clarity, define variables to hold
the values output be configure.
(ALL_CFLAGS, obj, LIBES, temacs${EXEEXT}): Use the above variables.
* msdos/sed1v2.inp (C_SWITCH_X_SYSTEM, C_SWITCH_X_SITE, LIB_STANDARD)
(FONTCONFIG_CFLAGS, FONTCONFIG_LIBS, FREETYPE_CFLAGS, FREETYPE_LIBS)
(LIBOTF_CFLAGS, LIBOTF_LIBS, M17N_FLT_CFLAGS, M17N_FLT_LIBS)
(GNU_OBJC_CFLAGS, GNUSTEP_SYSTEM_LIBRARIES, LIBRESOLV, LIBGPM):
Edit to empty,
(LIB_MATH): Edit to -lm.
(UNEXEC_OBJ): Edit to unexec.o.
2010-05-12 19:50:20 -07:00
|
|
|
|
/^LIBGPM *=/s/@LIBGPM@//
|
2008-08-23 17:04:11 +00:00
|
|
|
|
/^EXEEXT *=/s/@EXEEXT@/.exe/
|
2010-05-20 17:40:12 -07:00
|
|
|
|
/^OLDXMENU *=/s/@OLDXMENU@/nothing/
|
2010-05-15 15:33:24 -07:00
|
|
|
|
/^LIBXMENU *=/s/@LIBXMENU@//
|
2010-05-15 14:47:58 -07:00
|
|
|
|
/^LIBX_OTHER *=/s/@LIBX_OTHER@//
|
2010-05-17 19:30:13 -07:00
|
|
|
|
/^GMALLOC_OBJ *=/s/@GMALLOC_OBJ@/gmalloc.o/
|
|
|
|
|
/^VMLIMIT_OBJ *=/s/@VMLIMIT_OBJ@/vm-limit.o/
|
2010-05-17 19:44:07 -07:00
|
|
|
|
/^RALLOC_OBJ *=/s/@RALLOC_OBJ@/ralloc.o/
|
Fix MS-DOS configuring in lib-src/ and src/, broken by autoconfiscation.
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.
2010-05-07 15:57:24 +03:00
|
|
|
|
/^PRE_ALLOC_OBJ *=/s/@PRE_ALLOC_OBJ@/lastfile.o/
|
|
|
|
|
/^POST_ALLOC_OBJ *=/s/@POST_ALLOC_OBJ@/$(vmlimitobj)/
|
2010-08-05 20:11:32 +03:00
|
|
|
|
/^UNEXEC_OBJ *=/s/@UNEXEC_OBJ@/unexcoff.o/
|
2010-06-29 19:48:54 -07:00
|
|
|
|
/^CANNOT_DUMP *=/s/@CANNOT_DUMP@/no/
|
2010-05-19 23:11:27 -07:00
|
|
|
|
/^DEPFLAGS *=/s/@DEPFLAGS@//
|
2010-06-26 17:36:27 +03:00
|
|
|
|
/^MKDEPDIR *=/s/@MKDEPDIR@//
|
2008-08-23 17:04:11 +00:00
|
|
|
|
/^version *=/s/@[^@\n]*@//
|
2010-12-04 20:50:39 +01:00
|
|
|
|
/^M_FILE *=/s!@M_FILE@!$(srcdir)/m/intel386.h!
|
|
|
|
|
/^S_FILE *=/s!@S_FILE@!$(srcdir)/s/msdos.h!
|
1996-04-10 00:53:52 +00:00
|
|
|
|
/^@SET_MAKE@$/s/@SET_MAKE@//
|
2011-05-20 12:47:59 +03:00
|
|
|
|
/^ [ ]*\$(libsrc)\/make-docfile.*>.*\/DOC/s!make-docfile!make-docfile -o $(etc)/DOC!
|
|
|
|
|
/^ [ ]*\$(libsrc)\/make-docfile.*>.*gl-tmp/s!make-docfile!make-docfile -o gl-tmp!
|
2010-10-15 20:42:54 +02:00
|
|
|
|
/^.\$(libsrc)\/make-doc/s!>.*$!!
|
2011-05-28 13:00:09 +03:00
|
|
|
|
/^ [ ]*\$(libsrc)\/make-docfile /s!`[^`]*`!$(lisp); cd ../src!
|
1996-04-10 00:53:52 +00:00
|
|
|
|
/^[ ]*$/d
|
2010-06-26 17:36:27 +03:00
|
|
|
|
/^ if test -f/,/^ fi$/c\
|
|
|
|
|
command.com /c if exist .gdbinit rm -f _gdbinit
|
2010-10-15 20:42:54 +02:00
|
|
|
|
/^ if test "\$(CANNOT_DUMP)" =/,/^ else /d
|
2010-06-26 17:36:27 +03:00
|
|
|
|
/^ fi/d
|
2011-05-28 13:00:09 +03:00
|
|
|
|
/^ *LC_ALL=C \$(RUN_TEMACS)/i\
|
2010-06-26 17:36:27 +03:00
|
|
|
|
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=2048k
|
|
|
|
|
s/ || exit 1\; \\$//
|
|
|
|
|
s/ || true\; \\$//
|
Initial version of fix for the MS-DOS build, not yet tested.
config.bat: Configure in `lib'.
msdos/sedlibmk.inp: New file.
msdos/sedlibcf.inp: New file.
msdos/sed1v2.inp (NS_OBJC_OBJ): Edit to empty.
(@true): Edit to "@rem".
(move-if-change): Edit to "update".
(echo): Edit to "djecho".
(cd $(lib) && ...): Edit to "$(MAKE) -C ...".
msdos/mainmake.v2 (version): Remove, no longer needed (config.in
defines VERSION).
(all): Add lib.
(lib): New target and recipe.
(lib-src): Depend on lib.
(src): Depend on lib and lib-src.
(clean, mostlyclean, distclean, maintainer-clean, extraclean)
(bootstrap-clean): Recurse into lib.
msdos/sed2v2.inp: Remove workaround for the "#if ! HAVE_MKTIME ||
BROKEN_MKTIME" stuff -- it's no longer in src/config.in.
(HAVE_ATTRIBUTE_ALIGNED, HAVE_C99_STRTOLD, HAVE_DECL_GETENV)
(HAVE__BOOL): Edit to 1.
(VERSION, inline, restrict): Edit for DJGPP.
src/s/msdos.h (strtold): Define to _strtold.
admin/admin.el (set-version): Add msdos/sed2v2.inp.
2011-02-19 17:57:35 +02:00
|
|
|
|
s/ @true *$/ @rem/
|
2011-02-19 21:41:00 +02:00
|
|
|
|
s/^ [^ ]*move-if-change / update /
|
Initial version of fix for the MS-DOS build, not yet tested.
config.bat: Configure in `lib'.
msdos/sedlibmk.inp: New file.
msdos/sedlibcf.inp: New file.
msdos/sed1v2.inp (NS_OBJC_OBJ): Edit to empty.
(@true): Edit to "@rem".
(move-if-change): Edit to "update".
(echo): Edit to "djecho".
(cd $(lib) && ...): Edit to "$(MAKE) -C ...".
msdos/mainmake.v2 (version): Remove, no longer needed (config.in
defines VERSION).
(all): Add lib.
(lib): New target and recipe.
(lib-src): Depend on lib.
(src): Depend on lib and lib-src.
(clean, mostlyclean, distclean, maintainer-clean, extraclean)
(bootstrap-clean): Recurse into lib.
msdos/sed2v2.inp: Remove workaround for the "#if ! HAVE_MKTIME ||
BROKEN_MKTIME" stuff -- it's no longer in src/config.in.
(HAVE_ATTRIBUTE_ALIGNED, HAVE_C99_STRTOLD, HAVE_DECL_GETENV)
(HAVE__BOOL): Edit to 1.
(VERSION, inline, restrict): Edit for DJGPP.
src/s/msdos.h (strtold): Define to _strtold.
admin/admin.el (set-version): Add msdos/sed2v2.inp.
2011-02-19 17:57:35 +02:00
|
|
|
|
/^ echo[ ][ ]*timestamp/s/echo /djecho /
|
2011-02-19 21:49:10 +02:00
|
|
|
|
/^ .*djecho timestamp/a\
|
|
|
|
|
@rm -f gl-tmp
|
Initial version of fix for the MS-DOS build, not yet tested.
config.bat: Configure in `lib'.
msdos/sedlibmk.inp: New file.
msdos/sedlibcf.inp: New file.
msdos/sed1v2.inp (NS_OBJC_OBJ): Edit to empty.
(@true): Edit to "@rem".
(move-if-change): Edit to "update".
(echo): Edit to "djecho".
(cd $(lib) && ...): Edit to "$(MAKE) -C ...".
msdos/mainmake.v2 (version): Remove, no longer needed (config.in
defines VERSION).
(all): Add lib.
(lib): New target and recipe.
(lib-src): Depend on lib.
(src): Depend on lib and lib-src.
(clean, mostlyclean, distclean, maintainer-clean, extraclean)
(bootstrap-clean): Recurse into lib.
msdos/sed2v2.inp: Remove workaround for the "#if ! HAVE_MKTIME ||
BROKEN_MKTIME" stuff -- it's no longer in src/config.in.
(HAVE_ATTRIBUTE_ALIGNED, HAVE_C99_STRTOLD, HAVE_DECL_GETENV)
(HAVE__BOOL): Edit to 1.
(VERSION, inline, restrict): Edit for DJGPP.
src/s/msdos.h (strtold): Define to _strtold.
admin/admin.el (set-version): Add msdos/sed2v2.inp.
2011-02-19 17:57:35 +02:00
|
|
|
|
/^ cd \$(lib) && \$(MAKE)/c\
|
|
|
|
|
$(MAKE) $(MFLAGS) -C $(lib) libgnu.a
|
2008-08-23 17:04:11 +00:00
|
|
|
|
/^RUN_TEMACS *=/s|`/bin/pwd`|.|
|
2010-06-26 17:36:27 +03:00
|
|
|
|
/^ *@\$(MKDEPDIR) *$/d
|
2001-12-21 12:39:25 +00:00
|
|
|
|
/^ mv \.\/\.gdbinit/d
|
2010-06-26 17:36:27 +03:00
|
|
|
|
/^ if test -f/,/^ fi$/c\
|
2001-12-21 12:39:25 +00:00
|
|
|
|
command.com /c if exist .gdbinit rm -f _gdbinit
|
1996-04-10 00:53:52 +00:00
|
|
|
|
/^ #/d
|
2010-10-15 20:42:54 +02:00
|
|
|
|
/^ cd.*make-docfile/s!$!; cd ../src!
|
2008-08-23 17:04:11 +00:00
|
|
|
|
/^ @: /d
|
2010-06-26 17:36:27 +03:00
|
|
|
|
/^ -\{0,1\} *ln -/s/ln -f/cp -pf/
|
2008-08-23 17:04:11 +00:00
|
|
|
|
/^[ ]touch /s/touch/djecho $@ >/
|
2010-05-18 19:42:04 -07:00
|
|
|
|
s/@YMF_PASS_LDFLAGS@/flags/
|
2011-05-20 12:47:59 +03:00
|
|
|
|
s/@lisp_frag@//
|
2010-05-19 23:11:27 -07:00
|
|
|
|
s/@deps_frag@//
|
2010-05-20 17:48:14 -07:00
|
|
|
|
s/@ns_frag@//
|
2010-05-25 23:41:58 -07:00
|
|
|
|
s/@PRE_EDIT_LDFLAGS@//
|
|
|
|
|
s/@POST_EDIT_LDFLAGS@//
|
2002-03-09 14:41:13 +00:00
|
|
|
|
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/
|
2004-11-09 08:18:05 +00:00
|
|
|
|
s/echo.*buildobj.lst/dj&/
|
2008-11-15 15:37:41 +00:00
|
|
|
|
/ --load loadup bootstrap/i\
|
|
|
|
|
stubedit temacs.exe minstack=1024k
|
|
|
|
|
/ --load loadup bootstrap/a\
|
|
|
|
|
stubify emacs
|
2002-03-09 14:41:13 +00:00
|
|
|
|
/^ mv -f emacs/a\
|
2008-11-15 15:37:41 +00:00
|
|
|
|
stubedit b-emacs.exe minstack=3072k\
|
|
|
|
|
djecho bootlisp > bootlisp
|
2008-08-23 17:04:11 +00:00
|
|
|
|
/^ -\{0,1\}rm -f/s/\\#/#/
|
2010-06-26 17:36:27 +03:00
|
|
|
|
/^ @\{0,1\}cd ..\/lisp;.*[^\]$/s|$|\; cd ../src|
|
2010-07-02 15:47:02 +03:00
|
|
|
|
/^ *THEFILE=/s|$|\; cd ../src|
|
2009-08-27 19:03:20 +00:00
|
|
|
|
/^ echo.* buildobj.h/s|echo |djecho |
|
2011-02-19 21:41:00 +02:00
|
|
|
|
# Make the GCC command line fit one screen line
|
|
|
|
|
/^[ ][ ]*\$(C_SWITCH_X_SYSTEM)/d
|
|
|
|
|
/^[ ][ ]*\$(GCONF_CFLAGS)/d
|
|
|
|
|
/^[ ][ ]*\$(LIBGNUTLS_CFLAGS)/d
|
|
|
|
|
s/\$(LIBOTF_CFLAGS) \$(M17N_FLT_CFLAGS) \$(DEPFLAGS) //
|
|
|
|
|
s/ \$(C_SWITCH_X_SITE)//
|
|
|
|
|
s/ \$(DBUS_CFLAGS)//
|
|
|
|
|
s| -I\$(srcdir)/../lib||
|
2011-04-30 13:31:17 +03:00
|
|
|
|
# Add our local inttypes.h to prerequisites where needed
|
|
|
|
|
/^lread\.o:/s|lread\.c|& ../msdos/inttypes.h|
|