aboutsummaryrefslogtreecommitdiff
path: root/nx-X11/config
diff options
context:
space:
mode:
authorMihai Moldovan <ionic@ionic.de>2017-04-10 16:20:51 +0200
committerMihai Moldovan <ionic@ionic.de>2017-04-10 16:20:51 +0200
commitcc24d8ba254f1e5062c21adfa07f8b58bb2c5eaa (patch)
treee22b443672f84f9305e682f2c6c0d0e896b967a6 /nx-X11/config
parent9e2588e56f5b712c4501a19c1f723257c05aa6af (diff)
parentc4c5485474a03bcfd2632d12c2e6e88ba20be471 (diff)
downloadnx-libs-cc24d8ba254f1e5062c21adfa07f8b58bb2c5eaa.tar.gz
nx-libs-cc24d8ba254f1e5062c21adfa07f8b58bb2c5eaa.tar.bz2
nx-libs-cc24d8ba254f1e5062c21adfa07f8b58bb2c5eaa.zip
Merge branch 'sunweaver-pr/switch-to-libXfont2-API' into 3.6.x
Attributes GH PR #362: https://github.com/ArcticaProject/nx-libs/pull/362
Diffstat (limited to 'nx-X11/config')
-rw-r--r--nx-X11/config/cf/Imake.tmpl3
-rw-r--r--nx-X11/config/cf/Server.tmpl8
-rw-r--r--nx-X11/config/cf/host.def6
-rw-r--r--nx-X11/config/cf/xorg.cf4
4 files changed, 21 insertions, 0 deletions
diff --git a/nx-X11/config/cf/Imake.tmpl b/nx-X11/config/cf/Imake.tmpl
index 944af2fdc..9ca1f16d7 100644
--- a/nx-X11/config/cf/Imake.tmpl
+++ b/nx-X11/config/cf/Imake.tmpl
@@ -564,6 +564,9 @@ X_BYTE_ORDER = ByteOrder
#ifndef HasFfs
#define HasFfs YES
#endif
+#ifndef HasXfont2
+#define HasXfont2 NO
+#endif
#ifndef GzipLibrary /* if OS config didn't define it, assume it's -lz */
#define GzipLibrary -lz
#endif
diff --git a/nx-X11/config/cf/Server.tmpl b/nx-X11/config/cf/Server.tmpl
index ffdca6811..bae6f3b02 100644
--- a/nx-X11/config/cf/Server.tmpl
+++ b/nx-X11/config/cf/Server.tmpl
@@ -70,3 +70,11 @@ GLX_DEFINES = GlxDefines
#ifdef XorgVersion
#include <xorg.tmpl>
#endif
+
+#if HasXfont2
+FONT_DEFINES = -DHAS_XFONT2
+ XFONTLIB = -lXfont2
+#else
+FONT_DEFINES =
+ XFONTLIB = -lXfont
+#endif
diff --git a/nx-X11/config/cf/host.def b/nx-X11/config/cf/host.def
index ffcf4c0de..4b22042c4 100644
--- a/nx-X11/config/cf/host.def
+++ b/nx-X11/config/cf/host.def
@@ -390,6 +390,12 @@
#define BuildXKBlib YES
/*
+ * If you want to build against libXfont2, rather than libXfont(1), uncomment this.
+ *
+#define HasXfont2 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 ddc501978..1aa7daf06 100644
--- a/nx-X11/config/cf/xorg.cf
+++ b/nx-X11/config/cf/xorg.cf
@@ -424,6 +424,10 @@ IPLAN2P8_DEFS = -DUSE_IPLAN2P8
# define BuildXKBlib YES
#endif
+#ifndef HasXfont2
+# define HasXfont2 NO
+#endif
+
#ifndef BuildScreenSaverExt
# define BuildScreenSaverExt YES
#endif