[X2Go-Commits] [nx-libs] 06/09: nx-X11/programs/Xserver/{, os/}Imakefile: implement libtirpc forcing via UseTIRPC.

git-admin at x2go.org git-admin at x2go.org
Sat Mar 10 02:07:05 CET 2018


This is an automated email from the git hooks/post-receive script.

x2go pushed a commit to branch 3.6.x-rpm-debug
in repository nx-libs.

commit 04e7f813d259681507544e5ab1928f5dc4c61471
Author: Mihai Moldovan <ionic at ionic.de>
Date:   Fri Mar 9 09:08:35 2018 +0100

    nx-X11/programs/Xserver/{,os/}Imakefile: implement libtirpc forcing via UseTIRPC.
---
 nx-X11/programs/Xserver/Imakefile    | 10 +++++++++-
 nx-X11/programs/Xserver/os/Imakefile |  8 ++++++++
 2 files changed, 17 insertions(+), 1 deletion(-)

diff --git a/nx-X11/programs/Xserver/Imakefile b/nx-X11/programs/Xserver/Imakefile
index f4f8d3f..c26116f 100644
--- a/nx-X11/programs/Xserver/Imakefile
+++ b/nx-X11/programs/Xserver/Imakefile
@@ -296,11 +296,19 @@ ZLIB      =  $$(pkg-config --exists 'zlib' >/dev/null 2>&1 && pkg-config --libs
 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)
+NXCOMPEXTSYSLIBS = $(PIXMANLIB) $(ZLIB) $(PNGLIB) $(JPEGLIB) $(TIRPC_LIB)
 #if HasParallelMake
 MakeMutex($(NXAGENTDIRS) $(NXCOMPEXT) $(NXAGENTOBJS) $(NXAGENTLIBS) $(NXCOMPEXTSYSLIBS) $(NXAGENTSYSLIBS))
 #endif
diff --git a/nx-X11/programs/Xserver/os/Imakefile b/nx-X11/programs/Xserver/os/Imakefile
index 7932e32..da39c57 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)			\

--
Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/nx-libs.git


More information about the x2go-commits mailing list