From e92c2a87808ec922b6bc90d5d5002ca77318f697 Mon Sep 17 00:00:00 2001
From: Mihai Moldovan <ionic@ionic.de>
Date: Sat, 16 Dec 2017 07:18:11 +0100
Subject: Support building with legacy (pre-7.1.0) Xext proto versions.

Legacy Xext proto versions are automatically detected by the main
Makefile.
---
 nx-X11/config/cf/Imake.tmpl | 11 ++++++++++-
 nx-X11/config/cf/host.def   |  7 +++++++
 nx-X11/config/cf/xorg.cf    |  4 ++++
 3 files changed, 21 insertions(+), 1 deletion(-)

(limited to 'nx-X11/config')

diff --git a/nx-X11/config/cf/Imake.tmpl b/nx-X11/config/cf/Imake.tmpl
index 44fe2f3c1..5d989d1e0 100644
--- a/nx-X11/config/cf/Imake.tmpl
+++ b/nx-X11/config/cf/Imake.tmpl
@@ -546,6 +546,9 @@ X_BYTE_ORDER = ByteOrder
 #define HasShm			NO
 #endif
 #endif
+#ifndef HasLegacyXextProto
+#define HasLegacyXextProto	NO
+#endif
 #ifndef HasCbrt
 #define HasCbrt			YES
 #endif
@@ -1882,6 +1885,12 @@ FONT_DEFINES =
     XFONTLIB = -lXfont
 #endif
 
+#if HasLegacyXextProto
+XEXT_EXTRA_DEFINES = -DLEGACY_XEXT_PROTO
+#else
+XEXT_EXTRA_DEFINES =
+#endif
+
 /*
  * Here we set up flags needed to produce position-independent code
  * when doing C and C++ compilation.  The default if you specify C
@@ -1980,7 +1989,7 @@ FONT_DEFINES =
  * LOCAL_LDFLAGS contains client-specific ld flags flags set in Imakefile
  */
       ALLINCLUDES = $(INCLUDES) $(EXTRA_INCLUDES) $(TOP_INCLUDES) $(INSTALLED_INCLUDES) $(STD_INCLUDES)
-       ALLDEFINES = $(ALLINCLUDES) $(STD_DEFINES) $(SETITIMER_DEFINES) $(FONT_DEFINES) $(PROTO_DEFINES) $(THREADS_DEFINES) $(MODULE_DEFINES) $(DEFINES) $(EXTRA_DEFINES)
+       ALLDEFINES = $(ALLINCLUDES) $(STD_DEFINES) $(SETITIMER_DEFINES) $(FONT_DEFINES) $(PROTO_DEFINES) $(XEXT_EXTRA_DEFINES) $(THREADS_DEFINES) $(MODULE_DEFINES) $(DEFINES) $(EXTRA_DEFINES)
            CFLAGS = $(CDEBUGFLAGS) $(CCOPTIONS) $(THREADS_CFLAGS) $(MODULE_CFLAGS) $(ALLDEFINES)
         LINTFLAGS = $(LINTOPTS) -DLINT $(ALLDEFINES) $(DEPEND_DEFINES)
          LDPRELIB = LdPreLib $(INSTALLED_LIBS)
diff --git a/nx-X11/config/cf/host.def b/nx-X11/config/cf/host.def
index abacf2c4e..0969a8f48 100644
--- a/nx-X11/config/cf/host.def
+++ b/nx-X11/config/cf/host.def
@@ -402,6 +402,13 @@
 #define HasLegacyXfont1		YES
  */
 
+/*
+ * If building with SHM support enabled and using a legacy Xext protocol
+ * version (lower than 7.1.0), uncomment this.
+ *
+#define HasLegacyXextProto	YES
+ */
+
 /*
  * If you are running NetBSD 0.9C or later, and have the aperture driver
  * installed, uncomment this.
diff --git a/nx-X11/config/cf/xorg.cf b/nx-X11/config/cf/xorg.cf
index 50a1f4590..b68d11c4c 100644
--- a/nx-X11/config/cf/xorg.cf
+++ b/nx-X11/config/cf/xorg.cf
@@ -432,6 +432,10 @@ IPLAN2P8_DEFS = -DUSE_IPLAN2P8
 # define HasLegacyXfont1	NO
 #endif
 
+#ifndef HasLegacyXextProto
+# define HasLegacyXextProto	NO
+#endif
+
 #ifndef BuildScreenSaverExt
 # define BuildScreenSaverExt	YES
 #endif
-- 
cgit v1.2.3