From 77ccee0959daf0256a746fa3029cfe4da6f2b476 Mon Sep 17 00:00:00 2001 From: Dan Nicolaescu Date: Wed, 23 Jul 2008 06:26:32 +0000 Subject: [PATCH] * 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. --- ChangeLog | 7 +++++++ configure.in | 20 +++----------------- lwlib/ChangeLog | 4 ++++ lwlib/Makefile.in | 2 +- nt/ChangeLog | 4 ++++ nt/config.nt | 15 ++------------- oldXMenu/ChangeLog | 4 ++++ oldXMenu/Makefile.in | 2 +- src/ChangeLog | 16 ++++++++++++++++ src/Makefile.in | 19 +++---------------- src/config.in | 18 ++---------------- src/s/aix4-2.h | 7 ------- src/s/bsd-common.h | 8 -------- src/s/cygwin.h | 8 -------- src/s/darwin.h | 8 -------- src/s/gnu-linux.h | 8 -------- src/s/hpux10-20.h | 8 -------- src/s/ms-w32.h | 8 -------- src/s/msdos.h | 3 +-- src/s/template.h | 7 +++---- src/s/usg5-4.h | 7 ------- src/s/vms.h | 8 -------- 22 files changed, 51 insertions(+), 140 deletions(-) diff --git a/ChangeLog b/ChangeLog index a5e60c4e2a..a6ae46163a 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +2008-07-23 Dan Nicolaescu + + * 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 * configure.in: Apply patch from Yavor Doganov gnu.org> to diff --git a/configure.in b/configure.in index 6c7231c526..f73b73209e 100644 --- a/configure.in +++ b/configure.in @@ -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 diff --git a/lwlib/ChangeLog b/lwlib/ChangeLog index 1c0ce2e18c..153e71c895 100644 --- a/lwlib/ChangeLog +++ b/lwlib/ChangeLog @@ -1,3 +1,7 @@ +2008-07-23 Dan Nicolaescu + + * Makefile.in (ALL_CFLAGS): Remove reference to C_SWITCH_SITE. + 2008-06-26 Dan Nicolaescu * lwlib.c: Remove references to obsolete variables. diff --git a/lwlib/Makefile.in b/lwlib/Makefile.in index f0626bb461..e69cc9a3b9 100644 --- a/lwlib/Makefile.in +++ b/lwlib/Makefile.in @@ -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 diff --git a/nt/ChangeLog b/nt/ChangeLog index c2b4141594..070e46939b 100644 --- a/nt/ChangeLog +++ b/nt/ChangeLog @@ -1,3 +1,7 @@ +2008-07-23 Dan Nicolaescu + + * config.nt (C_SWITCH_SITE, LD_SWITCH_SITE): Do not undefine. + 2008-07-13 Dan Nicolaescu * config.nt (HAVE_FACES): Remove, unused. diff --git a/nt/config.nt b/nt/config.nt index 231c13948e..5df5a02867 100644 --- a/nt/config.nt +++ b/nt/config.nt @@ -315,20 +315,9 @@ along with GNU Emacs. If not, see . */ /* 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 diff --git a/oldXMenu/ChangeLog b/oldXMenu/ChangeLog index 7f660ea9d6..6f027eb854 100644 --- a/oldXMenu/ChangeLog +++ b/oldXMenu/ChangeLog @@ -1,3 +1,7 @@ +2008-07-23 Dan Nicolaescu + + * Makefile.in (ALL_CFLAGS): Remove reference to C_SWITCH_SITE. + 2007-07-25 Glenn Morris * Relicense all FSF files to GPLv3 or later. diff --git a/oldXMenu/Makefile.in b/oldXMenu/Makefile.in index 9cda40b713..6db9450045 100644 --- a/oldXMenu/Makefile.in +++ b/oldXMenu/Makefile.in @@ -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 diff --git a/src/ChangeLog b/src/ChangeLog index c902bb93ad..191fa4bfa0 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,5 +1,21 @@ 2008-07-23 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. + * nsterm.m (syms_of_nsterm): Provide ns, not ns-windowing, similarly to what X does. diff --git a/src/Makefile.in b/src/Makefile.in index 1768a006fe..e15cf0caf7 100644 --- a/src/Makefile.in +++ b/src/Makefile.in @@ -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. */ diff --git a/src/config.in b/src/config.in index 5a34ca7046..40474fa90d 100644 --- a/src/config.in +++ b/src/config.in @@ -1053,7 +1053,6 @@ along with GNU Emacs. If not, see . */ # 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 . */ # 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 diff --git a/src/s/aix4-2.h b/src/s/aix4-2.h index e5a8cbdab9..c3b2394818 100644 --- a/src/s/aix4-2.h +++ b/src/s/aix4-2.h @@ -72,13 +72,6 @@ along with GNU Emacs. If not, see . */ #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" diff --git a/src/s/bsd-common.h b/src/s/bsd-common.h index 77a6329cbe..c1d5d0a14a 100644 --- a/src/s/bsd-common.h +++ b/src/s/bsd-common.h @@ -61,14 +61,6 @@ along with GNU Emacs. If not, see . */ #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 diff --git a/src/s/cygwin.h b/src/s/cygwin.h index fd13112730..18f3d6f011 100644 --- a/src/s/cygwin.h +++ b/src/s/cygwin.h @@ -84,14 +84,6 @@ along with GNU Emacs. If not, see . */ #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. */ diff --git a/src/s/darwin.h b/src/s/darwin.h index 75afe67380..548b2da84f 100644 --- a/src/s/darwin.h +++ b/src/s/darwin.h @@ -102,14 +102,6 @@ along with GNU Emacs. If not, see . */ #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 diff --git a/src/s/gnu-linux.h b/src/s/gnu-linux.h index 7501cd602f..a74d08a3c8 100644 --- a/src/s/gnu-linux.h +++ b/src/s/gnu-linux.h @@ -105,14 +105,6 @@ along with GNU Emacs. If not, see . */ #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 diff --git a/src/s/hpux10-20.h b/src/s/hpux10-20.h index 201f4f4ca3..18a28d2b9d 100644 --- a/src/s/hpux10-20.h +++ b/src/s/hpux10-20.h @@ -66,14 +66,6 @@ along with GNU Emacs. If not, see . */ #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. */ diff --git a/src/s/ms-w32.h b/src/s/ms-w32.h index 87ed079bff..5a4bcb9d13 100644 --- a/src/s/ms-w32.h +++ b/src/s/ms-w32.h @@ -84,14 +84,6 @@ along with GNU Emacs. If not, see . */ #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". */ diff --git a/src/s/msdos.h b/src/s/msdos.h index 1307f03459..055ffad98a 100644 --- a/src/s/msdos.h +++ b/src/s/msdos.h @@ -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 diff --git a/src/s/template.h b/src/s/template.h index 4120a8fe04..ce5c8fdbe5 100644 --- a/src/s/template.h +++ b/src/s/template.h @@ -104,13 +104,12 @@ along with GNU Emacs. If not, see . */ #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". */ diff --git a/src/s/usg5-4.h b/src/s/usg5-4.h index 9639d3be24..7ce4790fb7 100644 --- a/src/s/usg5-4.h +++ b/src/s/usg5-4.h @@ -52,13 +52,6 @@ along with GNU Emacs. If not, see . */ */ #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" diff --git a/src/s/vms.h b/src/s/vms.h index 7c2d4ad43d..e95e5f217a 100644 --- a/src/s/vms.h +++ b/src/s/vms.h @@ -45,14 +45,6 @@ along with GNU Emacs. If not, see . */ #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 -- 2.20.1