From: Dan Nicolaescu <dann@ics.uci.edu>
Date: Wed, 31 Oct 2007 06:55:00 +0000 (+0000)
Subject: * s/usg5-4.h:
X-Git-Tag: emacs-pretest-23.0.90~9935
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=c22140f676d077734d3eaed79c958948c9e1a0e8;p=emacs.git

* s/usg5-4.h:
* s/usg5-3.h:
* s/ptx.h:
* m/is386.h:
* m/ibmps2-aix.h:
* Makefile.in: Remove all mentions of X10

* dispnew.c (syms_of_display): Don't mention version 10.
---

diff --git a/src/ChangeLog b/src/ChangeLog
index 79b6a3497d5..8d1bf78bdc4 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,14 @@
+2007-10-31  Dan Nicolaescu  <dann@ics.uci.edu>
+
+	* s/usg5-4.h:
+	* s/usg5-3.h:
+	* s/ptx.h:
+	* m/is386.h:
+	* m/ibmps2-aix.h:
+	* Makefile.in: Remove all mentions of X10
+
+	* dispnew.c (syms_of_display): Don't mention version 10.
+
 2007-10-28  Juanma Barranquero  <lekktu@gmail.com>
 
 	* makefile.w32-in (OBJ1): Remove abbrev.$(O).
diff --git a/src/Makefile.in b/src/Makefile.in
index 56e8a7c49a5..25673f95657 100644
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -279,18 +279,10 @@ ALL_CFLAGS=-Demacs -DHAVE_CONFIG_H $(TOOLKIT_DEFINES) $(MYCPPFLAGS) -I. -I${srcd
 .c.o:
 	$(CC) -c $(CPPFLAGS) $(ALL_CFLAGS) $<
 
-#ifndef LIBX10_MACHINE
-#define LIBX10_MACHINE
-#endif
-
 #ifndef LIBX11_MACHINE
 #define LIBX11_MACHINE
 #endif
 
-#ifndef LIBX10_SYSTEM
-#define LIBX10_SYSTEM
-#endif
-
 #ifndef LIBX11_SYSTEM
 #define LIBX11_SYSTEM
 #endif
@@ -446,7 +438,7 @@ XFT_LIBS=@XFT_LIBS@
 X11_LDFLAGS = LD_SWITCH_X_SITE LD_SWITCH_X_DEFAULT
 LIBX= $(LIBXMENU) $(X11_LDFLAGS) $(LIBXT) LIBTIFF LIBJPEG LIBPNG LIBGIF LIBXPM LIB_X11_LIB LIBX11_MACHINE LIBX11_SYSTEM $(XFT_LIBS)
 #else /* not HAVE_X11 */
-LIBX= $(LIBXMENU) LD_SWITCH_X_SITE -lX10 LIBX10_MACHINE LIBX10_SYSTEM
+LIBX= $(LIBXMENU) LD_SWITCH_X_SITE
 #endif /* not HAVE_X11 */
 #else /* not HAVE_X_WINDOWS */
 #endif /* not HAVE_X_WINDOWS */
diff --git a/src/dispnew.c b/src/dispnew.c
index ad139681d54..3c4ba18ce35 100644
--- a/src/dispnew.c
+++ b/src/dispnew.c
@@ -7112,7 +7112,7 @@ The value is nil if the selected frame is on a text-only-terminal.  */);
 
   DEFVAR_LISP ("window-system-version", &Vwindow_system_version,
 	       doc: /* The version number of the window system in use.
-For X windows, this is 10 or 11.  */);
+For X windows, this is 11.  */);
 
   DEFVAR_BOOL ("cursor-in-echo-area", &cursor_in_echo_area,
 	       doc: /* Non-nil means put cursor in minibuffer, at end of any message there.  */);
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/s/ptx.h b/src/s/ptx.h
index d192bd6098a..4170e5036c9 100644
--- a/src/s/ptx.h
+++ b/src/s/ptx.h
@@ -29,7 +29,6 @@ Boston, MA 02110-1301, USA.  */
 
 /* Undo these defines because they are incorrect or need to be changed.  */
 #undef LIB_X11_LIB
-#undef LIBX10_SYSTEM
 #undef LIBX11_SYSTEM
 #undef USG_SHARED_LIBRARIES
 
diff --git a/src/s/usg5-3.h b/src/s/usg5-3.h
index d9b53718488..5df34f31b0e 100644
--- a/src/s/usg5-3.h
+++ b/src/s/usg5-3.h
@@ -181,7 +181,6 @@ Boston, MA 02110-1301, USA.  */
 
 /* X needs to talk on the network, so search the network library.  */
 
-#define LIBX10_SYSTEM -lnsl_s
 #define LIBX11_SYSTEM -lpt -lnls -lnsl_s -lc_s
 
 /* The docs for system V/386 suggest v.3 has sigpause,
diff --git a/src/s/usg5-4.h b/src/s/usg5-4.h
index 3dc05f3e9fd..657fa9c51c6 100644
--- a/src/s/usg5-4.h
+++ b/src/s/usg5-4.h
@@ -180,7 +180,6 @@ Boston, MA 02110-1301, USA.  */
    library, as opposed to a DLL.  Share libraries were used in SVR3, and are
    available only in order to allow SVR3 binaries to run.  They should not be
    linked in to new binaries. -- caraway!pinkas@caraway.intel.com.  */
-#undef LIBX10_SYSTEM
 #undef LIBX11_SYSTEM
 
 /* Tell x11term.c and keyboard.c we have the system V streams feature.  */