diff options
Diffstat (limited to 'nx-X11/config')
| -rw-r--r-- | nx-X11/config/cf/Imake.tmpl | 6 | ||||
| -rw-r--r-- | nx-X11/config/cf/README | 2 | ||||
| -rw-r--r-- | nx-X11/config/cf/X11.tmpl | 16 | ||||
| -rw-r--r-- | nx-X11/config/cf/host.def | 7 | ||||
| -rw-r--r-- | nx-X11/config/cf/linux.cf | 11 | ||||
| -rw-r--r-- | nx-X11/config/cf/xorgsite.def | 7 |
6 files changed, 4 insertions, 45 deletions
diff --git a/nx-X11/config/cf/Imake.tmpl b/nx-X11/config/cf/Imake.tmpl index 6406fca33..5c8effee5 100644 --- a/nx-X11/config/cf/Imake.tmpl +++ b/nx-X11/config/cf/Imake.tmpl @@ -375,12 +375,6 @@ XCOMM the platform-specific parameters - edit site.def to change #ifndef HasSockets #define HasSockets YES #endif -#ifndef HasStreams -#define HasStreams !HasSockets -#endif -#ifndef HasDECnet -#define HasDECnet NO -#endif #ifndef HasPoll #if SystemV || SystemV4 #define HasPoll YES diff --git a/nx-X11/config/cf/README b/nx-X11/config/cf/README index 27c2386a4..9cb2ff91e 100644 --- a/nx-X11/config/cf/README +++ b/nx-X11/config/cf/README @@ -53,7 +53,6 @@ Imake.tmpl provides defaults for the following variables: HasCodeCenter boolean for system has CodeCenter HasCookieMaker boolean for system has xauth cookie generator HasCplusplus system has a C++ compiler? - HasDECnet system has DECnet? HasFortran boolean for system has Fortran compiler HasGcc boolean for system has GNU gcc compiler HasGcc2 boolean for system has GNU gcc 2.x compiler @@ -78,7 +77,6 @@ Imake.tmpl provides defaults for the following variables: HasShm boolean for System V shared memory HasSockets boolean for system has BSD sockets HasStrcasecmp boolean for system implements str[n]casecmp - HasStreams use STREAMS I/O interface? HasSymLinks boolean for system has symbolic links HasTestCenter boolean for system has TestCenter HasVarDirectory boolean for system has /var diff --git a/nx-X11/config/cf/X11.tmpl b/nx-X11/config/cf/X11.tmpl index 33d108d06..1942ca805 100644 --- a/nx-X11/config/cf/X11.tmpl +++ b/nx-X11/config/cf/X11.tmpl @@ -334,8 +334,7 @@ XORGRELSTRING = XorgManVersionString * NOTE: IPv6Flags could be tacked on to either ConnectionFlags or * ExtraConnectionDefs. Here, we choose the later in order to * maximise exposure of the IPv6 code (a number of <OS>.def files - * contain ConnectionFlags overrides). Mind you, this might not - * the right thing to do when HasStreams is asserted. + * contain ConnectionFlags overrides). */ #ifndef BuildIPv6 /* If the OS also #define's AF_INET6 */ #define BuildIPv6 YES @@ -355,19 +354,8 @@ XORGRELSTRING = XorgManVersionString #ifndef IPv6SocketsAlsoIPv4 #define IPv6SocketsAlsoIPv4 YES #endif -#ifndef DECnetFlags -#if HasDECnet -#define DECnetFlags -DDNETCONN -#else -#define DECnetFlags -#endif -#endif #ifndef ConnectionFlags -#if HasStreams -#define ConnectionFlags -DSTREAMSCONN -#else -#define ConnectionFlags -DTCPCONN -DUNIXCONN DECnetFlags -#endif +#define ConnectionFlags -DTCPCONN -DUNIXCONN #endif #if HasStickyDirBit STICKY_DEFINES = -DHAS_STICKY_DIR_BIT diff --git a/nx-X11/config/cf/host.def b/nx-X11/config/cf/host.def index 0dccfad8b..efd1aad7c 100644 --- a/nx-X11/config/cf/host.def +++ b/nx-X11/config/cf/host.def @@ -430,13 +430,6 @@ #endif /* #if defined(LinuxArchitecture) */ /* - * If you have Linux DECnet support, and want to build XFree86 with support - * for connections over DECnet, uncomment this. - * -#define HasDECnet YES - */ - -/* * To build static and shared libraries with debugging information, uncomment * this. Assumes you have Gcc2. * (If you don't have Gcc2, you can use the DebugLib{X11,...} variables diff --git a/nx-X11/config/cf/linux.cf b/nx-X11/config/cf/linux.cf index 9238b9e6f..c6ae58474 100644 --- a/nx-X11/config/cf/linux.cf +++ b/nx-X11/config/cf/linux.cf @@ -861,15 +861,8 @@ XCOMM binutils: (LinuxBinUtilsMajorVersion) #define PamMiscLibraries -lpam_misc #endif -#ifndef HasDECnet -#define HasDECnet NO -#endif -#if HasDECnet -# define ConnectionFlags -DUNIXCONN -DTCPCONN -DDNETCONN -# define ExtraLibraries -ldnet -#else -# define ConnectionFlags -DUNIXCONN -DTCPCONN -#endif +#define ConnectionFlags -DUNIXCONN -DTCPCONN + /* Some of these man page defaults are overriden in the above OS sections */ #ifndef ManSuffix diff --git a/nx-X11/config/cf/xorgsite.def b/nx-X11/config/cf/xorgsite.def index 1614fce5e..f735495f8 100644 --- a/nx-X11/config/cf/xorgsite.def +++ b/nx-X11/config/cf/xorgsite.def @@ -276,13 +276,6 @@ #define HasXdmAuth YES /* - * If you have Linux DECnet support, and want to build XFree86 with support - * for connections over DECnet, uncomment this. - * -#define HasDECnet YES - */ - -/* * To build static and shared libraries with debugging information, uncomment * this. Assumes you have Gcc2. * (If you don't have Gcc2, you can use the DebugLib{X11,...} variables |