diff options
Diffstat (limited to 'nx-X11/config/cf')
| -rw-r--r-- | nx-X11/config/cf/Imake.tmpl | 3 | ||||
| -rw-r--r-- | nx-X11/config/cf/Server.tmpl | 8 | ||||
| -rw-r--r-- | nx-X11/config/cf/host.def | 6 | ||||
| -rw-r--r-- | nx-X11/config/cf/xorg.cf | 4 |
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 |