* 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.

14 files changed, 25 insertions, 108 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index c902bb93ad1..191fa4bfa07 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,5 +1,21 @@
 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.
 
diff --git a/src/Makefile.in b/src/Makefile.in
index 1768a006fea..e15cf0caf7c 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 5a34ca7046a..40474fa90d1 100644
--- a/src/config.in
+++ b/src/config.in
@@ -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
diff --git a/src/s/aix4-2.h b/src/s/aix4-2.h
index e5a8cbdab9a..c3b23948182 100644
--- a/src/s/aix4-2.h
+++ b/src/s/aix4-2.h
@@ -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"
diff --git a/src/s/bsd-common.h b/src/s/bsd-common.h
index 77a6329cbe6..c1d5d0a14a9 100644
--- a/src/s/bsd-common.h
+++ b/src/s/bsd-common.h
@@ -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
diff --git a/src/s/cygwin.h b/src/s/cygwin.h
index fd13112730c..18f3d6f0115 100644
--- a/src/s/cygwin.h
+++ b/src/s/cygwin.h
@@ -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.  */
diff --git a/src/s/darwin.h b/src/s/darwin.h
index 75afe67380c..548b2da84fd 100644
--- a/src/s/darwin.h
+++ b/src/s/darwin.h
@@ -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
diff --git a/src/s/gnu-linux.h b/src/s/gnu-linux.h
index 7501cd602f3..a74d08a3c84 100644
--- a/src/s/gnu-linux.h
+++ b/src/s/gnu-linux.h
@@ -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
diff --git a/src/s/hpux10-20.h b/src/s/hpux10-20.h
index 201f4f4ca32..18a28d2b9d5 100644
--- a/src/s/hpux10-20.h
+++ b/src/s/hpux10-20.h
@@ -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.  */
diff --git a/src/s/ms-w32.h b/src/s/ms-w32.h
index 87ed079bff9..5a4bcb9d131 100644
--- a/src/s/ms-w32.h
+++ b/src/s/ms-w32.h
@@ -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". */
 
diff --git a/src/s/msdos.h b/src/s/msdos.h
index 1307f03459f..055ffad98a2 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 4120a8fe042..ce5c8fdbe5c 100644
--- a/src/s/template.h
+++ b/src/s/template.h
@@ -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". */
diff --git a/src/s/usg5-4.h b/src/s/usg5-4.h
index 9639d3be24c..7ce4790fb76 100644
--- a/src/s/usg5-4.h
+++ b/src/s/usg5-4.h
@@ -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"
diff --git a/src/s/vms.h b/src/s/vms.h
index 7c2d4ad43d1..e95e5f217ae 100644
--- a/src/s/vms.h
+++ b/src/s/vms.h
@@ -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