Merge from emacs--devo--0

Revision: emacs@sv.gnu.org/emacs--unicode--0--patch-283

5 files changed, 0 insertions, 38 deletions

diff --git a/src/m/ibmps2-aix.h b/src/m/ibmps2-aix.h
index 8c975b81bb9..045bcf2c294 100644
--- a/src/m/ibmps2-aix.h
+++ b/src/m/ibmps2-aix.h
@@ -213,7 +213,6 @@ so disable it for them.  */
 #undef NOMULTIPLEJOBS
 #undef BROKEN_TIOCGETC
 #undef BROKEN_TIOCGWINSZ
-#undef LIBX10_SYSTEM
 #undef LIBX11_SYSTEM
 #undef LIB_X11_LIB
 #endif
diff --git a/src/m/is386.h b/src/m/is386.h
index 02fe12d93e5..5041db9a6c8 100644
--- a/src/m/is386.h
+++ b/src/m/is386.h
@@ -21,7 +21,6 @@ Intel 386 (-machine=intel386 or -machine=is386.h)
   It may also be correct for Microport systems.
 NOTE-END  */
 
-#define LIBX10_MACHINE -lnsl_s
 #define LIBX11_MACHINE -lnsl_s
 
 #define LIBS_DEBUG -lg
diff --git a/src/m/sparc.h b/src/m/sparc.h
index 8df81ee91aa..bf122d857cc 100644
--- a/src/m/sparc.h
+++ b/src/m/sparc.h
@@ -64,18 +64,6 @@ NOTE-END  */
 
 #define SEGMENT_MASK (SEGSIZ - 1)
 
-/* Arrange to link with sun windows, if requested.  */
-/* For details on emacstool and sunfns, see etc/SUN-SUPPORT */
-/* These programs require Sun UNIX 4.2 Release 3.2 or greater */
-
-#ifdef HAVE_SUN_WINDOWS
-#define OTHER_FILES  ${etcdir}emacstool
-#define LIBS_MACHINE -lsuntool -lsunwindow -lpixrect
-#define OBJECTS_MACHINE sunfns.o
-#define SYMS_MACHINE syms_of_sunfns ()
-#define PURESIZE 130000
-#endif
-
 #if !defined (__NetBSD__) && !defined (__linux__) && !defined (__OpenBSD__)
 /* This really belongs in s/sun.h.  */
 
diff --git a/src/m/sun2.h b/src/m/sun2.h
index e764ded3ce7..a872bf6f3bb 100644
--- a/src/m/sun2.h
+++ b/src/m/sun2.h
@@ -85,17 +85,5 @@ NOTE-END  */
 
 #define SEGMENT_MASK (SEGSIZ - 1)
 
-/* Arrange to link with sun windows, if requested.  */
-/* For details on emacstool and sunfns, see etc/SUN-SUPPORT */
-/* These programs require Sun UNIX 4.2 Release 3.2 or greater */
-
-#ifdef HAVE_SUN_WINDOWS
-#define OTHER_FILES  ${libsrc}emacstool
-#define LIBS_MACHINE -lsuntool -lsunwindow -lpixrect
-#define OBJECTS_MACHINE sunfns.o
-#define SYMS_MACHINE syms_of_sunfns ()
-#define PURESIZE 132000
-#endif
-
 /* arch-tag: 543c3570-74ca-4099-aa47-db7c7b691c8e
    (do not change this comment) */
diff --git a/src/m/sun386.h b/src/m/sun386.h
index a3eedbe755e..ed98960c809 100644
--- a/src/m/sun386.h
+++ b/src/m/sun386.h
@@ -56,18 +56,6 @@ NOTE-END  */
 
 #define LIBS_TERMCAP -ltermcap
 
-/* Arrange to link with sun windows, if requested.  */
-/* For details on emacstool and sunfns, see etc/SUN-SUPPORT */
-/* These programs require Sun UNIX 4.2 Release 3.2 or greater */
-
-#ifdef HAVE_SUN_WINDOWS
-#define OTHER_FILES  ${etcdir}emacstool
-#define LIBS_MACHINE -lsuntool -lsunwindow -lpixrect
-#define OBJECTS_MACHINE sunfns.o
-#define SYMS_MACHINE syms_of_sunfns ()
-#define PURESIZE 132000
-#endif
-
 /* Roadrunner uses 'COFF' format */
 #define COFF