From 662a89545f3e953a47f176cf64e574350643d446 Mon Sep 17 00:00:00 2001
From: Mike Gabriel <mike.gabriel@das-netzwerkteam.de>
Date: Wed, 22 Apr 2015 00:37:47 +0200
Subject: imake cleanup: Drop references to X11 build-logic that is not present
 in nx-X11.

---
 nx-X11/config/cf/linux.cf | 30 ------------------------------
 1 file changed, 30 deletions(-)

(limited to 'nx-X11/config/cf/linux.cf')

diff --git a/nx-X11/config/cf/linux.cf b/nx-X11/config/cf/linux.cf
index fa18feb4e..aa28c5c55 100644
--- a/nx-X11/config/cf/linux.cf
+++ b/nx-X11/config/cf/linux.cf
@@ -105,19 +105,10 @@ XCOMM binutils:	(LinuxBinUtilsMajorVersion)
 #  define XAppLoadDir		EtcX11Directory/app-defaults
 # define XFileSearchPathDefault	Concat4(EtcX11Directory/%L/%T/%N%C,%S:EtcX11Directory/%l/%T/%N%C,%S:EtcX11Directory/%T/%N%C,%S:EtcX11Directory/%L/%T/%N%S:EtcX11Directory/%l/%T/%N%S:EtcX11Directory/%T/%N%S):Concat4($(LIBDIR)/%L/%T/%N%C,%S:$(LIBDIR)/%l/%T/%N%C,%S:$(LIBDIR)/%T/%N%C,%S:$(LIBDIR)/%L/%T/%N%S:$(LIBDIR)/%l/%T/%N%S:$(LIBDIR)/%T/%N%S)
 /* the relative symlink created by this rule causes problems for us */
-# if defined(InstallAppDefFiles) && InstallAppDefFiles
-#  define InstallAppDefaultsLong(file,class)				@@\
-InstallNamedTarget(install,file.ad,$(INSTAPPFLAGS),$(XAPPLOADDIR),class)
-# else
-#  define InstallAppDefaultsLong(file,class)				@@\
-InstallNamedTargetNoClobber(install,file.ad,$(INSTAPPFLAGS),$(XAPPLOADDIR),class)
-# endif /* InstallAppDefFiles */
 # endif /* !defined(NothingOutsideProjectRoot) || !NothingOutsideProjectRoot */
 # define SharedLibXdmGreet	NO
 # define LinkGLToUsrInclude	NO
 # define LinkGLToUsrLib		NO
-# define SharedLibGlu		YES
-# define NormalLibGlu		YES
 # define FSUseSyslog		YES
 
 # define BuildLibGlxWithoutPIC  NO
@@ -145,9 +136,6 @@ InstallNamedTargetNoClobber(install,file.ad,$(INSTAPPFLAGS),$(XAPPLOADDIR),class
 #  endif
 #  define XFree86Devel			YES
 #  define BuildAllSpecsDocs		YES
-#  define InstallXinitConfig		YES
-#  define InstallXdmConfig		YES
-#  define InstallFSConfig		YES
 #  define DebuggableLibraries		YES
 #  define ForceNormalLib		YES
 #  define BuildSpecsDocs		YES
@@ -232,7 +220,6 @@ InstallNamedTargetNoClobber(install,file.ad,$(INSTAPPFLAGS),$(XAPPLOADDIR),class
                                 -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64 \
 				LinuxAdditionalIncludes LinuxGnuSourceDefines \
 				LinuxLocaleDefines
-# define XawI18nDefines		-DHAS_WCHAR_H -DHAS_WCTYPE_H -DNO_WIDEC_H
 # define HasPosixThreads	YES
 # define ThreadedX		YES
 # define HasThreadSafeAPI	YES
@@ -249,7 +236,6 @@ InstallNamedTargetNoClobber(install,file.ad,$(INSTAPPFLAGS),$(XAPPLOADDIR),class
 # define LinuxSourceDefines	-D_POSIX_SOURCE -D_POSIX_C_SOURCE=2 \
 				-D_BSD_SOURCE -D_SVID_SOURCE \
 				LinuxGnuSourceDefines LinuxLocaleDefines
-# define XawI18nDefines		-DUSE_XWCHAR_STRING -DUSE_XMBTOWC
 # ifndef HasLibCrypt
 #  define HasLibCrypt		NO
 # endif
@@ -262,10 +248,6 @@ InstallNamedTargetNoClobber(install,file.ad,$(INSTAPPFLAGS),$(XAPPLOADDIR),class
 # endif
 #endif
 
-#ifndef InstallXloadSetGID
-#define InstallXloadSetGID	NO
-#endif
-
 /*
  * XXX Check which versions of Linux really have IPv6.  glibc 2.0 on
  * Red Hat 5.2 doesn't.
@@ -523,18 +505,6 @@ InstallNamedTargetNoClobber(install,file.ad,$(INSTAPPFLAGS),$(XAPPLOADDIR),class
 #define HasGroff		YES
 #endif
 
-#ifndef HasZlib
-#define HasZlib			YES
-#endif
-
-#ifndef HasLibpng
-#define HasLibpng		YES
-#endif
-
-#ifndef HasExpat
-# define HasExpat		YES
-#endif
-
 #define AvoidNullMakeCommand	YES
 #ifndef DebuggableLibraries
 #define DebuggableLibraries	NO
-- 
cgit v1.2.3