aboutsummaryrefslogtreecommitdiff
path: root/nx-X11/config
diff options
context:
space:
mode:
authorMihai Moldovan <ionic@ionic.de>2015-06-22 03:38:46 +0200
committerMihai Moldovan <ionic@ionic.de>2015-06-22 03:38:46 +0200
commite7dfbd511d3b0a358f94b880f2212b74f9e42e70 (patch)
treee6c90fe083beebf5edfb6c226b8994bf644d1b70 /nx-X11/config
parentfb2a4e4c510a80630722834f2cf408f8b731b4ef (diff)
parent5365f9059a758984166edab6f6d75c7d640f0f88 (diff)
downloadnx-libs-e7dfbd511d3b0a358f94b880f2212b74f9e42e70.tar.gz
nx-libs-e7dfbd511d3b0a358f94b880f2212b74f9e42e70.tar.bz2
nx-libs-e7dfbd511d3b0a358f94b880f2212b74f9e42e70.zip
Merge branch 'sunweaver-pr/libxf86rush-cleanup' into arctica-3.6.x
Attributes GH PR #42: https://github.com/ArcticaProject/nx-libs/pull/42
Diffstat (limited to 'nx-X11/config')
-rw-r--r--nx-X11/config/cf/Imake.tmpl30
-rw-r--r--nx-X11/config/cf/X11.tmpl40
-rw-r--r--nx-X11/config/cf/host.def44
-rw-r--r--nx-X11/config/cf/linux.cf20
-rw-r--r--nx-X11/config/cf/xorg.cf7
-rw-r--r--nx-X11/config/cf/xorgsite.def42
6 files changed, 0 insertions, 183 deletions
diff --git a/nx-X11/config/cf/Imake.tmpl b/nx-X11/config/cf/Imake.tmpl
index dbc38b54c..30a0dc73b 100644
--- a/nx-X11/config/cf/Imake.tmpl
+++ b/nx-X11/config/cf/Imake.tmpl
@@ -651,36 +651,6 @@ NCURSESLIBDIR = NCursesLibDir
#ifdef NCursesIncDir
NCURSESINCDIR = NCursesIncDir
#endif
-#ifndef HasGlide2
-#define HasGlide2 NO
-#endif
-#ifndef Glide2IncDir
-#if HasGlide2
-#define Glide2IncDir /usr/include/glide
-#else
-#define Glide2IncDir
-#endif
-#endif
-GLIDE2INCDIR = Glide2IncDir
-#ifndef HasGlide3
-#define HasGlide3 NO
-#endif
-#ifndef Glide3IncDir
-#if HasGlide3
-#define Glide3IncDir /usr/include/glide3
-#else
-#define Glide3IncDir
-#endif
-#endif
-GLIDE3INCDIR = Glide3IncDir
-#ifndef Glide3LibName
-#if HasGlide3
-#define Glide3LibName glide3
-#else
-#define Glide3LibName
-#endif
-#endif
-GLIDE3LIBNAME = Glide3LibName
#ifndef HasTk
#define HasTk NO
#endif
diff --git a/nx-X11/config/cf/X11.tmpl b/nx-X11/config/cf/X11.tmpl
index 106293565..80edabe39 100644
--- a/nx-X11/config/cf/X11.tmpl
+++ b/nx-X11/config/cf/X11.tmpl
@@ -290,12 +290,6 @@ XORGRELSTRING = XorgManVersionString
#ifndef BuildOSMesaLib
#define BuildOSMesaLib BuildGlxExt
#endif
-#ifndef BuildXF86RushExt
-#define BuildXF86RushExt NO
-#endif
-#ifndef BuildXF86RushLibrary
-#define BuildXF86RushLibrary (BuildXF86RushExt && !BuildServersOnly)
-#endif
#ifndef BuildRender
#define BuildRender YES
#endif
@@ -1411,30 +1405,6 @@ ProjectUnsharedLibReferences(XONLY,NX_X11,$(XLIBSRC),XBuildLibDir)
#define ProfileLibXxf86dga NO
#endif
-#if BuildXF86RushLibrary
-#ifndef SharedLibXxf86rush
-#define SharedLibXxf86rush HasSharedLibraries
-#endif
-#ifndef NormalLibXxf86rush
-#define NormalLibXxf86rush (!SharedLibXxf86rush || ForceNormalLib)
-#endif
-#ifndef DebugLibXxf86rush
-#define DebugLibXxf86rush NO
-#endif
-#ifndef ProfileLibXxf86rush
-#define ProfileLibXxf86rush NO
-#endif
-#else
-#undef SharedLibXxf86rush
-#define SharedLibXxf86rush NO
-#undef NormalLibXxf86rush
-#define NormalLibXxf86rush NO
-#undef DebugLibXxf86rush
-#define DebugLibXxf86rush NO
-#undef ProfileLibXxf86rush
-#define ProfileLibXxf86rush NO
-#endif
-
#if BuildXineramaLibrary
#ifndef SharedLibXinerama
#define SharedLibXinerama HasSharedLibraries
@@ -1587,16 +1557,6 @@ SharedLibReferences(XXF86DGA,NX_Xxf86dga,$(XXF86DGALIBSRC),SOXXF86DGAREV,SharedX
ProjectUnsharedLibReferences(XXF86DGA,NX_Xxf86dga,$(XXF86DGALIBSRC),XBuildLibDir)
#endif
- XXF86RUSHLIBSRC = $(LIBSRC)/Xxf86rush
-#if SharedLibXxf86rush
-#ifndef SharedXxf86rushRev
-#define SharedXxf86rushRev 1.0
-#endif
-SharedLibReferences(XXF86RUSH,NX_Xxf86rush,$(XXF86RUSHLIBSRC),SOXXF86RUSHREV,SharedXxf86rushRev)
-#else
-ProjectUnsharedLibReferences(XXF86RUSH,NX_Xxf86rush,$(XXF86RUSHLIBSRC),XBuildLibDir)
-#endif
-
XINERAMALIBSRC = $(LIBSRC)/Xinerama
#if SharedLibXinerama
#ifndef SharedXineramaRev
diff --git a/nx-X11/config/cf/host.def b/nx-X11/config/cf/host.def
index b5faf5ca8..1edf85de9 100644
--- a/nx-X11/config/cf/host.def
+++ b/nx-X11/config/cf/host.def
@@ -185,34 +185,6 @@ XCOMM $XFree86: xc/config/cf/xf86site.def,v 3.186 2003/06/25 18:06:22 eich Exp $
#define UseSeparateConfDir NO
*/
-/*
- * To enable building the glide driver, you need to define
- * HasGlide2 to YES and set the Glide2IncDir variable.
- * HasGlide2 is per default NO.
- *
-#define HasGlide2 YES
- */
-
-/*
- * Set the path to your Glide include files.
- *
-#define Glide2IncDir /usr/include/glide
- */
-
-/*
- * Have glide 3?
- *
-#define HasGlide3 YES
- */
-
-/*
- * Set the path to your Glide 3 include files.
- *
-#define Glide3IncDir /usr/include/glide3
- */
-
-
-
/*
* Unless you're a developer you shouldn't need to change anything
* beyond this point.
@@ -440,22 +412,6 @@ XCOMM $XFree86: xc/config/cf/xf86site.def,v 3.186 2003/06/25 18:06:22 eich Exp $
#define GlxExtraDefines -D__GLX_ALIGN64
#endif
-/*
- * If you want to build the xf86rush extension, uncomment this line.
- * This isn't recommended.
- *
-#define BuildXF86RushExt YES
- */
-#define BuildXF86RushExt NO
-
-/*
- * If you want to build the client library for the xf86rush extension,
- * uncomment this line. This isn't recommended.
- *
-#define BuildXF86RushLibrary NO
- */
-#define BuildXF86RushLibrary NO
-
#define BuildXKB YES
#define BuildXKBlib YES
diff --git a/nx-X11/config/cf/linux.cf b/nx-X11/config/cf/linux.cf
index f3a74bc39..d1f930123 100644
--- a/nx-X11/config/cf/linux.cf
+++ b/nx-X11/config/cf/linux.cf
@@ -145,19 +145,6 @@ XCOMM binutils: (LinuxBinUtilsMajorVersion)
# endif
# define HasXdmAuth YES
# define HasLatex YES
-/* at present, glide2 only works on i386 */
-# if defined(__linux__) && defined(i386Architecture)
-# define HasGlide2 YES
-# define Glide2IncDir /usr/include/glide
-# endif /* __linux__ && i386Architecture */
-/* at present, glide3 only works on alpha, amd64, i386 and ia64 */
-# if defined(__linux__) && (defined(i386Architecture) || \
- defined(AlphaArchitecture) || defined(ia64Architecture) || \
- defined(AMD64Architecture))
-# define HasGlide3 YES
-# define Glide3IncDir /usr/include/glide3
-# endif /* __linux__ && (i386Architecture || AlphaArchitecture || \
- ia64Architecture || AMD64Architecture) */
/* extended instruction set support */
# ifdef i386Architecture
# define HasX86Support YES
@@ -381,13 +368,6 @@ XCOMM binutils: (LinuxBinUtilsMajorVersion)
# endif
#endif
-/*
- * The Rush extension support.
- */
-#ifndef BuildXF86RushExt
-# define BuildXF86RushExt YES
-#endif
-
#if defined(__linux__) && !defined(LinuxFBDevSupport)
# define LinuxFBDevSupport YES
#endif
diff --git a/nx-X11/config/cf/xorg.cf b/nx-X11/config/cf/xorg.cf
index 63de7b25a..786e300e7 100644
--- a/nx-X11/config/cf/xorg.cf
+++ b/nx-X11/config/cf/xorg.cf
@@ -437,13 +437,6 @@ IPLAN2P8_DEFS = -DUSE_IPLAN2P8
# define XF86INT10_BUILD X86INT10_STUB
# endif
#endif
-/*
- * Build the Rush extension library (non standard extension for cooperation
- * between glide library and X server). Enabled by default only for Linux.
- */
-#ifndef BuildXF86RushExt
-# define BuildXF86RushExt NO
-#endif
#ifndef BuildRECORDlib
# define BuildRECORDlib YES
diff --git a/nx-X11/config/cf/xorgsite.def b/nx-X11/config/cf/xorgsite.def
index 53a139565..8a0c805c2 100644
--- a/nx-X11/config/cf/xorgsite.def
+++ b/nx-X11/config/cf/xorgsite.def
@@ -86,34 +86,6 @@ XCOMM $XFree86: xc/config/cf/xf86site.def,v 3.186 2003/06/25 18:06:22 eich Exp $
#define UseSeparateConfDir NO
*/
-/*
- * To enable building the glide driver, you need to define
- * HasGlide2 to YES and set the Glide2IncDir variable.
- * HasGlide2 is per default NO.
- *
-#define HasGlide2 YES
- */
-
-/*
- * Set the path to your Glide include files.
- *
-#define Glide2IncDir /usr/include/glide
- */
-
-/*
- * Have glide 3?
- *
-#define HasGlide3 YES
- */
-
-/*
- * Set the path to your Glide 3 include files.
- *
-#define Glide3IncDir /usr/include/glide3
- */
-
-
-
/*
* Unless you're a developer you shouldn't need to change anything
* beyond this point.
@@ -304,20 +276,6 @@ XCOMM $XFree86: xc/config/cf/xf86site.def,v 3.186 2003/06/25 18:06:22 eich Exp $
*/
/*
- * If you want to build the xf86rush extension, uncomment this line.
- * This isn't recommended.
- *
-#define BuildXF86RushExt YES
- */
-
-/*
- * If you want to build the client library for the xf86rush extension,
- * uncomment this line. This isn't recommended.
- *
-#define BuildXF86RushLibrary NO
- */
-
-/*
* If you are running NetBSD 0.9C or later, and have the aperture driver
* installed, uncomment this.
*