aboutsummaryrefslogtreecommitdiff
path: root/nx-X11
diff options
context:
space:
mode:
Diffstat (limited to 'nx-X11')
-rw-r--r--nx-X11/config/cf/Imake.tmpl3
-rw-r--r--nx-X11/config/cf/README1
-rw-r--r--nx-X11/programs/Xserver/Imakefile20
-rw-r--r--nx-X11/programs/Xserver/os/Imakefile8
4 files changed, 26 insertions, 6 deletions
diff --git a/nx-X11/config/cf/Imake.tmpl b/nx-X11/config/cf/Imake.tmpl
index 86222d12a..d6ef779cb 100644
--- a/nx-X11/config/cf/Imake.tmpl
+++ b/nx-X11/config/cf/Imake.tmpl
@@ -563,6 +563,9 @@ X_BYTE_ORDER = ByteOrder
#ifndef HasLegacyXfont1
#define HasLegacyXfont1 NO
#endif
+#ifndef UseTIRPC
+#define UseTIRPC 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/README b/nx-X11/config/cf/README
index 59a08f45c..24ac7f52c 100644
--- a/nx-X11/config/cf/README
+++ b/nx-X11/config/cf/README
@@ -148,6 +148,7 @@ Imake.tmpl provides defaults for the following variables:
UnalignedReferencesAllowed boolean for unaligned copies ok
UsrLibDir directory in which to install libraries
YaccCmd command to run yacc
+ UseTIRPC force usage of libtirpc
X11.tmpl provides defaults for the following variables:
diff --git a/nx-X11/programs/Xserver/Imakefile b/nx-X11/programs/Xserver/Imakefile
index 5d86a534d..64c4e2e7f 100644
--- a/nx-X11/programs/Xserver/Imakefile
+++ b/nx-X11/programs/Xserver/Imakefile
@@ -292,20 +292,28 @@ NXAGENTOBJS = hw/nxagent/miinitext.o \
XPMLIB = -lXpm
XMLLIB = `pkg-config --libs libxml-2.0`
PIXMANLIB = `pkg-config --libs pixman-1`
-ZLIB = $$(pkg-config --exists 'zlib' >/dev/null 2>&1 && pkg-config --libs 'zlib' || echo "-lz")
+ZLIB = $$(pkg-config --exists 'zlib' >/dev/null 2>&1 && pkg-config --libs 'zlib' || printf '%s' '-lz')
PNGLIB = `pkg-config --libs libpng`
JPEGLIB = -ljpeg
+TIRPC_LIB =
+
+#if HasSecureRPC
+#if UseTIRPC
+TIRPC_LIB = $$(pkg-config --libs 'libtirpc')
+#endif
+#endif
+
NXAGENT = hw/nxagent/LibraryTargetName(nxagent)
NXCOMPEXT = hw/nxagent/compext/LibraryTargetName(compext)
NXAGENTLIBS = PreFbLibs $(NXAGENT) FbPostFbLibs $(NXCOMPEXT) $(NXAGENT) $(MI)
-NXAGENTSYSLIBS = $(LDPRELIBS) $(XLIB) $(SYSLIBS) $(XPMLIB) $(XMLLIB)
-NXCOMPEXTSYSLIBS = $(PIXMANLIB) $(ZLIB) $(PNGLIB) $(JPEGLIB)
+NXAGENTSYSLIBS = $(LDPRELIBS) $(XLIB) $(SYSLIBS) $(XPMLIB) $(XMLLIB) $(PIXMANLIB) $(TIRPC_LIB)
+NXCOMPEXTSYSLIBS = $(ZLIB) $(PNGLIB) $(JPEGLIB)
#if HasParallelMake
MakeMutex($(NXAGENTDIRS) $(NXCOMPEXT) $(NXAGENTOBJS) $(NXAGENTLIBS) $(NXCOMPEXTSYSLIBS) $(NXAGENTSYSLIBS))
#endif
#if ForceServerRemake
-$(NXAGENTOBJS) $(NXAGENTLIBS) $(NXAGENTSYSLIBS):: $(NXAGENTDIRS)
+$(NXAGENTOBJS) $(NXAGENTLIBS):: $(NXAGENTDIRS)
@if [ -f $@ ]; then touch $@ >/dev/null 2>&1 || exit 0; fi
#endif
#if NXLibraries
@@ -485,7 +493,7 @@ MakeMutex($(NXWINDIRS) $(NXWINOBJS) $(NXWINLIB) $(NXWINLIBS) $(NXWINSYSLIBS) $(N
#endif
#if ForceServerRemake
-$(NXWINOBJS) $(NXWINLIB) $(NXWINLIBS) $(NXWINSYSLIBS) $(NXWINNXLIBS):: $(NXWINDIRS)
+$(NXWINOBJS) $(NXWINLIB) $(NXWINLIBS):: $(NXWINDIRS)
@if [ -f $@ ]; then touch $@ >/dev/null 2>&1 || exit 0; fi
#endif
@@ -542,7 +550,7 @@ MakeMutex($(NXWINDIRS) $(NXWINOBJS) $(NXWINLIB) $(NXWINLIBS) $(NXWINSYSLIBS) $(N
#endif
#if ForceServerRemake
-$(NXWINOBJS) $(NXWINLIB) $(NXWINLIBS) $(NXWINSYSLIBS) $(NXWINNXLIBS):: $(NXWINDIRS)
+$(NXWINOBJS) $(NXWINLIB) $(NXWINLIBS):: $(NXWINDIRS)
@if [ -f $@ ]; then touch $@ >/dev/null 2>&1 || exit 0; fi
#endif
diff --git a/nx-X11/programs/Xserver/os/Imakefile b/nx-X11/programs/Xserver/os/Imakefile
index 7932e32cd..da39c57ba 100644
--- a/nx-X11/programs/Xserver/os/Imakefile
+++ b/nx-X11/programs/Xserver/os/Imakefile
@@ -75,10 +75,17 @@ XDMAUTHOBJS =
XDMAUTHSCRS =
#endif
+TIRPC_INCLUDES =
+
#if HasSecureRPC
RPCDEFS = -DSECURE_RPC
RPCOBJS = rpcauth.o
RPCSRCS = rpcauth.c
+
+#if UseTIRPC
+TIRPC_INCLUDES = $$(pkg-config --cflags-only-I 'libtirpc')
+#endif
+
#else
RPCDEFS =
RPCOBJS =
@@ -209,6 +216,7 @@ BOOTSTRAPCFLAGS =
-I$(TOP)/lib/Xau \
$(NX_INCLUDES) \
`pkg-config --cflags-only-I pixman-1` \
+ $(TIRPC_INCLUDES) \
$(NULL)
DEPEND_DEFINES = $(XDMCP_DEFINES) \