aboutsummaryrefslogtreecommitdiff
path: root/nx-X11/lib
diff options
context:
space:
mode:
authorOrion Poplawski <orion@nwra.com>2015-02-13 13:30:31 +0100
committerMike Gabriel <mike.gabriel@das-netzwerkteam.de>2015-02-13 13:30:31 +0100
commit456f887d95ca34974c1192a477dfca117827457f (patch)
tree2540332456afb36c4c8cff6d47a7f7494a9b2dee /nx-X11/lib
parentc4a8556c45786c83b04b2e958234cb4c724e1910 (diff)
downloadnx-libs-456f887d95ca34974c1192a477dfca117827457f.tar.gz
nx-libs-456f887d95ca34974c1192a477dfca117827457f.tar.bz2
nx-libs-456f887d95ca34974c1192a477dfca117827457f.zip
Do not build bundled libraries (601_nx-X11_build-option-changes-to-not-use-bundled-libraries.full.patch).
This commit has been submitted by Orion in two portions. One was submitted to X2Go BTS and created on Wed, 10 Jul 2013. The other portion has been taken from the Fedora package by Mike Gabriel and worked into this patch on Fri, 06 Dec 2013.
Diffstat (limited to 'nx-X11/lib')
-rw-r--r--nx-X11/lib/Imakefile6
-rw-r--r--nx-X11/lib/font/include/Imakefile2
2 files changed, 1 insertions, 7 deletions
diff --git a/nx-X11/lib/Imakefile b/nx-X11/lib/Imakefile
index 240e8b330..cf4109bd0 100644
--- a/nx-X11/lib/Imakefile
+++ b/nx-X11/lib/Imakefile
@@ -213,14 +213,8 @@ XEXTLIBDIR = Xext
#if BuildLibraries
OLDXLIBDIR = oldX
-ICELIBDIR = ICE
-SMLIBDIR = SM
-XTLIBDIR = Xt
-XMULIBDIR = Xmu
-XMUULIBDIR = Xmuu
XPMLIBDIR = Xpm
XTSTLIBDIR = Xtst
-FSLIBDIR = FS
#endif
diff --git a/nx-X11/lib/font/include/Imakefile b/nx-X11/lib/font/include/Imakefile
index 91c84e6ec..73e65a41c 100644
--- a/nx-X11/lib/font/include/Imakefile
+++ b/nx-X11/lib/font/include/Imakefile
@@ -1,5 +1,5 @@
XCOMM $Xorg$
- HEADERS = bitmap.h bufio.h fntfil.h fntfilio.h fntfilst.h fontenc.h \
+ HEADERS = bitmap.h bufio.h fntfil.h fntfilio.h fntfilst.h \
fontencc.h fontmisc.h fontmod.h fontshow.h fontutil.h \
fontxlfd.h
all::