Commit 77ccee09 authored by Dan Nicolaescu's avatar Dan Nicolaescu

* config.in: Regenerate.

* s/ms-w32.h (subprocesses): Define unconditionally.
* s/template.h (subprocesses): Update comment.
* s/vms.h (subprocesses):
* s/usg5-4.h (subprocesses):
* s/hpux10-20.h (subprocesses):
* s/gnu-linux.h (subprocesses):
* s/cygwin.h (subprocesses):
* s/bsd-common.h (subprocesses):
* s/aix4-2.h (subprocesses):
* s/darwin.h (subprocesses): Do not define, defined by default now.

* Makefile.in (C_SWITCH_SITE, LD_SWITCH_SITE): Remove, unused.
Remove all references.
(temacs): Add GNUStep specific ld flags.

* Makefile.in (ALL_CFLAGS): Remove reference to C_SWITCH_SITE.

* config.nt (C_SWITCH_SITE, LD_SWITCH_SITE): Do not undefine.

* Makefile.in (ALL_CFLAGS): Remove reference to C_SWITCH_SITE.

* configure.in (LD_SWITCH_SITE): Remove, set the values directly
in src/Makefile.in.
(static): Remove, autoconf would always comment it out anyway.
(subprocesses): Define unconditionally.
parent 7c799cf5
2008-07-23 Dan Nicolaescu <dann@ics.uci.edu>
* configure.in (LD_SWITCH_SITE): Remove, set the values directly
in src/Makefile.in.
(static): Remove, autoconf would always comment it out anyway.
(subprocesses): Define unconditionally.
2008-07-19 Adrian Robert <Adrian.B.Robert@gmail.com>
* configure.in: Apply patch from Yavor Doganov <yavor <at> gnu.org> to
......
......@@ -2589,7 +2589,7 @@ AH_BOTTOM([
#define CANNOT_DUMP
#endif
/* PENDING: These are used for the Carbon port only. */
/* TODO: These are used for the Carbon port only. */
#undef MAC_OS
#undef MAC_OSX
......@@ -2645,7 +2645,6 @@ AH_BOTTOM([
# ifdef NS_IMPL_GNUSTEP
/* See also .m.o rule in Makefile.in */
# define C_SWITCH_X_SYSTEM -MMD -MP -D_REENTRANT -fPIC -fno-strict-aliasing
# define LD_SWITCH_SITE -lgnustep-gui -lgnustep-base -lobjc $(CONFIG_SYSTEM_LIBS) -lpthread
# define GNU_OBJC_CFLAGS -fgnu-runtime -Wno-import -fconstant-string-class=NSConstantString -DGNUSTEP_BASE_LIBRARY=1 -DGNU_GUI_LIBRARY=1 -DGNU_RUNTIME=1 -DGSWARN -DGSDIAGNOSE
# define OTHER_FILES ns-app
# else /* NS_IMPL_COCOA */
......@@ -2654,25 +2653,12 @@ AH_BOTTOM([
# endif /* NS_IMPL_COCOA */
#endif /* HAVE_NS */
/* If no remapping takes place, static variables cannot be dumped as
pure, so don't worry about the `static' keyword. */
#ifdef NO_REMAP
#undef static
#endif
/* Define `subprocesses' should be defined if you want to
have code for asynchronous subprocesses
(as used in M-x compile and M-x shell).
These do not work for some USG systems yet;
for the ones where they work, the s/SYSTEM.h file defines this flag. */
Only MSDOS does not support this. */
#ifndef VMS
#ifndef USG
/* #define subprocesses */
#endif
#endif
#define subprocesses
/* SIGTYPE is the macro we actually use. */
#ifndef SIGTYPE
......
2008-07-23 Dan Nicolaescu <dann@ics.uci.edu>
* Makefile.in (ALL_CFLAGS): Remove reference to C_SWITCH_SITE.
2008-06-26 Dan Nicolaescu <dann@ics.uci.edu>
* lwlib.c: Remove references to obsolete variables.
......
......@@ -52,7 +52,7 @@ TOOLKIT_DEFINES =
OBJS = lwlib.o $(TOOLKIT_OBJS) lwlib-utils.o
# ../src is needed to find config.h.
ALL_CFLAGS= $(C_SWITCH_SITE) $(C_SWITCH_SYSTEM) $(C_SWITCH_X_SITE) \
ALL_CFLAGS= $(C_SWITCH_SYSTEM) $(C_SWITCH_X_SITE) \
$(C_SWITCH_X_SYSTEM) $(C_SWITCH_MACHINE) $(CFLAGS) \
-DHAVE_CONFIG_H -Demacs -I. -I../src -I${srcdir} -I${srcdir}/../src
......
2008-07-23 Dan Nicolaescu <dann@ics.uci.edu>
* config.nt (C_SWITCH_SITE, LD_SWITCH_SITE): Do not undefine.
2008-07-13 Dan Nicolaescu <dann@ics.uci.edu>
* config.nt (HAVE_FACES): Remove, unused.
......
......@@ -315,20 +315,9 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */
/* Define `subprocesses' should be defined if you want to
have code for asynchronous subprocesses
(as used in M-x compile and M-x shell).
These do not work for some USG systems yet;
for the ones where they work, the s/SYSTEM.h file defines this flag. */
Only MSDOS does not support this. */
#ifndef VMS
#ifndef USG
/* #define subprocesses */
#endif
#endif
/* Define LD_SWITCH_SITE to contain any special flags your loader may need. */
#undef LD_SWITCH_SITE
/* Define C_SWITCH_SITE to contain any special flags your compiler needs. */
#undef C_SWITCH_SITE
#define subprocesses
/* Define LD_SWITCH_X_SITE to contain any special flags your loader
may need to deal with X Windows. For instance, if you've defined
......
2008-07-23 Dan Nicolaescu <dann@ics.uci.edu>
* Makefile.in (ALL_CFLAGS): Remove reference to C_SWITCH_SITE.
2007-07-25 Glenn Morris <rgm@gnu.org>
* Relicense all FSF files to GPLv3 or later.
......
......@@ -96,7 +96,7 @@ OBJS = Activate.o \
all:: libXMenu11.a
ALL_CFLAGS=$(C_SWITCH_SITE) $(C_SWITCH_SYSTEM) $(C_SWITCH_MACHINE) \
ALL_CFLAGS=$(C_SWITCH_SYSTEM) $(C_SWITCH_MACHINE) \
$(C_SWITCH_X_SITE) $(C_SWITCH_X_SYSTEM) $(C_SWITCH_X_MACHINE) \
$(CPPFLAGS) $(CFLAGS) -DEMACS_BITMAP_FILES \
-I../src -I${srcdir} -I${srcdir}/../src
......
2008-07-23 Dan Nicolaescu <dann@ics.uci.edu>
* config.in: Regenerate.
* s/ms-w32.h (subprocesses): Define unconditionally.
* s/template.h (subprocesses): Update comment.
* s/vms.h (subprocesses):
* s/usg5-4.h (subprocesses):
* s/hpux10-20.h (subprocesses):
* s/gnu-linux.h (subprocesses):
* s/cygwin.h (subprocesses):
* s/bsd-common.h (subprocesses):
* s/aix4-2.h (subprocesses):
* s/darwin.h (subprocesses): Do not define, defined by default now.
* Makefile.in (C_SWITCH_SITE, LD_SWITCH_SITE): Remove, unused.
Remove all references.
(temacs): Add GNUStep specific ld flags.
* nsterm.m (syms_of_nsterm): Provide ns, not ns-windowing,
similarly to what X does.
......
......@@ -200,16 +200,6 @@ SHELL=/bin/sh
#define LD_SWITCH_X_DEFAULT
#endif
/* These can be passed in from config.h to define special load and
compile switches needed by individual sites */
#ifndef LD_SWITCH_SITE
#define LD_SWITCH_SITE
#endif
#ifndef C_SWITCH_SITE
#define C_SWITCH_SITE
#endif
#ifndef ORDINARY_LINK
#ifndef CRT0_COMPILE
......@@ -263,7 +253,7 @@ DBUS_OBJ = dbusbind.o
/* C_SWITCH_X_SITE must come before C_SWITCH_X_MACHINE and C_SWITCH_X_SYSTEM
since it may have -I options that should override those two. */
ALL_CFLAGS=-Demacs -DHAVE_CONFIG_H $(MYCPPFLAGS) -I. -I${srcdir} C_SWITCH_MACHINE C_SWITCH_SYSTEM C_SWITCH_SITE C_SWITCH_X_SITE C_SWITCH_X_MACHINE C_SWITCH_X_SYSTEM C_SWITCH_SYSTEM_TEMACS ${CFLAGS_SOUND} ${RSVG_CFLAGS} ${DBUS_CFLAGS} ${CFLAGS} @FREETYPE_CFLAGS@ @FONTCONFIG_CFLAGS@ @LIBOTF_CFLAGS@ @M17N_FLT_CFLAGS@
ALL_CFLAGS=-Demacs -DHAVE_CONFIG_H $(MYCPPFLAGS) -I. -I${srcdir} C_SWITCH_MACHINE C_SWITCH_SYSTEM C_SWITCH_X_SITE C_SWITCH_X_MACHINE C_SWITCH_X_SYSTEM C_SWITCH_SYSTEM_TEMACS ${CFLAGS_SOUND} ${RSVG_CFLAGS} ${DBUS_CFLAGS} ${CFLAGS} @FREETYPE_CFLAGS@ @FONTCONFIG_CFLAGS@ @LIBOTF_CFLAGS@ @M17N_FLT_CFLAGS@
.SUFFIXES: .m
.c.o:
$(CC) -c $(CPPFLAGS) $(ALL_CFLAGS) $<
......@@ -492,7 +482,7 @@ LD=ld
/* Flags to pass to LD only for temacs. */
/* Do not split this line with a backslash. That can cause trouble with
some cpps. */
TEMACS_LDFLAGS = LD_SWITCH_SYSTEM LD_SWITCH_SYSTEM_TEMACS LD_SWITCH_MACHINE LD_SWITCH_MACHINE_TEMACS LD_SWITCH_SITE
TEMACS_LDFLAGS = LD_SWITCH_SYSTEM LD_SWITCH_SYSTEM_TEMACS LD_SWITCH_MACHINE LD_SWITCH_MACHINE_TEMACS
/* A macro which other sections of Makefile can redefine to munge the
flags before they are passed to LD. This is helpful if you have
......@@ -965,7 +955,7 @@ ${libsrc}make-docfile${EXEEXT}:
temacs${EXEEXT}: $(LOCALCPP) $(STARTFILES) stamp-oldxmenu ${obj} ${otherobj} OBJECTS_MACHINE prefix-args${EXEEXT}
echo "${obj} ${otherobj} " OBJECTS_MACHINE > buildobj.lst
#ifdef NS_IMPL_GNUSTEP
$(CC) -rdynamic YMF_PASS_LDFLAGS (${TEMACS_LDFLAGS}) -o temacs ${obj} ${otherobj} OBJECTS_MACHINE ${LIBES}
$(CC) -rdynamic YMF_PASS_LDFLAGS (${TEMACS_LDFLAGS} -lgnustep-gui -lgnustep-base -lobjc $(CONFIG_SYSTEM_LIBS) -lpthread ) -o temacs ${obj} ${otherobj} OBJECTS_MACHINE ${LIBES}
#else
$(LD) YMF_PASS_LDFLAGS (${STARTFLAGS} ${TEMACS_LDFLAGS}) $(LDFLAGS) \
-o temacs ${STARTFILES} ${obj} ${otherobj} \
......@@ -993,7 +983,6 @@ stamp-oldxmenu: ${OLDXMENU} ../src/$(OLDXMENU)
so we can use $(...) to substitute their values within "...". */
C_SWITCH_MACHINE_1 = C_SWITCH_MACHINE
C_SWITCH_SYSTEM_1 = C_SWITCH_SYSTEM
C_SWITCH_SITE_1 = C_SWITCH_SITE
C_SWITCH_X_SITE_1 = C_SWITCH_X_SITE
C_SWITCH_X_MACHINE_1 = C_SWITCH_X_MACHINE
C_SWITCH_X_SYSTEM_1 = C_SWITCH_X_SYSTEM
......@@ -1007,7 +996,6 @@ really-lwlib:
"C_SWITCH_X_SITE=$(C_SWITCH_X_SITE_1)" \
"C_SWITCH_X_MACHINE=$(C_SWITCH_X_MACHINE_1)" \
"C_SWITCH_X_SYSTEM=$(C_SWITCH_X_SYSTEM_1)" \
"C_SWITCH_SITE=$(C_SWITCH_SITE_1)" \
"C_SWITCH_MACHINE=$(C_SWITCH_MACHINE_1)" \
"C_SWITCH_SYSTEM=$(C_SWITCH_SYSTEM_1)"
@true /* make -t should not create really-lwlib. */
......@@ -1021,7 +1009,6 @@ really-oldXMenu:
"C_SWITCH_X_SITE=$(C_SWITCH_X_SITE_1)" \
"C_SWITCH_X_MACHINE=$(C_SWITCH_X_MACHINE_1)" \
"C_SWITCH_X_SYSTEM=$(C_SWITCH_X_SYSTEM_1)" \
"C_SWITCH_SITE=$(C_SWITCH_SITE_1)" \
"C_SWITCH_MACHINE=$(C_SWITCH_MACHINE_1)" \
"C_SWITCH_SYSTEM=$(C_SWITCH_SYSTEM_1)"
@true /* make -t should not create really-oldXMenu. */
......
......@@ -1053,7 +1053,6 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */
# ifdef NS_IMPL_GNUSTEP
/* See also .m.o rule in Makefile.in */
# define C_SWITCH_X_SYSTEM -MMD -MP -D_REENTRANT -fPIC -fno-strict-aliasing
# define LD_SWITCH_SITE -lgnustep-gui -lgnustep-base -lobjc $(CONFIG_SYSTEM_LIBS) -lpthread
# define GNU_OBJC_CFLAGS -fgnu-runtime -Wno-import -fconstant-string-class=NSConstantString -DGNUSTEP_BASE_LIBRARY=1 -DGNU_GUI_LIBRARY=1 -DGNU_RUNTIME=1 -DGSWARN -DGSDIAGNOSE
# define OTHER_FILES ns-app
# else /* NS_IMPL_COCOA */
......@@ -1062,25 +1061,12 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */
# endif /* NS_IMPL_COCOA */
#endif /* HAVE_NS */
/* If no remapping takes place, static variables cannot be dumped as
pure, so don't worry about the `static' keyword. */
#ifdef NO_REMAP
#undef static
#endif
/* Define `subprocesses' should be defined if you want to
have code for asynchronous subprocesses
(as used in M-x compile and M-x shell).
These do not work for some USG systems yet;
for the ones where they work, the s/SYSTEM.h file defines this flag. */
Only MSDOS does not support this. */
#ifndef VMS
#ifndef USG
/* #define subprocesses */
#endif
#endif
#define subprocesses
/* SIGTYPE is the macro we actually use. */
#ifndef SIGTYPE
......
......@@ -72,13 +72,6 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */
#define BSTRING
/* subprocesses should be defined if you want to
have code for asynchronous subprocesses
(as used in M-x compile and M-x shell).
This is supposed to work now on system V release 2. */
#define subprocesses
/* The file containing the kernel's symbol table is called /unix. */
#define KERNEL_FILE "/unix"
......
......@@ -61,14 +61,6 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */
#define BSTRING
/* subprocesses should be defined if you want to
have code for asynchronous subprocesses
(as used in M-x compile and M-x shell).
This is generally OS dependent, and not supported
under most USG systems. */
#define subprocesses
/* define MAIL_USE_FLOCK if the mailer uses flock
to interlock access to /usr/spool/mail/$USER.
The alternative is that a lock file named
......
......@@ -84,14 +84,6 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */
#define BSTRING
/* subprocesses should be defined if you want to
have code for asynchronous subprocesses
(as used in M-x compile and M-x shell).
This is generally OS dependent, and not supported
under most USG systems. */
#define subprocesses
/* Define CLASH_DETECTION if you want lock files to be written
so that Emacs can tell instantly when you try to modify
a file that someone else has modified in his Emacs. */
......
......@@ -102,14 +102,6 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */
#define BSTRING
/* subprocesses should be defined if you want to
have code for asynchronous subprocesses
(as used in M-x compile and M-x shell).
This is generally OS dependent, and not supported
under most USG systems. */
#define subprocesses
/* define MAIL_USE_FLOCK if the mailer uses flock
to interlock access to /usr/spool/mail/$USER.
The alternative is that a lock file named
......
......@@ -105,14 +105,6 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */
#define BSTRING
/* subprocesses should be defined if you want to
have code for asynchronous subprocesses
(as used in M-x compile and M-x shell).
This is generally OS dependent, and not supported
under most USG systems. */
#define subprocesses
/* define MAIL_USE_FLOCK if the mailer uses flock
to interlock access to /usr/spool/mail/$USER.
The alternative is that a lock file named
......
......@@ -66,14 +66,6 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */
#define BSTRING
/* subprocesses should be defined if you want to
have code for asynchronous subprocesses
(as used in M-x compile and M-x shell).
This is generally OS dependent, and not supported
under most USG systems. */
#define subprocesses
/* Define CLASH_DETECTION if you want lock files to be written
so that Emacs can tell instantly when you try to modify
a file that someone else has modified in his Emacs. */
......
......@@ -84,14 +84,6 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */
#define BCOPY_UPWARD_SAFE 1
#define BCOPY_DOWNWARD_SAFE 1
/* subprocesses should be defined if you want to
have code for asynchronous subprocesses
(as used in M-x compile and M-x shell).
This is generally OS dependent, and not supported
under most USG systems. */
#define subprocesses 1
/* If your system uses COFF (Common Object File Format) then define the
preprocessor symbol "COFF". */
......
......@@ -68,8 +68,7 @@ You lose; /* Emacs for DOS must be compiled with DJGPP */
/* subprocesses should be defined if you want to
have code for asynchronous subprocesses
(as used in M-x compile and M-x shell).
This is generally OS dependent, and not supported
under most USG systems. */
This is the only system that needs this. */
#undef subprocesses
......
......@@ -104,13 +104,12 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */
#define BSTRING
/* subprocesses should be defined if you want to
/* subprocesses should be undefined if you do NOT want to
have code for asynchronous subprocesses
(as used in M-x compile and M-x shell).
This is generally OS dependent, and not supported
under most USG systems. */
Currently only MSDOS does not support this. */
#define subprocesses
/* #undef subprocesses */
/* If your system uses COFF (Common Object File Format) then define the
preprocessor symbol "COFF". */
......
......@@ -52,13 +52,6 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */
*/
#define SYSV_SYSTEM_DIR
/* subprocesses should be defined if you want to
have code for asynchronous subprocesses
(as used in M-x compile and M-x shell).
This is supposed to work now on system V release 2. */
#define subprocesses
/* The file containing the kernel's symbol table is called /unix. */
#define KERNEL_FILE "/unix"
......
......@@ -45,14 +45,6 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */
#define NONSYSTEM_DIR_LIBRARY
/* subprocesses should be defined if you want to
have code for asynchronous subprocesses
(as used in M-x compile and M-x shell).
This is generally OS dependent, and not supported
under most USG systems. */
#define subprocesses
/* Define the maximum record length for print strings, if needed. */
#define MAX_PRINT_CHARS 300
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment