diff options
| author | Alan Coopersmith <alan.coopersmith@sun.com> | 2009-10-03 15:06:23 -0700 |
|---|---|---|
| committer | Alan Coopersmith <alan.coopersmith@sun.com> | 2009-10-03 15:12:07 -0700 |
| commit | 817c2d6fe0bea3910d335a0f0ae6d69e358dd9da (patch) | |
| tree | c9bfb6e31f85fea68c747d74410efb15293bf67f | |
| parent | 3a59c294d30f5c68dc1411a1a7a274948e08d528 (diff) | |
Purge ancient server names from help, add newer server names instead
Signed-off-by: Alan Coopersmith <alan.coopersmith@sun.com>
| -rw-r--r-- | configure.ac | 4 | ||||
| -rw-r--r-- | xinit.c | 31 |
2 files changed, 8 insertions, 27 deletions
diff --git a/configure.ac b/configure.ac index 29b6961..485bd69 100644 --- a/configure.ac +++ b/configure.ac @@ -190,9 +190,5 @@ AC_SUBST(XSERVER) AC_SUBST(XAUTH) AC_SUBST(XINIT) -# Defines which X servers are listed in help output in xinit.c -# Cheat, lie, and assume all the world is Xorg for now -AC_DEFINE(XORG, 1, [Define if you have Xorg X server]) - AC_OUTPUT([Makefile]) AC_OUTPUT([privileged_startx/Makefile]) @@ -120,36 +120,21 @@ char **newenvironlast = NULL; const char *bindir = BINDIR; const char * const server_names[] = { -#if defined(ultrix) && defined(mips) - "Xdec Digital color display on DECstation", -#endif -#if defined(sun) && !defined(XORG) /* Sun */ - "Xsun Sun BW2, CG2, CG3, CG4, or CG6 on Sun 2, 3, 4, or 386i", - "Xsunmono Sun BW2 on Sun 2, 3, 4, or 386i ", - "Xsun24 Sun BW2, CG2, CG3, CG4, CG6, or CG8 on Sun 4", -#endif -#ifdef hpux /* HP */ - "Xhp HP monochrome and colors displays on 9000/300 series", -#endif -#ifdef ibm /* IBM */ - "Xibm IBM AED, APA, 8514a, megapel, VGA displays on PC/RT", -#endif -#ifdef macII /* MacII */ - "XmacII Apple monochrome display on Macintosh II", -#endif -#ifdef XFREE86 - "XFree86 XFree86 displays", -#endif -#ifdef XORG - "Xorg Common X server for most displays", -#endif #ifdef __APPLE__ "Xquartz Mac OSX Quartz displays.", +#else +# ifdef __CYGWIN__ + "XWin X Server for the Cygwin environment on Microsoft Windows", +# else + "Xorg Common X server for most displays", +# endif #endif "Xvfb Virtual frame buffer", "Xfake kdrive-based virtual frame buffer", "Xnest X server nested in a window on another X server", "Xephyr kdrive-based nested X server", + "Xvnc X server accessed over VNC's RFB protocol", + "Xdmx Distributed Multi-head X server", NULL}; #ifndef XINITRC |