Commit c22140f6 authored by Dan Nicolaescu's avatar Dan Nicolaescu
Browse files

* 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.
parent 91dd4dc4
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).
......
......@@ -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 */
......
......@@ -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. */);
......
......@@ -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
......
......@@ -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
......
......@@ -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
......
......@@ -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,
......
......@@ -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. */
......
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