From fe011b55df68b7419a8042db94fc3fd1bcaca497 Mon Sep 17 00:00:00 2001
From: Mihai Moldovan <ionic@ionic.de>
Date: Sat, 16 Dec 2017 03:55:58 +0100
Subject: Support building with legacy (pre-1.4.2) libXfont(1) versions.

Partly reverts ec30a857eb0d67b232f8d43e63a6370023f4c4d0, but in a
forward-compatible manner.

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

(limited to 'nx-X11/config')

diff --git a/nx-X11/config/cf/Imake.tmpl b/nx-X11/config/cf/Imake.tmpl
index 85228ae07..44fe2f3c1 100644
--- a/nx-X11/config/cf/Imake.tmpl
+++ b/nx-X11/config/cf/Imake.tmpl
@@ -555,6 +555,9 @@ X_BYTE_ORDER = ByteOrder
 #ifndef HasXfont2
 #define HasXfont2		NO
 #endif
+#ifndef HasLegacyXfont1
+#define HasLegacyXfont1		NO
+#endif
 #ifndef GzipLibrary	/* if OS config didn't define it, assume it's -lz */
 #define GzipLibrary -lz
 #endif
@@ -1871,7 +1874,11 @@ SETITIMER_DEFINES = HasSetitimerDefines
 FONT_DEFINES = -DHAS_XFONT2
     XFONTLIB = -lXfont2
 #else
+#if HasLegacyXfont1
+FONT_DEFINES = -DLEGACY_XFONT1
+#else
 FONT_DEFINES =
+#endif
     XFONTLIB = -lXfont
 #endif
 
diff --git a/nx-X11/config/cf/host.def b/nx-X11/config/cf/host.def
index 4a11359e2..abacf2c4e 100644
--- a/nx-X11/config/cf/host.def
+++ b/nx-X11/config/cf/host.def
@@ -395,6 +395,13 @@
 #define HasXfont2		YES
  */
 
+/*
+ * If building against libXfont(1) and using a legacy version (lower than 1.4.2),
+ * uncomment this.
+ *
+#define HasLegacyXfont1		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 13ccd577c..50a1f4590 100644
--- a/nx-X11/config/cf/xorg.cf
+++ b/nx-X11/config/cf/xorg.cf
@@ -428,6 +428,10 @@ IPLAN2P8_DEFS = -DUSE_IPLAN2P8
 # define HasXfont2	NO
 #endif
 
+#ifndef HasLegacyXfont1
+# define HasLegacyXfont1	NO
+#endif
+
 #ifndef BuildScreenSaverExt
 # define BuildScreenSaverExt	YES
 #endif
-- 
cgit v1.2.3